diff options
133 files changed, 12667 insertions, 1146 deletions
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl index 0c0538c..a85f073 100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -46,7 +46,13 @@ # ####################################################################### +# +# Note: Please make sure to output all changes done to the pkg file in a print statements +# starting with "Patching: " to ease integration into IDEs! +# + use File::Copy; +use File::Spec; sub Usage() { print("This script can be used to set capabilities of all binaries\n"); @@ -142,39 +148,56 @@ if (@ARGV) # Parse each line. while (<PKG>) { - # Patch pkg UID my $line = $_; my $newLine = $line; - if ($line =~ m/^\#.*\(0x[0-9|a-f|A-F]*\).*$/) + + # Patch pkg UID if it's in protected range + if ($line =~ m/^\#.*\((0x[0-7][0-9|a-f|A-F]*)\).*$/) { - $newLine =~ s/\(0x./\(0xE/; + my $oldUID = $1; + my $newUID = $oldUID; + $newUID =~ s/0x./0xE/i; + $newLine =~ s/$oldUID/$newUID/; + print ("Patching: UID $oldUID is not compatible with self-signing! Changed to: $newUID.\n"); } - # Patch embedded sis name and UID - if ($line =~ m/^@.*\.sis.*\(0x[0-9|a-f|A-F]*\).*$/) + # Patch embedded sis name and UID if UID is in protected range + if ($line =~ m/^@\"*(.*\.sis).*\((0x[0-7][0-9|a-f|A-F]*)\).*$/) { - $newLine =~ s/\(0x./\(0xE/; - if ($line !~ m/^.*_selfsigned.sis.*$/) + my $oldSisName = $1; + my $oldUID = $2; + my $newUID = $oldUID; + $newUID =~ s/0x./0xE/i; + $newLine =~ s/$oldUID/$newUID/; + print ("Patching: Embedded sis $oldSisName UID $oldUID changed to: $newUID.\n"); + + if ($oldSisName !~ m/^.*_selfsigned.sis$/i) { - $newLine =~ s/\.sis/_selfsigned\.sis/i; + my $newSisName = $oldSisName; + $newSisName =~ s/\.sis$/_selfsigned\.sis/i; + $newLine =~ s/$oldSisName/$newSisName/i; + print ("Patching: Embedded sis $oldSisName name changed to: $newSisName.\n"); } } - # Remove dependencies to known problem packages (i.e. packages that are likely to be patched, also) + # Remove dependencies to known problem packages (i.e. packages that are likely to be patched, too) # to reduce unnecessary error messages. - if ($line =~ m/^\(0x2002af5f\).*\{.*\}$/) + if ($line =~ m/^\((0x2002af5f)\).*\{.*\}$/) { - $newLine = "\n" + $newLine = "\n"; + print ("Patching: Removed dependency to sqlite3.sis ($1) to avoid installation issues in case sqlite3.sis is also patched.\n"); } - if ($line =~ m/^\(0x2001E61C\).*\{.*\}$/) + if ($line =~ m/^\((0x2001E61C)\).*\{.*\}$/) { - $newLine = "\n" + $newLine = "\n"; + print ("Patching: Removed dependency to qt.sis ($1) to avoid installation issues in case qt.sis is also patched.\n"); } # Remove manufacturer ifdef if ($line =~ m/^.*\(MANUFACTURER\)\=\(.*\).*$/) { $newLine = "\n"; + print ("Patching: Removed manufacturer check as it is usually not desirable in self-signed packages.\n"); } if ($line =~ m/^ELSEIF.*MANUFACTURER$/) @@ -240,7 +263,9 @@ if (@ARGV) foreach my $binaryPath(@binaries) { # Create the command line for setting the capabilities. + my ($binaryVolume, $binaryDirs, $binaryBaseName) = File::Spec->splitpath($binaryPath); my $commandToExecute = $baseCommandToExecute; + my $executeNeeded = 0; if (@capabilitiesSpecified) { $commandToExecute = sprintf($baseCommandToExecute, join(" ", @capabilitiesSpecified)); @@ -250,34 +275,54 @@ if (@ARGV) my $dllCaps; open($dllCaps, "elftran -dump s $binaryPath |") or die ("Could not execute elftran"); my $capsFound = 0; + my $originalVid; my @capabilitiesToSet; my $capabilitiesToAllow = join(" ", @capabilitiesToAllow); + my @capabilitiesToDrop; while (<$dllCaps>) { + if (/^Vendor ID: (.*)$/) { + $originalVid = "$1"; + } if (!$capsFound) { $capsFound = 1 if (/Capabilities:/); } else { $_ = trim($_); if ($capabilitiesToAllow =~ /$_/) { push(@capabilitiesToSet, $_); + } else { + push(@capabilitiesToDrop, $_); } } } close($dllCaps); + if ($originalVid !~ "00000000") { + print ("Patching: Vendor ID (0x$originalVid) incompatible with self-signed packages, setting it to zero for \"$binaryBaseName\".\n"); + $executeNeeded = 1; + } + if ($#capabilitiesToDrop) { + my $capsToDropStr = join("\", \"", @capabilitiesToDrop); + $capsToDropStr =~ s/\", \"$//; + + print ("Patching: The following capabilities used in \"$binaryBaseName\" are not compatible with a self-signed package and will be removed: \"$capsToDropStr\".\n"); + $executeNeeded = 1; + } $commandToExecute = sprintf($baseCommandToExecute, join(" ", @capabilitiesToSet)); } $commandToExecute .= $binaryPath; - # Actually execute the elftran command to set the capabilities. - print ("Executing ".$commandToExecute."\n"); - system ($commandToExecute." > $nullDevice"); - + if ($executeNeeded) { + # Actually execute the elftran command to set the capabilities. + print ("\n"); + system ("$commandToExecute > $nullDevice"); + } ## Create another command line to check that the set capabilities are correct. #$commandToExecute = "elftran -dump s ".$binaryPath; } print ("\n"); - print ("NOTE: A patched package may not work as expected due to reduced capabilities.\n"); - print (" Therefore it should not be used for any kind of Symbian signing or distribution!\n"); + print ("NOTE: A patched package may not work as expected due to reduced capabilities and other modifications,\n"); + print (" so it should not be used for any kind of Symbian signing or distribution!\n"); + print (" Use a proper certificate to avoid the need to patch the package.\n"); print ("\n"); } } @@ -686,7 +686,7 @@ CFG_AUDIO_BACKEND=auto CFG_SVG=auto CFG_DECLARATIVE=auto CFG_DECLARATIVE_DEBUG=yes -CFG_WEBKIT=auto # (yes|no|auto) +CFG_WEBKIT=auto # (yes|no|auto|debug) CFG_JAVASCRIPTCORE_JIT=auto CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb" @@ -939,13 +939,26 @@ while [ "$#" -gt 0 ]; do VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"` VAL=`echo $1 | sed "s,^-\([^-]*\).*,\1,"` ;; + #WebKit options + -webkit) + VAR="webkit" + VAL="yes" + ;; + -webkit-debug) + VAR="webkit" + VAL="debug" + ;; + -no-webkit) + VAR="webkit" + VAL="no" + ;; #Qt style no options -no-*) VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"` VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -2010,15 +2023,8 @@ while [ "$#" -gt 0 ]; do fi ;; webkit) - if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then - CFG_WEBKIT="yes" - else - if [ "$VAL" = "no" ]; then - CFG_WEBKIT="no" - else - UNKNOWN_OPT=yes - fi - fi + [ "$VAL" = "auto" ] && VAL="yes" + CFG_WEBKIT="$VAL" ;; javascript-jit) if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then @@ -3535,10 +3541,10 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir [-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend] [-no-media-backend] [-media-backend] [-no-audio-backend] [-audio-backend] [-no-openssl] [-openssl] [-openssl-linked] - [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit] + [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-webkit-debug] + [-no-javascript-jit] [-javascript-jit] [-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative][-no-declarative-debug] [-declarative-debug] - [additional platform specific options (see below)] @@ -3690,6 +3696,7 @@ fi -no-webkit ......... Do not build the WebKit module. + -webkit ............ Build the WebKit module. WebKit is built if a decent C++ compiler is used. + -webkit-debug ...... Build the WebKit module with debug symbols. -no-javascript-jit . Do not build the JavaScriptCore JIT compiler. + -javascript-jit .... Build the JavaScriptCore JIT compiler. @@ -7191,14 +7198,15 @@ if [ "$CFG_WEBKIT" = "auto" ]; then CFG_WEBKIT="$canBuildWebKit" fi -if [ "$CFG_WEBKIT" = "yes" ]; then +if [ "$CFG_WEBKIT" != "no" ]; then # This include takes care of adding "webkit" to QT_CONFIG. cp -f "$relpath/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri" "$outpath/mkspecs/modules/qt_webkit_version.pri" # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly. - CFG_WEBKIT="yes" + if [ "$CFG_WEBKIT" = "debug" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug" + fi else rm -f "$outpath/mkspecs/modules/qt_webkit_version.pri" - CFG_WEBKIT="no" QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT" fi @@ -8130,7 +8138,7 @@ EOF *) ;; esac -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ] && [ "$CFG_WEBKIT" != "no" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then cat <<EOF WARNING: DWARF2 debug symbols are not enabled. Linking webkit in debug mode will run out of memory on systems with 2GB or less. @@ -8207,8 +8215,12 @@ echo "QtXmlPatterns module ... $CFG_XMLPATTERNS" echo "Phonon module .......... $CFG_PHONON" echo "Multimedia module ...... $CFG_MULTIMEDIA" echo "SVG module ............. $CFG_SVG" -echo "WebKit module .......... $CFG_WEBKIT" -if [ "$CFG_WEBKIT" = "yes" ]; then +case "$CFG_WEBKIT" in + yes) echo "WebKit module .......... yes" ;; + debug) echo "WebKit module .......... yes (debug)" ;; + no) echo "WebKit module .......... no" ;; +esac +if [ "$CFG_WEBKIT" != "no" ]; then if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then echo "JavaScriptCore JIT ..... To be decided by JavaScriptCore" else diff --git a/examples/declarative/animation/easing/easing.qml b/examples/declarative/animation/easing/easing.qml index ffb129d..9349a25 100644 --- a/examples/declarative/animation/easing/easing.qml +++ b/examples/declarative/animation/easing/easing.qml @@ -137,7 +137,7 @@ Rectangle { Flickable { anchors.fill: parent - contentHeight: layout.height + contentHeight: layout.height+50 Rectangle { id: titlePane color: "#444444" diff --git a/examples/declarative/toys/corkboards/Day.qml b/examples/declarative/toys/corkboards/Day.qml index f406f7b..3525a5b 100644 --- a/examples/declarative/toys/corkboards/Day.qml +++ b/examples/declarative/toys/corkboards/Day.qml @@ -45,9 +45,16 @@ Component { property variant stickies id: page - width: 840; height: 480 + width: ListView.view.width+40; height: ListView.view.height - Image { source: "cork.jpg" } + + Image { + source: "cork.jpg" + width: page.ListView.view.width + height: page.ListView.view.height + fillMode: Image.PreserveAspectCrop + clip: true + } MouseArea { anchors.fill: parent @@ -65,8 +72,8 @@ Component { Item { id: stickyPage - property int randomX: Math.random() * 500 + 100 - property int randomY: Math.random() * 200 + 50 + property int randomX: Math.random() * (page.ListView.view.width-0.5*stickyImage.width) +100 + property int randomY: Math.random() * (page.ListView.view.height-0.5*stickyImage.height) +50 x: randomX; y: randomY diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index bc2324e..451cc67 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -132,9 +132,9 @@ void Generator::generateData(const QAudioFormat &format, qint64 durationUs, int qint64 Generator::readData(char *data, qint64 len) { qint64 total = 0; - while (len - total) { + while (len - total > 0) { const qint64 chunk = qMin((m_buffer.size() - m_pos), len - total); - memcpy(data, m_buffer.constData() + m_pos, chunk); + memcpy(data + total, m_buffer.constData() + m_pos, chunk); m_pos = (m_pos + chunk) % m_buffer.size(); total += chunk; } diff --git a/examples/opengl/pbuffers/glwidget.cpp b/examples/opengl/pbuffers/glwidget.cpp index 6f4f060..c57a510 100644 --- a/examples/opengl/pbuffers/glwidget.cpp +++ b/examples/opengl/pbuffers/glwidget.cpp @@ -62,7 +62,9 @@ GLWidget::GLWidget(QWidget *parent) , cube(0) { // create the pbuffer - pbuffer = new QGLPixelBuffer(QSize(512, 512), format(), this); + QGLFormat pbufferFormat = format(); + pbufferFormat.setSampleBuffers(false); + pbuffer = new QGLPixelBuffer(QSize(512, 512), pbufferFormat, this); setWindowTitle(tr("OpenGL pbuffers")); initializeGeometry(); } diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf index d3db24a..0d511fc 100644 --- a/mkspecs/common/g++.conf +++ b/mkspecs/common/g++.conf @@ -8,6 +8,7 @@ QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w QMAKE_CFLAGS_RELEASE += -O2 +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC @@ -22,6 +23,7 @@ QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf index 446547d..29b7408 100644 --- a/mkspecs/common/mac-g++.conf +++ b/mkspecs/common/mac-g++.conf @@ -10,6 +10,7 @@ QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w QMAKE_CFLAGS_RELEASE += -O2 +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g -gdwarf-2 QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC @@ -33,6 +34,7 @@ QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB @@ -52,6 +54,7 @@ QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC QMAKE_LFLAGS += -headerpad_max_install_names QMAKE_LFLAGS_RELEASE += +QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2 QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 679731f..cc5b788 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -132,39 +132,49 @@ exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) { } # Try to detect SDK version if it wasn't set by environment.prf -isEmpty(S60_VERSION) { - # The Symbian^3 PDK does not necessarily contain the required sis files. - # However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too. - exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) { - S60_VERSION = 5.2 +isEmpty(SYMBIAN_VERSION) { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Symbianv4.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/Symbianv4.sis) { + SYMBIAN_VERSION = Symbian4 } else { - exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) { - S60_VERSION = 5.1 + # The Symbian^3 PDK does not necessarily contain the required sis files. + # However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too. + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) { + SYMBIAN_VERSION = Symbian3 } else { - exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { - S60_VERSION = 5.0 + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) { + SYMBIAN_VERSION = Symbian2 } else { - exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) { - S60_VERSION = 3.2 + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { + SYMBIAN_VERSION = 9.4 } else { - S60_VERSION = 3.1 + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) { + SYMBIAN_VERSION = 9.3 + } else { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.1.sis) { + SYMBIAN_VERSION = 9.2 + } else { + SYMBIAN_VERSION = Unknown + } + } } } } } } -isEmpty(SYMBIAN_VERSION) { - contains(S60_VERSION, "3\\.1") { - SYMBIAN_VERSION = 9.2 - } else:contains(S60_VERSION, "3\\.2") { - SYMBIAN_VERSION = 9.3 - } else:contains(S60_VERSION, "5\\.0") { - SYMBIAN_VERSION = 9.4 - } else:contains(S60_VERSION, "5\\.1") { - SYMBIAN_VERSION = Symbian2 - } else:contains(S60_VERSION, "5\\.2") { - SYMBIAN_VERSION = Symbian3 +isEmpty(S60_VERSION) { + contains(SYMBIAN_VERSION, "9\\.2") { + S60_VERSION = 3.1 + } else:contains(SYMBIAN_VERSION, "9\\.3") { + S60_VERSION = 3.2 + } else:contains(SYMBIAN_VERSION, "9\\.4") { + S60_VERSION = 5.0 + } else:contains(SYMBIAN_VERSION, "Symbian2") { + S60_VERSION = 5.1 + } else:contains(SYMBIAN_VERSION, "Symbian3") { + S60_VERSION = 5.2 + } else { + S60_VERSION = Unknown } } @@ -174,14 +184,14 @@ isEmpty(SYMBIAN_VERSION) { default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platform_dependencies -# Supports S60 3.0, 3.1, 3.2, 5.0 and Symbian^3 by default +# Supports S60 3.1, 3.2, 5.0, Symbian^3, and Symbian^4 by default pkg_platform_dependencies = \ "; Default HW/platform dependencies" \ - "[0x101F7961],0,0,0,{\"S60ProductID\"}" \ "[0x102032BE],0,0,0,{\"S60ProductID\"}" \ "[0x102752AE],0,0,0,{\"S60ProductID\"}" \ "[0x1028315F],0,0,0,{\"S60ProductID\"}" \ - "[0x20022e6d],0,0,0,{\"S60ProductID\"}" \ + "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \ + "[0x20032DE7],0,0,0,{\"S60ProductID\"}" \ " " DEPLOYMENT += default_deployment diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index d844385..09c6587 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,3 +1,15 @@ +QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH) +!isEmpty(QT_BREAKPAD_ROOT_PATH): \ # quick test first whether requested ... + !staticlib:!static:CONFIG(release, debug|release):contains(TEMPLATE, .*(app|lib)): \ # is it applicable? + !contains(TARGET, .*phony_target.*): \ # monster hack, you don't really see this here, right? ;) + system($$QT_BREAKPAD_ROOT_PATH/qtbreakpadsymbols --breakpad-exists) { # do we really have it? + CONFIG += breakpad + CONFIG -= no_debug_info separate_debug_info + QMAKE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO + QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO + QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO +} + CONFIG(debug, debug|release):load(debug) else:load(release) debug_and_release:load(debug_and_release) @@ -6,6 +18,81 @@ incredibuild_xge { CONFIG = incredibuild_xge $$CONFIG } +breakpad { + !contains(DESTDIR, (/|.:[/\\\\]).*):TARGET_BASEPATH = $${OUT_PWD}/ + !isEmpty(DESTDIR):TARGET_BASEPATH = $${TARGET_BASEPATH}$${DESTDIR}/ + + win32 { + TARGET_BASEPATH ~= s,/,\\, + contains(TEMPLATE, .*lib) { + isEmpty(TARGET_VERSION_EXT):!isEmpty(VERSION) { + TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0) + isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT) + } + TARGET_EXT = .dll + } else { + TARGET_EXT = .exe + } + + DEBUGFILENAME = $${TARGET_BASEPATH}$${TARGET}$${TARGET_VERSION_EXT}$${TARGET_EXT} + PDBFILENAME = $${TARGET_BASEPATH}$${TARGET}$${TARGET_VERSION_EXT}.pdb + DEBUGFILENAME ~= s,/,\\, + PDBFILENAME ~= s,/,\\, + QMAKE_CLEAN += $$PDBFILENAME # for the debug case it is hardcoded in qmake + } else { + contains(TEMPLATE, .*lib):LIBPREFIX = lib + + macx { + equals(TEMPLATE, lib) { + lib_bundle { + TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.framework/$${TARGET} + } else { + TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET} + !plugin { + TEMP_VERSION = $$section(VERSION, ., 0, 0) + isEmpty(TEMP_VERSION):TEMP_VERSION = 1 + TARGET_BASEPATH = $${TARGET_BASEPATH}.$${TEMP_VERSION} + } + TARGET_BASEPATH = $${TARGET_BASEPATH}.$${QMAKE_EXTENSION_SHLIB} + } + } else { + app_bundle { + TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET}.app/Contents/MacOS/$${TARGET} + } else { + TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET} + } + } + DEBUGFILENAME = $$TARGET_BASEPATH + } else { + equals(TEMPLATE, lib) { + plugin { + TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so + } else { + TEMP_VERSION = $$VERSION + isEmpty(TEMP_VERSION):TEMP_VERSION = 1.0.0 + TARGET_BASEPATH = $${TARGET_BASEPATH}$${LIBPREFIX}$${TARGET}.so.$${TEMP_VERSION} + } + } else { + TARGET_BASEPATH = $${TARGET_BASEPATH}$${TARGET} + } + DEBUGFILENAME = $$TARGET_BASEPATH + } + } + + PROJECTPATH = $$OUT_PWD + win32:PROJECTPATH ~= s,/,\\, + + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$quote($${QT_BREAKPAD_ROOT_PATH}$${DIR_SEPARATOR}qtbreakpadsymbols \"$$DEBUGFILENAME\" \"$$PROJECTPATH\") + !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$quote($$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$QMAKE_STRIP \"$$DEBUGFILENAME\") + + unset(TARGET_BASEPATH) + unset(SYMBOLFILENAME) + unset(TARGET_EXT) + unset(TARGET_VERSION_EXT) + unset(TEMP_VERSION) +} + QMAKE_INCDIR += $$QMAKE_INCDIR_POST QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index abda78f..15e7fd9 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -45,10 +45,10 @@ defineReplace(mocCmd) { if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) { RET += $$mocinclude.commands } - RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2 + RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2 return($$RET) } - return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2) + return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) \"$$1\" -o $$2) } #moc headers diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 3b26f7d..af56a9a 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -21,7 +21,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +QMAKE_CFLAGS = -falign-stack=maintain-16-byte QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -w1 -Wcheck -wd654,1572,411,873,1125 QMAKE_CFLAGS_WARN_OFF = -w diff --git a/mkspecs/win32-msvc2003/qmake.conf b/mkspecs/win32-msvc2003/qmake.conf index 0230b30..63d1ffd 100644 --- a/mkspecs/win32-msvc2003/qmake.conf +++ b/mkspecs/win32-msvc2003/qmake.conf @@ -20,6 +20,7 @@ QMAKE_CFLAGS = -nologo -Zm300 QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 -MD +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = @@ -28,6 +29,7 @@ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_STL_ON = -EHsc @@ -51,6 +53,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link QMAKE_LFLAGS = /NOLOGO QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO +QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 0406fd0..265d028 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -20,6 +20,7 @@ QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t- QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 -MD +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_LTCG = -GL @@ -29,6 +30,7 @@ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG @@ -53,6 +55,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link QMAKE_LFLAGS = /NOLOGO QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO +QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\" diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index 9a69aaa..1432645 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -20,6 +20,7 @@ QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t- QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 -MD +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_LTCG = -GL @@ -30,6 +31,7 @@ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG @@ -55,6 +57,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link QMAKE_LFLAGS = /NOLOGO QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO +QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\" diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index 8331c14..84086e2 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -20,6 +20,7 @@ QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t- QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 -MD +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_LTCG = -GL @@ -30,6 +31,7 @@ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG @@ -55,6 +57,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link QMAKE_LFLAGS = /NOLOGO QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO +QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\" diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index db5b957..da4bbb7 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -622,31 +622,42 @@ UnixMakefileGenerator::processPrlFiles() //merge them into a logical order if(!project->isActiveConfig("no_smart_library_merge") && !project->isActiveConfig("no_lflags_merge")) { - QStringList lflags; + QHash<QString, QStringList> lflags; for(int lit = 0; lit < l.size(); ++lit) { + QString arch("default"); QString opt = l.at(lit).trimmed(); if(opt.startsWith("-")) { + if (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-Xarch")) { + if (opt.length() > 7) { + arch = opt.mid(7); + opt = l.at(++lit); + } + } + if(opt.startsWith("-L") || (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F"))) { - if(lit == 0 || l.lastIndexOf(opt, lit-1) == -1) - lflags.append(opt); + if(lit == 0 || !lflags[arch].contains(opt)) + lflags[arch].append(opt); } else if(opt.startsWith("-l")) { - if(lit == l.size()-1 || l.indexOf(opt, lit+1) == -1) - lflags.append(opt); + if(lit == l.size()-1 || !lflags[arch].contains(opt)) + lflags[arch].append(opt); } else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) { if(opt.length() > 11) opt = opt.mid(11); - else + else { opt = l.at(++lit); + if (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-Xarch")) + opt = l.at(++lit); // The user has done the right thing and prefixed each part + } bool found = false; - for(int x = lit+1; x < l.size(); ++x) { - QString xf = l.at(x); + for(int x = 0; x < lflags[arch].size(); ++x) { + QString xf = lflags[arch].at(x); if(xf.startsWith("-framework")) { QString framework; if(xf.length() > 11) framework = xf.mid(11); else - framework = l.at(++x); + framework = lflags[arch].at(++x); if(framework == opt) { found = true; break; @@ -654,18 +665,30 @@ UnixMakefileGenerator::processPrlFiles() } } if(!found) { - lflags.append("-framework"); - lflags.append(opt); + lflags[arch].append("-framework"); + lflags[arch].append(opt); } } else { - lflags.append(opt); + lflags[arch].append(opt); } } else if(!opt.isNull()) { if(lit == 0 || l.lastIndexOf(opt, lit-1) == -1) - lflags.append(opt); + lflags[arch].append(opt); + } + } + + l = lflags.take("default"); + + // Process architecture specific options (Xarch) + QHash<QString, QStringList>::const_iterator archIterator = lflags.constBegin(); + while (archIterator != lflags.constEnd()) { + const QStringList archOptions = archIterator.value(); + for (int i = 0; i < archOptions.size(); ++i) { + l.append(QLatin1String("-Xarch_") + archIterator.key()); + l.append(archOptions.at(i)); } + ++archIterator; } - l = lflags; } } } diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri index 4551d7b..63f2aca 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -1,3 +1,18 @@ +wince*: { + DEFINES += NO_GETENV + contains(CE_ARCH,x86):CONFIG -= stl exceptions + contains(CE_ARCH,x86):CONFIG += exceptions_off +} + +#Disable warnings in 3rdparty code due to unused arguments +symbian: { + QMAKE_CXXFLAGS.CW += -W nounusedarg + TARGET.UID3=0x2001E61B +} else:contains(QMAKE_CC, gcc): { + QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main +} + + INCLUDEPATH += $$PWD/libjpeg SOURCES += \ $$PWD/libjpeg/jaricom.c \ diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 5f688f3..981dba2 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -104,7 +104,7 @@ freebsd-*: DEFINES += HAVE_PTHREAD_NP_H DEFINES += BUILD_WEBKIT # Remove whole program optimizations due to miscompilations -win32-msvc2005|win32-msvc2008:{ +win32-msvc2005|win32-msvc2008|wince*:{ QMAKE_CFLAGS_RELEASE -= -GL QMAKE_CXXFLAGS_RELEASE -= -GL } @@ -2952,7 +2952,7 @@ HEADERS += $$WEBKIT_API_HEADERS } } -CONFIG(QTDIR_build) { +!CONFIG(webkit-debug):CONFIG(QTDIR_build) { # Remove the following 2 lines if you want debug information in WebCore CONFIG -= separate_debug_info CONFIG += no_debug_info diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index a080c43..bb3fd71 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri @@ -79,5 +79,5 @@ contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools # Disable a few warnings on Windows. The warnings are also # disabled in WebKitLibraries/win/tools/vsprops/common.vsprops -win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996 +win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996 diff --git a/src/corelib/codecs/qtextcodec_symbian.cpp b/src/corelib/codecs/qtextcodec_symbian.cpp index d59998f..9d7e856 100644 --- a/src/corelib/codecs/qtextcodec_symbian.cpp +++ b/src/corelib/codecs/qtextcodec_symbian.cpp @@ -122,8 +122,8 @@ static const QSymbianCodecInitData codecsData[] = { { /*271085624*/ 271085624, 114, "GB18030\0" }, { /*536929574*/ 536929574, 38, "EUC-KR\0" }, { /*536936703*/ 536936703, 0, "CP949\0" }, - { /*536936705*/ 536936705, 37, "ISO-2022-KR\0" }, - { /*536941517*/ 536941517, 36, "KS_C_5601-1987\0" } + { /*536936705*/ 536936705, 37, "ISO-2022-KR\0csISO2022KR\0" }, + { /*536941517*/ 536941517, 36, "KS_C_5601-1987\0iso-ir-149\0KS_C_5601-1989\0KSC_5601\0Korean\0csKSC56011987\0" } }; diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 260ed59..4800716 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -24,3 +24,6 @@ linux*:!static:!linux-armcc:!linux-gcce { prog=$$quote(if (/program interpreter: (.*)]/) { print $1; }) DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" } + +# Compensate for lack of platform defines in Symbian3 and Symbian4 +symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_)) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 401af85..3291fe7 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -86,7 +86,8 @@ # include "private/qcore_symbian_p.h" _LIT(qt_S60Filter, "Series60v?.*.sis"); -_LIT(qt_S60SystemInstallDir, "z:\\system\\install\\"); +_LIT(qt_symbianFilter, "Symbianv*.sis"); +_LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\"); #endif QT_BEGIN_NAMESPACE @@ -1813,12 +1814,12 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion() #endif #ifdef Q_OS_SYMBIAN -static QSysInfo::S60Version cachedS60Version = QSysInfo::S60Version(-1); +static QSysInfo::SymbianVersion cachedSymbianVersion = QSysInfo::SymbianVersion(-1); -QSysInfo::S60Version QSysInfo::s60Version() +QSysInfo::SymbianVersion QSysInfo::symbianVersion() { - if (cachedS60Version != -1) - return cachedS60Version; + if (cachedSymbianVersion != -1) + return cachedSymbianVersion; // Use pure Symbian code, because if done using QDir, there will be a call back // to this method, resulting doing this expensive operation twice before the cache kicks in. @@ -1826,7 +1827,22 @@ QSysInfo::S60Version QSysInfo::s60Version() RFs rfs = qt_s60GetRFs(); TFindFile fileFinder(rfs); CDir* contents; - TInt err = fileFinder.FindWildByDir(qt_S60Filter, qt_S60SystemInstallDir, contents); + + // Check for Symbian4 + TInt err = fileFinder.FindWildByDir(qt_symbianFilter, qt_symbianSystemInstallDir, contents); + if (err == KErrNone) { + QScopedPointer<CDir> contentsDeleter(contents); + err = contents->Sort(EDescending|ESortByName); + if (err == KErrNone && contents->Count() > 0 && (*contents)[0].iName.Length() >= 9) { + TInt major = (*contents)[0].iName[8] - '0'; + if (major == 4) { + return cachedSymbianVersion = SV_SF_4; + } + } + } + + // Check for S60 and Symbian3 platforms, which use older .sis naming scheme + err = fileFinder.FindWildByDir(qt_S60Filter, qt_symbianSystemInstallDir, contents); if (err == KErrNone) { QScopedPointer<CDir> contentsDeleter(contents); err = contents->Sort(EDescending|ESortByName); @@ -1835,19 +1851,19 @@ QSysInfo::S60Version QSysInfo::s60Version() TInt minor = (*contents)[0].iName[11] - '0'; if (major == 3) { if (minor == 1) { - return cachedS60Version = SV_S60_3_1; + return cachedSymbianVersion = SV_9_2; } else if (minor == 2) { - return cachedS60Version = SV_S60_3_2; + return cachedSymbianVersion = SV_9_3; } } else if (major == 5) { if (minor == 0) { - return cachedS60Version = SV_S60_5_0; + return cachedSymbianVersion = SV_9_4; } else if (minor == 1) { - return cachedS60Version = SV_S60_5_1; + return cachedSymbianVersion = SV_SF_2; } else if (minor == 2) { - return cachedS60Version = SV_S60_5_2; + return cachedSymbianVersion = SV_SF_3; } } } @@ -1855,33 +1871,40 @@ QSysInfo::S60Version QSysInfo::s60Version() # ifdef Q_CC_NOKIAX86 // Some emulator environments may not contain the version specific .sis files, so - // simply hardcode the version on those environments. + // simply hardcode the version on those environments. Note that can't use + // SYMBIAN_VERSION_* defines for S60 3.x/5.0 platforms, as they do not define them + // right anyway in case .sis files are not found. # if defined(__SERIES60_31__) - return cachedS60Version = SV_S60_3_1; + return cachedSymbianVersion = SV_9_2; # elif defined(__S60_32__) - return cachedS60Version = SV_S60_3_2; + return cachedSymbianVersion = SV_9_3; # elif defined(__S60_50__) - return cachedS60Version = SV_S60_5_0; + return cachedSymbianVersion = SV_9_4; +# elif defined(SYMBIAN_VERSION_SYMBIAN3) + return cachedSymbianVersion = SV_SF_3; +# elif defined(SYMBIAN_VERSION_SYMBIAN4) + return cachedSymbianVersion = SV_SF_4; # endif # endif //If reaching here, it was not possible to determine the version - return cachedS60Version = SV_S60_Unknown; + return cachedSymbianVersion = SV_Unknown; } -QSysInfo::SymbianVersion QSysInfo::symbianVersion() + +QSysInfo::S60Version QSysInfo::s60Version() { - switch (s60Version()) { - case SV_S60_3_1: - return SV_9_2; - case SV_S60_3_2: - return SV_9_3; - case SV_S60_5_0: - return SV_9_4; - case SV_S60_5_1: - return SV_SF_2; - case SV_S60_5_2: - return SV_SF_3; + switch (symbianVersion()) { + case SV_9_2: + return SV_S60_3_1; + case SV_9_3: + return SV_S60_3_2; + case SV_9_4: + return SV_S60_5_0; + case SV_SF_2: + return SV_S60_5_1; + case SV_SF_3: + return SV_S60_5_2; default: - return SV_Unknown; + return SV_S60_Unknown; } } #endif // ifdef Q_OS_SYMBIAN diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8f27b03..6ef15d4 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -44,11 +44,11 @@ #include <stddef.h> -#define QT_VERSION_STR "4.7.0" +#define QT_VERSION_STR "4.7.1" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040700 +#define QT_VERSION 0x040701 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ @@ -1050,7 +1050,7 @@ redefine to built-in booleans to make autotests work properly */ #if defined(__i386__) || defined(_WIN32) || defined(_WIN32_WCE) # if defined(Q_CC_GNU) -#if !defined(Q_CC_INTEL) && ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) >= 332) +#if ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) >= 332) # define QT_FASTCALL __attribute__((regparm(3))) #else # define QT_FASTCALL @@ -1515,7 +1515,7 @@ public: #endif #ifdef Q_OS_SYMBIAN enum SymbianVersion { - SV_Unknown = 0x0000, + SV_Unknown = 1000000, // Assume unknown is something newer than what is supported //These are the Symbian Ltd versions 9.2-9.4 SV_9_2 = 10, SV_9_3 = 20, @@ -1529,7 +1529,7 @@ public: static SymbianVersion symbianVersion(); enum S60Version { SV_S60_None = 0, - SV_S60_Unknown = 1, + SV_S60_Unknown = SV_Unknown, SV_S60_3_1 = SV_9_2, SV_S60_3_2 = SV_9_3, SV_S60_5_0 = SV_9_4, diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index d1fab2d..6a3037d 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -176,7 +176,6 @@ */ #include "qplatformdefs.h" #include "qurl.h" -#include "private/qunicodetables_p.h" #include "qatomic.h" #include "qbytearray.h" #include "qdir.h" diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 033da90..b0c784e 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -46,7 +46,6 @@ #include "qlist.h" #include "qlocale.h" #include "qlocale_p.h" -#include "qunicodetables_p.h" #include "qscopedpointer.h" #include <qdatastream.h> diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index ed0af4e..bb777cd 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -1630,21 +1630,4 @@ static void canonicalOrderHelper(QString *str, QChar::UnicodeVersion version, in } } -int QT_FASTCALL QUnicodeTables::script(unsigned int uc) -{ - if (uc > 0xffff) - return Common; - int script = uc_scripts[uc >> 7]; - if (script < ScriptSentinel) - return script; - script = (((script - ScriptSentinel) * UnicodeBlockSize) + UnicodeBlockCount); - script = uc_scripts[script + (uc & 0x7f)]; - return script; -} - -Q_CORE_EXPORT QUnicodeTables::LineBreakClass QT_FASTCALL QUnicodeTables::lineBreakClass(uint ucs4) -{ - return (QUnicodeTables::LineBreakClass) qGetProp(ucs4)->line_break_class; -} - QT_END_NAMESPACE diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 3521b31..5be885b 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6941,6 +6941,27 @@ QString QString::multiArg(int numArgs, const QString **args) const return result; } +static bool isStringRightToLeft(const ushort *p, const ushort *end) +{ + bool righttoleft = false; + while (p < end) { + switch(QChar::direction(*p)) + { + case QChar::DirL: + goto end; + case QChar::DirR: + case QChar::DirAL: + righttoleft = true; + goto end; + default: + break; + } + ++p; + } + end: + return righttoleft; +} + /*! \internal */ void QString::updateProperties() const @@ -6957,31 +6978,13 @@ void QString::updateProperties() const p++; } - d->righttoleft = isRightToLeft(); + d->righttoleft = isStringRightToLeft(d->data, d->data + d->size); d->clean = true; } bool QString::isRightToLeft() const { - ushort *p = d->data; - const ushort * const end = p + d->size; - bool righttoleft = false; - while (p < end) { - switch(QChar::direction(*p)) - { - case QChar::DirL: - goto end; - case QChar::DirR: - case QChar::DirAL: - righttoleft = true; - goto end; - default: - break; - } - ++p; - } - end: - return righttoleft; + return isStringRightToLeft(d->data, d->data + d->size); } /*! \fn bool QString::isSimpleText() const diff --git a/src/corelib/tools/qstringmatcher.cpp b/src/corelib/tools/qstringmatcher.cpp index 80a8457..d445ed4 100644 --- a/src/corelib/tools/qstringmatcher.cpp +++ b/src/corelib/tools/qstringmatcher.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "qstringmatcher.h" -#include "qunicodetables_p.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp index 9df31e5..68e72cc 100644 --- a/src/corelib/tools/qunicodetables.cpp +++ b/src/corelib/tools/qunicodetables.cpp @@ -4345,6 +4345,11 @@ Q_CORE_EXPORT const QUnicodeTables::Properties * QT_FASTCALL QUnicodeTables::pro return uc_properties + index; } +Q_CORE_EXPORT QUnicodeTables::LineBreakClass QT_FASTCALL QUnicodeTables::lineBreakClass(uint ucs4) +{ + return (QUnicodeTables::LineBreakClass)qGetProp(ucs4)->line_break_class; +} + static const ushort specialCaseMap[] = { 0x53, 0x73, 0x0, 0x53, 0x53, 0x0, @@ -8561,7 +8566,7 @@ static const unsigned char uc_scripts[] = { Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Common, Common, Common, Common, Greek, Greek, Common, Common, - Common, Common, Greek, Greek, Greek, Greek, Common, Common, + Common, Common, Greek, Greek, Greek, Greek, Common, Common, /* U+0380-03ff at offset 640 */ Common, Common, Common, Common, Greek, Greek, Greek, Common, @@ -8579,7 +8584,7 @@ static const unsigned char uc_scripts[] = { Greek, Greek, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Coptic, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, - Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, + Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, /* U+0480-04ff at offset 768 */ Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Common, @@ -8597,7 +8602,7 @@ static const unsigned char uc_scripts[] = { Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, - Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, + Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, /* U+0500-057f at offset 896 */ Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, Cyrillic, @@ -8615,7 +8620,7 @@ static const unsigned char uc_scripts[] = { Common, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, - Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, + Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, /* U+0580-05ff at offset 1024 */ Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, Armenian, @@ -8633,7 +8638,7 @@ static const unsigned char uc_scripts[] = { Hebrew, Hebrew, Hebrew, Hebrew, Hebrew, Hebrew, Hebrew, Hebrew, Hebrew, Hebrew, Hebrew, Common, Common, Common, Common, Common, Hebrew, Hebrew, Hebrew, Hebrew, Hebrew, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0600-067f at offset 1152 */ Common, Common, Common, Common, Common, Common, Common, Common, @@ -8651,7 +8656,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Inherited, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, - Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, + Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, /* U+0680-06ff at offset 1280 */ Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, @@ -8669,7 +8674,7 @@ static const unsigned char uc_scripts[] = { Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, - Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, + Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, /* U+0700-077f at offset 1408 */ Syriac, Syriac, Syriac, Syriac, Syriac, Syriac, Syriac, Syriac, @@ -8687,7 +8692,7 @@ static const unsigned char uc_scripts[] = { Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0780-07ff at offset 1536 */ Thaana, Thaana, Thaana, Thaana, Thaana, Thaana, Thaana, Thaana, @@ -8705,7 +8710,7 @@ static const unsigned char uc_scripts[] = { Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, Nko, - Nko, Nko, Nko, Common, Common, Common, Common, Common, + Nko, Nko, Nko, Common, Common, Common, Common, Common, /* U+0900-097f at offset 1664 */ Common, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, @@ -8723,7 +8728,7 @@ static const unsigned char uc_scripts[] = { Devanagari, Devanagari, Devanagari, Devanagari, Common, Common, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, + Common, Common, Common, Devanagari, Devanagari, Devanagari, Devanagari, Devanagari, /* U+0980-09ff at offset 1792 */ Common, Bengali, Bengali, Bengali, Common, Bengali, Bengali, Bengali, @@ -8741,7 +8746,7 @@ static const unsigned char uc_scripts[] = { Bengali, Bengali, Bengali, Bengali, Common, Common, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, Bengali, - Bengali, Bengali, Bengali, Common, Common, Common, Common, Common, + Bengali, Bengali, Bengali, Common, Common, Common, Common, Common, /* U+0a00-0a7f at offset 1920 */ Common, Gurmukhi, Gurmukhi, Gurmukhi, Common, Gurmukhi, Gurmukhi, Gurmukhi, @@ -8759,7 +8764,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Gurmukhi, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0a80-0aff at offset 2048 */ Common, Gujarati, Gujarati, Gujarati, Common, Gujarati, Gujarati, Gujarati, @@ -8777,7 +8782,7 @@ static const unsigned char uc_scripts[] = { Gujarati, Gujarati, Gujarati, Gujarati, Common, Common, Gujarati, Gujarati, Gujarati, Gujarati, Gujarati, Gujarati, Gujarati, Gujarati, Gujarati, Gujarati, Common, Gujarati, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0b00-0b7f at offset 2176 */ Common, Oriya, Oriya, Oriya, Common, Oriya, Oriya, Oriya, @@ -8795,7 +8800,7 @@ static const unsigned char uc_scripts[] = { Oriya, Oriya, Common, Common, Common, Common, Oriya, Oriya, Oriya, Oriya, Oriya, Oriya, Oriya, Oriya, Oriya, Oriya, Oriya, Oriya, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0b80-0bff at offset 2304 */ Common, Common, Tamil, Tamil, Common, Tamil, Tamil, Tamil, @@ -8813,7 +8818,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, Tamil, - Tamil, Tamil, Tamil, Common, Common, Common, Common, Common, + Tamil, Tamil, Tamil, Common, Common, Common, Common, Common, /* U+0c00-0c7f at offset 2432 */ Common, Telugu, Telugu, Telugu, Common, Telugu, Telugu, Telugu, @@ -8831,7 +8836,7 @@ static const unsigned char uc_scripts[] = { Telugu, Telugu, Common, Common, Common, Common, Telugu, Telugu, Telugu, Telugu, Telugu, Telugu, Telugu, Telugu, Telugu, Telugu, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0c80-0cff at offset 2560 */ Common, Common, Kannada, Kannada, Common, Kannada, Kannada, Kannada, @@ -8849,7 +8854,7 @@ static const unsigned char uc_scripts[] = { Kannada, Kannada, Kannada, Kannada, Common, Common, Kannada, Kannada, Kannada, Kannada, Kannada, Kannada, Kannada, Kannada, Kannada, Kannada, Common, Kannada, Kannada, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0d00-0d7f at offset 2688 */ Common, Common, Malayalam, Malayalam, Common, Malayalam, Malayalam, Malayalam, @@ -8867,7 +8872,7 @@ static const unsigned char uc_scripts[] = { Malayalam, Malayalam, Common, Common, Common, Common, Malayalam, Malayalam, Malayalam, Malayalam, Malayalam, Malayalam, Malayalam, Malayalam, Malayalam, Malayalam, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0d80-0dff at offset 2816 */ Common, Common, Sinhala, Sinhala, Common, Sinhala, Sinhala, Sinhala, @@ -8885,7 +8890,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Sinhala, Sinhala, Sinhala, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0e00-0e7f at offset 2944 */ Common, Thai, Thai, Thai, Thai, Thai, Thai, Thai, @@ -8903,7 +8908,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0e80-0eff at offset 3072 */ Common, Lao, Lao, Common, Lao, Common, Common, Lao, @@ -8921,7 +8926,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+0f00-0f7f at offset 3200 */ Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, @@ -8939,7 +8944,7 @@ static const unsigned char uc_scripts[] = { Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Common, Common, Common, Common, Common, Common, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, - Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, + Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, /* U+0f80-0fff at offset 3328 */ Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, Tibetan, @@ -8957,7 +8962,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+1000-107f at offset 3456 */ Myanmar, Myanmar, Myanmar, Myanmar, Myanmar, Myanmar, Myanmar, Myanmar, @@ -8975,7 +8980,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+1080-10ff at offset 3584 */ Common, Common, Common, Common, Common, Common, Common, Common, @@ -8993,7 +8998,7 @@ static const unsigned char uc_scripts[] = { Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, - Georgian, Georgian, Georgian, Common, Georgian, Common, Common, Common, + Georgian, Georgian, Georgian, Common, Georgian, Common, Common, Common, /* U+1100-117f at offset 3712 */ Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, @@ -9011,7 +9016,7 @@ static const unsigned char uc_scripts[] = { Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, - Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, + Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, /* U+1180-11ff at offset 3840 */ Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, @@ -9029,7 +9034,7 @@ static const unsigned char uc_scripts[] = { Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, - Hangul, Hangul, Common, Common, Common, Common, Common, Common, + Hangul, Hangul, Common, Common, Common, Common, Common, Common, /* U+1680-16ff at offset 3968 */ Ogham, Ogham, Ogham, Ogham, Ogham, Ogham, Ogham, Ogham, @@ -9047,7 +9052,7 @@ static const unsigned char uc_scripts[] = { Runic, Runic, Runic, Runic, Runic, Runic, Runic, Runic, Runic, Runic, Runic, Common, Common, Common, Runic, Runic, Runic, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+1780-17ff at offset 4096 */ Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, @@ -9065,7 +9070,7 @@ static const unsigned char uc_scripts[] = { Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Common, Common, Common, Common, Common, Common, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, - Khmer, Khmer, Common, Common, Common, Common, Common, Common, + Khmer, Khmer, Common, Common, Common, Common, Common, Common, /* U+1980-19ff at offset 4224 */ NewTaiLue, NewTaiLue, NewTaiLue, NewTaiLue, NewTaiLue, NewTaiLue, NewTaiLue, NewTaiLue, @@ -9083,7 +9088,7 @@ static const unsigned char uc_scripts[] = { Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, - Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, + Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, Khmer, /* U+1d00-1d7f at offset 4352 */ Latin, Latin, Latin, Latin, Latin, Latin, Latin, Latin, @@ -9101,7 +9106,7 @@ static const unsigned char uc_scripts[] = { Greek, Greek, Latin, Latin, Latin, Latin, Greek, Greek, Greek, Greek, Greek, Latin, Latin, Latin, Latin, Latin, Latin, Latin, Latin, Latin, Latin, Latin, Latin, Latin, - Cyrillic, Latin, Latin, Latin, Latin, Latin, Latin, Latin, + Cyrillic, Latin, Latin, Latin, Latin, Latin, Latin, Latin, /* U+1d80-1dff at offset 4480 */ Latin, Latin, Latin, Latin, Latin, Latin, Latin, Latin, @@ -9119,7 +9124,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Inherited, Inherited, + Common, Common, Common, Common, Common, Common, Inherited, Inherited, /* U+1f00-1f7f at offset 4608 */ Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, @@ -9137,7 +9142,7 @@ static const unsigned char uc_scripts[] = { Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, - Greek, Greek, Greek, Greek, Greek, Greek, Common, Common, + Greek, Greek, Greek, Greek, Greek, Greek, Common, Common, /* U+1f80-1fff at offset 4736 */ Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, @@ -9155,7 +9160,7 @@ static const unsigned char uc_scripts[] = { Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Greek, Common, Common, Greek, Greek, Greek, Common, Greek, Greek, - Greek, Greek, Greek, Greek, Greek, Greek, Greek, Common, + Greek, Greek, Greek, Greek, Greek, Greek, Greek, Common, /* U+2000-207f at offset 4864 */ Common, Common, Common, Common, Common, Common, Common, Common, @@ -9173,7 +9178,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Latin, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Latin, + Common, Common, Common, Common, Common, Common, Common, Latin, /* U+2080-20ff at offset 4992 */ Common, Common, Common, Common, Common, Common, Common, Common, @@ -9191,7 +9196,7 @@ static const unsigned char uc_scripts[] = { Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+2100-217f at offset 5120 */ Common, Common, Common, Common, Common, Common, Common, Common, @@ -9209,7 +9214,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+2d00-2d7f at offset 5248 */ Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, Georgian, @@ -9227,7 +9232,7 @@ static const unsigned char uc_scripts[] = { Tifinagh, Tifinagh, Tifinagh, Tifinagh, Tifinagh, Tifinagh, Common, Common, Common, Common, Common, Common, Common, Common, Common, Tifinagh, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+3000-307f at offset 5376 */ Common, Common, Common, Common, Common, Han, Common, Han, @@ -9245,7 +9250,7 @@ static const unsigned char uc_scripts[] = { Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, - Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, + Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, /* U+3080-30ff at offset 5504 */ Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, Hiragana, @@ -9263,7 +9268,7 @@ static const unsigned char uc_scripts[] = { Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, - Katakana, Katakana, Katakana, Common, Common, Katakana, Katakana, Katakana, + Katakana, Katakana, Katakana, Common, Common, Katakana, Katakana, Katakana, /* U+3100-317f at offset 5632 */ Common, Common, Common, Common, Common, Bopomofo, Bopomofo, Bopomofo, @@ -9281,7 +9286,7 @@ static const unsigned char uc_scripts[] = { Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, - Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, + Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, /* U+3180-31ff at offset 5760 */ Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, @@ -9299,7 +9304,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, - Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, + Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, /* U+3200-327f at offset 5888 */ Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, @@ -9317,7 +9322,7 @@ static const unsigned char uc_scripts[] = { Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, - Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Common, Common, + Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Common, Common, /* U+d780-d7ff at offset 6016 */ Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, Hangul, @@ -9335,7 +9340,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common, + Common, Common, Common, Common, Common, Common, Common, Common, /* U+fb00-fb7f at offset 6144 */ Latin, Latin, Latin, Latin, Latin, Latin, Latin, Common, @@ -9353,7 +9358,7 @@ static const unsigned char uc_scripts[] = { Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, - Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, + Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, /* U+fb80-fbff at offset 6272 */ Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, @@ -9371,7 +9376,7 @@ static const unsigned char uc_scripts[] = { Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, - Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, + Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, /* U+fd00-fd7f at offset 6400 */ Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, @@ -9389,7 +9394,7 @@ static const unsigned char uc_scripts[] = { Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, - Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, + Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, /* U+fd80-fdff at offset 6528 */ Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, @@ -9407,7 +9412,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, - Arabic, Arabic, Arabic, Arabic, Arabic, Common, Common, Common, + Arabic, Arabic, Arabic, Arabic, Arabic, Common, Common, Common, /* U+fe00-fe7f at offset 6656 */ Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, Inherited, @@ -9425,7 +9430,7 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Arabic, Arabic, Arabic, Arabic, Arabic, Common, Arabic, Arabic, - Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, + Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, /* U+fe80-feff at offset 6784 */ Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, @@ -9443,7 +9448,7 @@ static const unsigned char uc_scripts[] = { Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, Arabic, - Arabic, Arabic, Arabic, Arabic, Arabic, Common, Common, Common, + Arabic, Arabic, Arabic, Arabic, Arabic, Common, Common, Common, /* U+ff80-ffff at offset 6912 */ Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, Katakana, @@ -9461,9 +9466,21 @@ static const unsigned char uc_scripts[] = { Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, Common, - Common, Common, Common, Common, Common, Common, Common, Common + Common, Common, Common, Common, Common, Common, Common, Common }; } // namespace QUnicodeTables +Q_CORE_EXPORT int QT_FASTCALL QUnicodeTables::script(uint ucs4) +{ + if (ucs4 > 0xffff) + return Common; + int script = uc_scripts[ucs4 >> 7]; + if (script < ScriptSentinel) + return script; + script = (((script - ScriptSentinel) * UnicodeBlockSize) + UnicodeBlockCount); + script = uc_scripts[script + (ucs4 & 0x7f)]; + return script; +} + QT_END_NAMESPACE diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index 5c7cc08..be52bf9 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -162,20 +162,6 @@ namespace QUnicodeTables { enum { ScriptSentinel = 32 }; - // see http://www.unicode.org/reports/tr14/tr14-19.html - // we don't use the XX, AI and CB properties and map them to AL instead. - // as we don't support any EBDIC based OS'es, NL is ignored and mapped to AL as well. - enum LineBreakClass { - LineBreak_OP, LineBreak_CL, LineBreak_QU, LineBreak_GL, LineBreak_NS, - LineBreak_EX, LineBreak_SY, LineBreak_IS, LineBreak_PR, LineBreak_PO, - LineBreak_NU, LineBreak_AL, LineBreak_ID, LineBreak_IN, LineBreak_HY, - LineBreak_BA, LineBreak_BB, LineBreak_B2, LineBreak_ZW, LineBreak_CM, - LineBreak_WJ, LineBreak_H2, LineBreak_H3, LineBreak_JL, LineBreak_JV, - LineBreak_JT, LineBreak_SA, LineBreak_SG, - LineBreak_SP, LineBreak_CR, LineBreak_LF, LineBreak_BK - }; - - enum GraphemeBreak { GraphemeBreakOther, GraphemeBreakCR, @@ -217,6 +203,20 @@ namespace QUnicodeTables { }; + // see http://www.unicode.org/reports/tr14/tr14-19.html + // we don't use the XX, AI and CB properties and map them to AL instead. + // as we don't support any EBDIC based OS'es, NL is ignored and mapped to AL as well. + enum LineBreakClass { + LineBreak_OP, LineBreak_CL, LineBreak_QU, LineBreak_GL, LineBreak_NS, + LineBreak_EX, LineBreak_SY, LineBreak_IS, LineBreak_PR, LineBreak_PO, + LineBreak_NU, LineBreak_AL, LineBreak_ID, LineBreak_IN, LineBreak_HY, + LineBreak_BA, LineBreak_BB, LineBreak_B2, LineBreak_ZW, LineBreak_CM, + LineBreak_WJ, LineBreak_H2, LineBreak_H3, LineBreak_JL, LineBreak_JV, + LineBreak_JT, LineBreak_SA, LineBreak_SG, + LineBreak_SP, LineBreak_CR, LineBreak_LF, LineBreak_BK + }; + + Q_CORE_EXPORT QUnicodeTables::LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4); inline int lineBreakClass(const QChar &ch) { return lineBreakClass(ch.unicode()); } diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 81af2c7..1bd00da 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -160,6 +160,9 @@ public: struct WatchedServiceData { WatchedServiceData() : refcount(0) {} + WatchedServiceData(const QString &owner, int refcount = 0) + : owner(owner), refcount(refcount) + {} QString owner; int refcount; }; diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 3833874..31588e7 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -71,6 +71,17 @@ QT_BEGIN_NAMESPACE static bool isDebugging; #define qDBusDebug if (!::isDebugging); else qDebug +Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) + +static inline QString dbusServiceString() +{ return *orgFreedesktopDBusString(); } +static inline QString dbusInterfaceString() +{ + // it's the same string, but just be sure + Q_ASSERT(*orgFreedesktopDBusString() == QLatin1String(DBUS_INTERFACE_DBUS)); + return *orgFreedesktopDBusString(); +} + static inline QDebug operator<<(QDebug dbg, const QThread *th) { dbg.nospace() << "QThread(ptr=" << (void*)th; @@ -962,6 +973,14 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p) QDBusMetaTypeId::init(); rootNode.flags = 0; + + // prepopulate watchedServices: + // we know that the owner of org.freedesktop.DBus is itself + watchedServices.insert(dbusServiceString(), WatchedServiceData(dbusServiceString(), 1)); + + // prepopulate matchRefCounts: + // we know that org.freedesktop.DBus will never change owners + matchRefCounts.insert("type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',arg0='org.freedesktop.DBus'", 1); } QDBusConnectionPrivate::~QDBusConnectionPrivate() @@ -1646,43 +1665,34 @@ void QDBusConnectionPrivate::setConnection(DBusConnection *dbc, const QDBusError connection = dbc; mode = ClientMode; + const char *service = q_dbus_bus_get_unique_name(connection); + Q_ASSERT(service); + baseService = QString::fromUtf8(service); + q_dbus_connection_set_exit_on_disconnect(connection, false); q_dbus_connection_set_watch_functions(connection, qDBusAddWatch, qDBusRemoveWatch, qDBusToggleWatch, this, 0); q_dbus_connection_set_timeout_functions(connection, qDBusAddTimeout, qDBusRemoveTimeout, qDBusToggleTimeout, this, 0); q_dbus_connection_set_dispatch_status_function(connection, qDBusUpdateDispatchStatus, this, 0); + q_dbus_connection_add_filter(connection, qDBusSignalFilter, this, 0); - // Initialize the match rules - // We want all messages that have us as destination - // signals don't have destinations, but connectSignal() takes care of them - const char *service = q_dbus_bus_get_unique_name(connection); - if (service) { - QVarLengthArray<char, 56> filter; - filter.append("destination='", 13); - filter.append(service, qstrlen(service)); - filter.append("\'\0", 2); - - QDBusErrorInternal error; - q_dbus_bus_add_match(connection, filter.constData(), error); - if (handleError(error)) { - closeConnection(); - return; - } - - baseService = QString::fromUtf8(service); - } else { - qWarning("QDBusConnectionPrivate::setConnection: Unable to get base service"); - } - - QString busService = QLatin1String(DBUS_SERVICE_DBUS); - connectSignal(busService, QString(), QString(), QLatin1String("NameAcquired"), QStringList(), QString(), - this, SLOT(registerService(QString))); - connectSignal(busService, QString(), QString(), QLatin1String("NameLost"), QStringList(), QString(), - this, SLOT(unregisterService(QString))); + // Initialize the hooks for the NameAcquired and NameLost signals + // we don't use connectSignal here because we don't need the rules to be sent to the bus + // the bus will always send us these two signals + SignalHook hook; + hook.service = dbusServiceString(); + hook.path.clear(); // no matching + hook.obj = this; + hook.params << QMetaType::Void << QVariant::String; // both functions take a QString as parameter and return void + hook.midx = staticMetaObject.indexOfSlot("registerService(QString)"); + Q_ASSERT(hook.midx != -1); + signalHooks.insert(QLatin1String("NameAcquired:" DBUS_INTERFACE_DBUS), hook); - q_dbus_connection_add_filter(connection, qDBusSignalFilter, this, 0); + hook.midx = staticMetaObject.indexOfSlot("unregisterService(QString)"); + Q_ASSERT(hook.midx != -1); + signalHooks.insert(QLatin1String("NameLost:" DBUS_INTERFACE_DBUS), hook); qDBusDebug() << this << ": connected successfully"; @@ -2069,8 +2079,7 @@ void QDBusConnectionPrivate::connectSignal(const QString &key, const SignalHook WatchedServicesHash::mapped_type &data = watchedServices[hook.service]; if (++data.refcount == 1) { // we need to watch for this service changing - QString dbusServerService = QLatin1String(DBUS_SERVICE_DBUS); - connectSignal(dbusServerService, QString(), QLatin1String(DBUS_INTERFACE_DBUS), + connectSignal(dbusServiceString(), QString(), dbusInterfaceString(), QLatin1String("NameOwnerChanged"), QStringList() << hook.service, QString(), this, SLOT(_q_serviceOwnerChanged(QString,QString,QString))); data.owner = getNameOwnerNoCache(hook.service); @@ -2149,8 +2158,7 @@ QDBusConnectionPrivate::disconnectSignal(SignalHookHash::Iterator &it) if (sit != watchedServices.end()) { if (--sit.value().refcount == 0) { watchedServices.erase(sit); - QString dbusServerService = QLatin1String(DBUS_SERVICE_DBUS); - disconnectSignal(dbusServerService, QString(), QLatin1String(DBUS_INTERFACE_DBUS), + disconnectSignal(dbusServiceString(), QString(), dbusInterfaceString(), QLatin1String("NameOwnerChanged"), QStringList() << hook.service, QString(), this, SLOT(_q_serviceOwnerChanged(QString,QString,QString))); } @@ -2272,8 +2280,8 @@ QString QDBusConnectionPrivate::getNameOwner(const QString& serviceName) QString QDBusConnectionPrivate::getNameOwnerNoCache(const QString &serviceName) { - QDBusMessage msg = QDBusMessage::createMethodCall(QLatin1String(DBUS_SERVICE_DBUS), - QLatin1String(DBUS_PATH_DBUS), QLatin1String(DBUS_INTERFACE_DBUS), + QDBusMessage msg = QDBusMessage::createMethodCall(dbusServiceString(), + QLatin1String(DBUS_PATH_DBUS), dbusInterfaceString(), QLatin1String("GetNameOwner")); QDBusMessagePrivate::setParametersValidated(msg, true); msg << serviceName; diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri index 33d0843..25f7687 100644 --- a/src/declarative/debugger/debugger.pri +++ b/src/declarative/debugger/debugger.pri @@ -6,7 +6,8 @@ SOURCES += \ $$PWD/qdeclarativedebugservice.cpp \ $$PWD/qdeclarativedebugclient.cpp \ $$PWD/qdeclarativedebug.cpp \ - $$PWD/qdeclarativedebugtrace.cpp + $$PWD/qdeclarativedebugtrace.cpp \ + $$PWD/qdeclarativedebughelper.cpp HEADERS += \ $$PWD/qdeclarativedebuggerstatus_p.h \ @@ -14,4 +15,5 @@ HEADERS += \ $$PWD/qdeclarativedebugservice_p.h \ $$PWD/qdeclarativedebugclient_p.h \ $$PWD/qdeclarativedebug_p.h \ - $$PWD/qdeclarativedebugtrace_p.h + $$PWD/qdeclarativedebugtrace_p.h \ + $$PWD/qdeclarativedebughelper_p.h diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h index f0fc488..2b1a115 100644 --- a/src/declarative/debugger/qdeclarativedebug_p.h +++ b/src/declarative/debugger/qdeclarativedebug_p.h @@ -365,7 +365,6 @@ private: int m_queryId; QVariant m_expr; QVariant m_result; - }; QT_END_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp new file mode 100644 index 0000000..207ad2b --- /dev/null +++ b/src/declarative/debugger/qdeclarativedebughelper.cpp @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtScript/QScriptEngine> + +#include "private/qdeclarativedebughelper_p.h" + +#include <QtCore/QAbstractAnimation> +#include <QtScript/QScriptEngine> + +#include <private/qdeclarativeengine_p.h> +#include <private/qabstractanimation_p.h> + +QT_BEGIN_NAMESPACE + +QScriptEngine *QDeclarativeDebugHelper::getScriptEngine(QDeclarativeEngine *engine) +{ + return QDeclarativeEnginePrivate::getScriptEngine(engine); +} + +void QDeclarativeDebugHelper::setAnimationSlowDownFactor(qreal factor) +{ + QUnifiedTimer *timer = QUnifiedTimer::instance(); + timer->setSlowModeEnabled(factor != 1.0); + timer->setSlowdownFactor(factor); +} + +QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeclassfactory.cpp b/src/declarative/debugger/qdeclarativedebughelper_p.h index 798eacd..c9cb839 100644 --- a/src/declarative/qml/qdeclarativeclassfactory.cpp +++ b/src/declarative/debugger/qdeclarativedebughelper_p.h @@ -39,12 +39,29 @@ ** ****************************************************************************/ -#include "private/qdeclarativeclassfactory_p.h" +#ifndef QDECLARATIVEDEBUGHELPER_P_H +#define QDECLARATIVEDEBUGHELPER_P_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QDeclarativeClassFactory::~QDeclarativeClassFactory() +class QScriptEngine; +class QDeclarativeEngine; + +// Helper methods to access private API through a stable interface +// This is used in the qmljsdebugger library of QtCreator. +class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper { -} +public: + static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine); + static void setAnimationSlowDownFactor(qreal factor); +}; QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QDECLARATIVEDEBUGHELPER_P_H diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index a70886e..21d1ea7 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -621,7 +621,7 @@ QDeclarativeVisualDataModelParts::QDeclarativeVisualDataModelParts(QDeclarativeV QDeclarativeVisualDataModelPrivate::QDeclarativeVisualDataModelPrivate(QDeclarativeContext *ctxt) : m_listModelInterface(0), m_abstractItemModel(0), m_visualItemModel(0), m_delegate(0) -, m_context(ctxt), m_parts(0), m_delegateDataType(0), m_metaDataCreated(false) +, m_context(ctxt), m_modelDataPropId(-1), m_parts(0), m_delegateDataType(0), m_metaDataCreated(false) , m_metaDataCacheable(false), m_delegateValidated(false), m_completePending(false), m_listAccessor(0) { } @@ -1187,7 +1187,7 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count, if (propId != -1) { if (data->hasValue(propId)) { if (d->m_listModelInterface) { - data->setValue(propId, d->m_listModelInterface->data(idx, QList<int>() << role).value(role)); + data->setValue(propId, d->m_listModelInterface->data(idx, role)); } else if (d->m_abstractItemModel) { QModelIndex index = d->m_abstractItemModel->index(idx, 0, d->m_root); data->setValue(propId, d->m_abstractItemModel->data(index, role)); @@ -1202,13 +1202,13 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count, qmlInfo(this) << "Changing role not present in item: " << roleName; } } - if (roles.count() == 1) { + if (d->m_roles.count() == 1) { // Handle the modelData role we add if there is just one role. int propId = data->modelDataPropertyId(); if (data->hasValue(propId)) { - int role = roles.at(0); + int role = d->m_roles.at(0); if (d->m_listModelInterface) { - data->setValue(propId, d->m_listModelInterface->data(idx, QList<int>() << role).value(role)); + data->setValue(propId, d->m_listModelInterface->data(idx, role)); } else if (d->m_abstractItemModel) { QModelIndex index = d->m_abstractItemModel->index(idx, 0, d->m_root); data->setValue(propId, d->m_abstractItemModel->data(index, role)); diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 80db230..26b3629 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1783,7 +1783,9 @@ void QDeclarativeEnginePrivate::warning(QDeclarativeEnginePrivate *engine, const /*! \qmlmethod Qt::quit() This function causes the QDeclarativeEngine::quit() signal to be emitted. -Within the \l {QML Viewer}, this causes the launcher application to exit. +Within the \l {QML Viewer}, this causes the launcher application to exit; +to quit a C++ application when this method is called, connect the +QDeclarativeEngine::quit() signal to the QCoreApplication::quit() slot. */ QScriptValue QDeclarativeEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptEngine *e) diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index dc7315d..8539fbf 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -55,7 +55,6 @@ #include "qdeclarativeengine.h" -#include "private/qdeclarativeclassfactory_p.h" #include "private/qdeclarativetypeloader_p.h" #include "private/qdeclarativeimport_p.h" #include "private/qpodvector_p.h" diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 687ff52..66b69f9 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -22,7 +22,6 @@ SOURCES += \ $$PWD/qdeclarativerefcount.cpp \ $$PWD/qdeclarativemetatype.cpp \ $$PWD/qdeclarativestringconverters.cpp \ - $$PWD/qdeclarativeclassfactory.cpp \ $$PWD/qdeclarativeparserstatus.cpp \ $$PWD/qdeclarativetypeloader.cpp \ $$PWD/qdeclarativeinfo.cpp \ @@ -89,7 +88,6 @@ HEADERS += \ $$PWD/qdeclarativecontext.h \ $$PWD/qdeclarativeexpression.h \ $$PWD/qdeclarativestringconverters_p.h \ - $$PWD/qdeclarativeclassfactory_p.h \ $$PWD/qdeclarativeinfo.h \ $$PWD/qdeclarativeproperty_p.h \ $$PWD/qdeclarativecontext_p.h \ diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index cdd5041..8cb17e4 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/declarative/util/qdeclarativeanimation_p.h @@ -63,7 +63,7 @@ QT_MODULE(Declarative) class QDeclarativeAbstractAnimationPrivate; class QDeclarativeAnimationGroup; -class Q_AUTOTEST_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeAbstractAnimation) diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 3263238..398480e 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -310,14 +310,6 @@ QString QDeclarativeListModel::toString(int role) const return m_flat ? m_flat->toString(role) : m_nested->toString(role); } -QHash<int,QVariant> QDeclarativeListModel::data(int index, const QList<int> &roles) const -{ - if (index >= count() || index < 0) - return QHash<int, QVariant>(); - - return m_flat ? m_flat->data(index, roles) : m_nested->data(index, roles); -} - QVariant QDeclarativeListModel::data(int index, int role) const { if (index >= count() || index < 0) @@ -560,7 +552,8 @@ QScriptValue QDeclarativeListModel::get(int index) const fruitModel.set(3, {"cost": 5.95, "name":"Pizza"}) \endcode - The \a index must be an element in the list. + If \a index is equal to count() then a new item is appended to the + list. Otherwise, \a index must be an element in the list. \sa append() */ @@ -570,7 +563,7 @@ void QDeclarativeListModel::set(int index, const QScriptValue& valuemap) qmlInfo(this) << tr("set: value is not an object"); return; } - if (count() == 0 || index > count() || index < 0) { + if (index > count() || index < 0) { qmlInfo(this) << tr("set: index %1 out of range").arg(index); return; } @@ -920,19 +913,6 @@ FlatListModel::~FlatListModel() qDeleteAll(m_nodeData); } -QHash<int,QVariant> FlatListModel::data(int index, const QList<int> &roles) const -{ - Q_ASSERT(index >= 0 && index < m_values.count()); - - QHash<int, QVariant> row; - for (int i=0; i<roles.count(); i++) { - int role = roles[i]; - if (m_values[index].contains(role)) - row.insert(role, m_values[index][role]); - } - return row; -} - QVariant FlatListModel::data(int index, int role) const { Q_ASSERT(index >= 0 && index < m_values.count()); @@ -972,11 +952,6 @@ void FlatListModel::remove(int index) removedNode(index); } -bool FlatListModel::append(const QScriptValue &value) -{ - return insert(m_values.count(), value); -} - bool FlatListModel::insert(int index, const QScriptValue &value) { Q_ASSERT(index >= 0 && index <= m_values.count()); @@ -1350,17 +1325,6 @@ void NestedListModel::move(int from, int to, int n) qdeclarativelistmodel_move<QVariantList>(from, to, n, &_root->values); } -bool NestedListModel::append(const QScriptValue& valuemap) -{ - if (!_root) { - _root = new ModelNode(this); - m_ownsRoot = true; - } - - insert(count(), valuemap); - return true; -} - QScriptValue NestedListModel::get(int index) const { QDeclarativeEngine *eng = qmlEngine(m_listModel); diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h index fe42ef6..e9673c8 100644 --- a/src/declarative/util/qdeclarativelistmodel_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p.h @@ -76,7 +76,6 @@ public: virtual QList<int> roles() const; virtual QString toString(int role) const; virtual int count() const; - virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const; virtual QVariant data(int index, int role) const; Q_INVOKABLE void clear(); diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index d2d40ee..43a0a9b 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -79,7 +79,6 @@ public: FlatListModel(QDeclarativeListModel *base); ~FlatListModel(); - QHash<int,QVariant> data(int index, const QList<int> &roles) const; QVariant data(int index, int role) const; QList<int> roles() const; @@ -88,7 +87,6 @@ public: int count() const; void clear(); void remove(int index); - bool append(const QScriptValue&); bool insert(int index, const QScriptValue&); QScriptValue get(int index) const; void set(int index, const QScriptValue&, QList<int> *roles); @@ -189,7 +187,6 @@ public: int count() const; void clear(); void remove(int index); - bool append(const QScriptValue&); bool insert(int index, const QScriptValue&); QScriptValue get(int index) const; void set(int index, const QScriptValue&, QList<int> *roles); diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h index 93b0965..08c3d4e 100644 --- a/src/declarative/util/qdeclarativetimer_p.h +++ b/src/declarative/util/qdeclarativetimer_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeTimerPrivate; -class Q_AUTOTEST_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeTimer) diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index 8f06858..2381172 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -392,7 +392,7 @@ QDeclarativeView::Status QDeclarativeView::status() const /*! Return the list of errors that occurred during the last compile or create - operation. An empty list is returned if isError() is not set. + operation. When the status is not Error, an empty list is returned. */ QList<QDeclarativeError> QDeclarativeView::errors() const { diff --git a/src/declarative/util/qlistmodelinterface_p.h b/src/declarative/util/qlistmodelinterface_p.h index 07592ad..8c8ebb3 100644 --- a/src/declarative/util/qlistmodelinterface_p.h +++ b/src/declarative/util/qlistmodelinterface_p.h @@ -59,10 +59,7 @@ class Q_DECLARATIVE_EXPORT QListModelInterface : public QObject virtual ~QListModelInterface() {} virtual int count() const = 0; - virtual QHash<int,QVariant> data(int index, const QList<int>& roles = QList<int>()) const = 0; virtual QVariant data(int index, int role) const = 0; - virtual bool setData(int index, const QHash<int,QVariant>& values) - { Q_UNUSED(index); Q_UNUSED(values); return false; } virtual QList<int> roles() const = 0; virtual QString toString(int role) const = 0; diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index cb74a3c..fc3c186 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -302,7 +302,6 @@ QT_BEGIN_INCLUDE_NAMESPACE #endif #include <qshortcut.h> #ifdef Q_WS_MAC -#include <private/qunicodetables_p.h> #include <qmacstyle_mac.h> #endif QT_END_INCLUDE_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index c166c30..54fdf3f 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4751,7 +4751,7 @@ void QGraphicsScenePrivate::drawSubtreeRecursive(QGraphicsItem *item, QPainter * ENSURE_TRANSFORM_PTR QRect viewBoundingRect = translateOnlyTransform ? brect.translated(transformPtr->dx(), transformPtr->dy()).toAlignedRect() : transformPtr->mapRect(brect).toAlignedRect(); - viewBoundingRect.adjust(-rectAdjust, -rectAdjust, rectAdjust, rectAdjust); + viewBoundingRect.adjust(-int(rectAdjust), -int(rectAdjust), rectAdjust, rectAdjust); if (widget) item->d_ptr->paintedViewBoundingRects.insert(widget, viewBoundingRect); drawItem = exposedRegion ? exposedRegion->intersects(viewBoundingRect) diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp index eda5efb..b9eda05 100644 --- a/src/gui/image/qjpeghandler.cpp +++ b/src/gui/image/qjpeghandler.cpp @@ -134,15 +134,18 @@ static void qt_init_source(j_decompress_ptr) static boolean qt_fill_input_buffer(j_decompress_ptr cinfo) { my_jpeg_source_mgr* src = (my_jpeg_source_mgr*)cinfo->src; + qint64 num_read = 0; if (src->memDevice) { src->next_input_byte = (const JOCTET *)(src->memDevice->data().constData() + src->memDevice->pos()); - src->bytes_in_buffer = (size_t)(src->memDevice->data().size() - src->memDevice->pos()); - return true; + num_read = src->memDevice->data().size() - src->memDevice->pos(); + src->device->seek(src->memDevice->data().size()); + } else { + src->next_input_byte = src->buffer; + num_read = src->device->read((char*)src->buffer, max_buf); } - src->next_input_byte = src->buffer; - int num_read = src->device->read((char*)src->buffer, max_buf); if (num_read <= 0) { // Insert a fake EOI marker - as per jpeglib recommendation + src->next_input_byte = src->buffer; src->buffer[0] = (JOCTET) 0xFF; src->buffer[1] = (JOCTET) JPEG_EOI; src->bytes_in_buffer = 2; @@ -183,13 +186,7 @@ static void qt_term_source(j_decompress_ptr cinfo) { my_jpeg_source_mgr* src = (my_jpeg_source_mgr*)cinfo->src; if (!src->device->isSequential()) - { - // read() isn't used for memDevice, so seek past everything that was used - if (src->memDevice) - src->device->seek(src->device->pos() + (src->memDevice->data().size() - src->memDevice->pos() - src->bytes_in_buffer)); - else - src->device->seek(src->device->pos() - src->bytes_in_buffer); - } + src->device->seek(src->device->pos() - src->bytes_in_buffer); } #if defined(Q_C_CALLBACKS) @@ -518,29 +515,10 @@ inline my_jpeg_destination_mgr::my_jpeg_destination_mgr(QIODevice *device) free_in_buffer = max_buf; } -static bool can_write_format(QImage::Format fmt) -{ - switch (fmt) { - case QImage::Format_Mono: - case QImage::Format_MonoLSB: - case QImage::Format_Indexed8: - case QImage::Format_RGB888: - case QImage::Format_RGB32: - case QImage::Format_ARGB32: - case QImage::Format_ARGB32_Premultiplied: - return true; - break; - default: - break; - } - return false; -} -static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int sourceQuality) +static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQuality) { bool success = false; - const QImage image = can_write_format(sourceImage.format()) ? - sourceImage : sourceImage.convertToFormat(QImage::Format_RGB888); const QVector<QRgb> cmap = image.colorTable(); struct jpeg_compress_struct cinfo; @@ -617,7 +595,7 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s case QImage::Format_Mono: case QImage::Format_MonoLSB: if (gray) { - const uchar* data = image.scanLine(cinfo.next_scanline); + const uchar* data = image.constScanLine(cinfo.next_scanline); if (image.format() == QImage::Format_MonoLSB) { for (int i=0; i<w; i++) { bool bit = !!(*(data + (i >> 3)) & (1 << (i & 7))); @@ -630,7 +608,7 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s } } } else { - const uchar* data = image.scanLine(cinfo.next_scanline); + const uchar* data = image.constScanLine(cinfo.next_scanline); if (image.format() == QImage::Format_MonoLSB) { for (int i=0; i<w; i++) { bool bit = !!(*(data + (i >> 3)) & (1 << (i & 7))); @@ -650,13 +628,13 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s break; case QImage::Format_Indexed8: if (gray) { - const uchar* pix = image.scanLine(cinfo.next_scanline); + const uchar* pix = image.constScanLine(cinfo.next_scanline); for (int i=0; i<w; i++) { *row = qRed(cmap[*pix]); ++row; ++pix; } } else { - const uchar* pix = image.scanLine(cinfo.next_scanline); + const uchar* pix = image.constScanLine(cinfo.next_scanline); for (int i=0; i<w; i++) { *row++ = qRed(cmap[*pix]); *row++ = qGreen(cmap[*pix]); @@ -666,12 +644,12 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s } break; case QImage::Format_RGB888: - memcpy(row, image.scanLine(cinfo.next_scanline), w * 3); + memcpy(row, image.constScanLine(cinfo.next_scanline), w * 3); break; case QImage::Format_RGB32: case QImage::Format_ARGB32: case QImage::Format_ARGB32_Premultiplied: { - QRgb* rgb = (QRgb*)image.scanLine(cinfo.next_scanline); + const QRgb* rgb = (const QRgb*)image.constScanLine(cinfo.next_scanline); for (int i=0; i<w; i++) { *row++ = qRed(*rgb); *row++ = qGreen(*rgb); @@ -681,8 +659,12 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s break; } default: - qWarning("QJpegHandler: unable to write image of format %i", - image.format()); + for (int i=0; i<w; i++) { + QRgb pix = image.pixel(i, cinfo.next_scanline); + *row++ = qRed(pix); + *row++ = qGreen(pix); + *row++ = qBlue(pix); + } break; } jpeg_write_scanlines(&cinfo, row_pointer, 1); diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 66a861d..1e502bd 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1177,8 +1177,12 @@ Qt::HANDLE QPixmap::handle() const { #if defined(Q_WS_X11) const QPixmapData *pd = pixmapData(); - if (pd && pd->classId() == QPixmapData::X11Class) - return static_cast<const QX11PixmapData*>(pd)->handle(); + if (pd) { + if (pd->classId() == QPixmapData::X11Class) + return static_cast<const QX11PixmapData*>(pd)->handle(); + else + qWarning("QPixmap::handle(): Pixmap is not an X11 class pixmap"); + } #endif return 0; } diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index 70770c4..26bffcc 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -764,10 +764,17 @@ void expblur(QImage &img, qreal radius, bool improvedQuality = false, int transp } if (transposed == 0) { - qt_memrotate90(reinterpret_cast<const quint32*>(temp.bits()), - temp.width(), temp.height(), temp.bytesPerLine(), - reinterpret_cast<quint32*>(img.bits()), - img.bytesPerLine()); + if (img.depth() == 8) { + qt_memrotate90(reinterpret_cast<const quint8*>(temp.bits()), + temp.width(), temp.height(), temp.bytesPerLine(), + reinterpret_cast<quint8*>(img.bits()), + img.bytesPerLine()); + } else { + qt_memrotate90(reinterpret_cast<const quint32*>(temp.bits()), + temp.width(), temp.height(), temp.bytesPerLine(), + reinterpret_cast<quint32*>(img.bits()), + img.bytesPerLine()); + } } else { img = temp; } diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index aa3a6d5..9c5095d 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -530,12 +530,12 @@ public: #ifndef QT_NO_GESTURES QGestureManager *gestureManager; QWidget *gestureWidget; +#endif #if defined(Q_WS_X11) || defined(Q_WS_WIN) QPixmap *move_cursor; QPixmap *copy_cursor; QPixmap *link_cursor; #endif -#endif #if defined(Q_WS_WIN) QPixmap *ignore_cursor; #endif diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index e7b7ed8..d8fb74c 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -74,7 +74,6 @@ #include "qevent_p.h" #include "qvarlengtharray.h" #include "qdebug.h" -#include <private/qunicodetables_p.h> #include <private/qcrashhandler_p.h> #include <private/qcolor_p.h> #include <private/qcursor_p.h> diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index 2a9b31a..54c81ba 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -293,36 +293,6 @@ static ShiftResult good_offset(const QBezier *b1, const QBezier *b2, qreal offse return Ok; } -static inline QLineF qline_shifted(const QPointF &p1, const QPointF &p2, qreal offset) -{ - QLineF l(p1, p2); - QLineF ln = l.normalVector().unitVector(); - l.translate(ln.dx() * offset, ln.dy() * offset); - return l; -} - -static bool qbezier_is_line(QPointF *points, int pointCount) -{ - Q_ASSERT(pointCount > 2); - - qreal dx13 = points[2].x() - points[0].x(); - qreal dy13 = points[2].y() - points[0].y(); - - qreal dx12 = points[1].x() - points[0].x(); - qreal dy12 = points[1].y() - points[0].y(); - - if (pointCount == 3) { - return qFuzzyCompare(dx12 * dy13, dx13 * dy12); - } else if (pointCount == 4) { - qreal dx14 = points[3].x() - points[0].x(); - qreal dy14 = points[3].y() - points[0].y(); - - return (qFuzzyCompare(dx12 * dy13, dx13 * dy12) && qFuzzyCompare(dx12 * dy14, dx14 * dy12)); - } - - return false; -} - static ShiftResult shift(const QBezier *orig, QBezier *shifted, qreal offset, qreal threshold) { int map[4]; @@ -353,17 +323,6 @@ static ShiftResult shift(const QBezier *orig, QBezier *shifted, qreal offset, qr if (np == 1) return Discard; - // We need to specialcase lines of 3 or 4 points due to numerical - // instability in intersections below - if (np > 2 && qbezier_is_line(points, np)) { - if (points[0] == points[np-1]) - return Discard; - - QLineF l = qline_shifted(points[0], points[np-1], offset); - *shifted = QBezier::fromPoints(l.p1(), l.pointAt(qreal(0.33)), l.pointAt(qreal(0.66)), l.p2()); - return Ok; - } - QRectF b = orig->bounds(); if (np == 4 && b.width() < .1*offset && b.height() < .1*offset) { qreal l = (orig->x1 - orig->x2)*(orig->x1 - orig->x2) + diff --git a/src/gui/painting/qprintengine_ps.cpp b/src/gui/painting/qprintengine_ps.cpp index 28e9a7a..ca694ae 100644 --- a/src/gui/painting/qprintengine_ps.cpp +++ b/src/gui/painting/qprintengine_ps.cpp @@ -64,7 +64,6 @@ #include "qbitmap.h" #include "qregion.h" #include "qimagewriter.h" -#include <private/qunicodetables_p.h> #include <private/qpainterpath_p.h> #include <qdebug.h> #include <private/qdrawhelper_p.h> diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp index dd4de99..afae0a5 100644 --- a/src/gui/painting/qprintengine_win.cpp +++ b/src/gui/painting/qprintengine_win.cpp @@ -851,7 +851,7 @@ void QWin32PrintEnginePrivate::strokePath_dev(const QPainterPath &path, const QC HPEN pen = ExtCreatePen(((penWidth == 0) ? PS_COSMETIC : PS_GEOMETRIC) | PS_SOLID | capStyle | joinStyle, - penWidth, &brush, 0, 0); + (penWidth == 0) ? 1 : penWidth, &brush, 0, 0); HGDIOBJ old_pen = SelectObject(hdc, pen); StrokePath(hdc); diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 631a9cf..b609f7b 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -47,10 +47,6 @@ #include "private/qnativeimage_p.h" #include "private/qfontengine_ft_p.h" -#ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH -#define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256 -#endif - QT_BEGIN_NAMESPACE // #define CACHE_DEBUG @@ -137,10 +133,18 @@ void QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const m_currentRowHeight = qMax(m_currentRowHeight, c.h + margin * 2); if (m_cx + c.w > m_w) { - // no room on the current line, start new glyph strip - m_cx = 0; - m_cy += m_currentRowHeight + paddingDoubled; - m_currentRowHeight = 0; // New row + int new_width = m_w*2; + while (new_width < m_cx + c.w) + new_width *= 2; + if (new_width <= maxTextureWidth()) { + resizeTextureData(new_width, m_h); + m_w = new_width; + } else { + // no room on the current line, start new glyph strip + m_cx = 0; + m_cy += m_currentRowHeight + paddingDoubled; + m_currentRowHeight = 0; // New row + } } if (m_cy + c.h > m_h) { int new_height = m_h*2; diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index a818978..e6d2b22 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -64,6 +64,10 @@ # undef m_type #endif +#ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH +#define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256 +#endif + struct glyph_metrics_t; typedef unsigned int glyph_t; @@ -113,6 +117,8 @@ public: QHash<glyph_t, Coord> coords; QImage textureMapForGlyph(glyph_t g) const; + virtual int maxTextureWidth() const { return QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH; } + virtual int maxTextureHeight() const { return 32768; } protected: QFontEngine *m_current_fontengine; diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 5996032..bafc5f3 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -3436,8 +3436,7 @@ bool QS60Style::eventFilter(QObject *object, QEvent *event) break; } case QEvent::MouseButtonRelease: { - const QWidget *w = QApplication::widgetAt(QCursor::pos()); - if (w && d->m_pressedWidget) { + if (d->m_pressedWidget) { d->m_pressedWidget->update(); d->m_pressedWidget = 0; } diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 7a5dec4..9506006 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -43,6 +43,7 @@ #include "qstatictext_p.h" #include <private/qtextengine_p.h> #include <private/qfontengine_p.h> +#include <qabstracttextdocumentlayout.h> #include <QtGui/qapplication.h> @@ -654,7 +655,9 @@ void QStaticTextPrivate::paintText(const QPointF &topLeftPosition, QPainter *p) p->save(); p->translate(topLeftPosition); - document.drawContents(p); + QAbstractTextDocumentLayout::PaintContext ctx; + ctx.palette.setColor(QPalette::Text, p->pen().color()); + document.documentLayout()->draw(p, ctx); p->restore(); if (textWidth >= 0.0) diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp index 7c5f973..26346ca 100644 --- a/src/gui/text/qtextdocumentfragment.cpp +++ b/src/gui/text/qtextdocumentfragment.cpp @@ -43,7 +43,6 @@ #include "qtextdocumentfragment_p.h" #include "qtextcursor_p.h" #include "qtextlist.h" -#include "private/qunicodetables_p.h" #include <qdebug.h> #include <qtextcodec.h> diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index e190379..ca0942e 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -53,7 +53,6 @@ #include "qtextdocument_p.h" #include "qtextcursor.h" #include "qfont_p.h" -#include "private/qunicodetables_p.h" #include "private/qfunctions_p.h" #ifndef QT_NO_TEXTHTMLPARSER diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp index ab2bdea..83ba15a 100644 --- a/src/gui/widgets/qmenu_symbian.cpp +++ b/src/gui/widgets/qmenu_symbian.cpp @@ -168,11 +168,11 @@ static void qt_symbian_insert_action(QSymbianMenuAction* action, QList<SymbianMe if (action->action->menu()->actions().size() > 0) { for (int c2= 0; c2 < action->action->menu()->actions().size(); ++c2) { - QSymbianMenuAction *symbianAction2 = new QSymbianMenuAction; + QScopedPointer<QSymbianMenuAction> symbianAction2(new QSymbianMenuAction); symbianAction2->action = action->action->menu()->actions().at(c2); QMenu * menu = symbianAction2->action->menu(); symbianAction2->command = qt_symbian_menu_static_cmd_id++; - qt_symbian_insert_action(symbianAction2, &(menuItem->children)); + qt_symbian_insert_action(symbianAction2.data(), &(menuItem->children)); } } @@ -432,11 +432,11 @@ void QMenuBarPrivate::QSymbianMenuBarPrivate::removeAction(QSymbianMenuAction *a void QMenuBarPrivate::QSymbianMenuBarPrivate::insertNativeMenuItems(const QList<QAction*> &actions) { for (int i = 0; i <actions.size(); ++i) { - QSymbianMenuAction *symbianActionTopLevel = new QSymbianMenuAction; + QScopedPointer<QSymbianMenuAction> symbianActionTopLevel(new QSymbianMenuAction); symbianActionTopLevel->action = actions.at(i); symbianActionTopLevel->parent = 0; symbianActionTopLevel->command = qt_symbian_menu_static_cmd_id++; - qt_symbian_insert_action(symbianActionTopLevel, &symbianMenus); + qt_symbian_insert_action(symbianActionTopLevel.data(), &symbianMenus); } } diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index 500c6bf..0d19ba9 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -92,7 +92,7 @@ public: \e {This element is only functional on devices with touch input.} \qml - import Qt.labs.gestures 0.1 + import Qt.labs.gestures 1.0 GestureArea { anchors.fill: parent diff --git a/src/network/access/qfilenetworkreply.cpp b/src/network/access/qfilenetworkreply.cpp index 4ac9a8c..00bd29e 100644 --- a/src/network/access/qfilenetworkreply.cpp +++ b/src/network/access/qfilenetworkreply.cpp @@ -97,7 +97,10 @@ QFileNetworkReply::QFileNetworkReply(QObject *parent, const QNetworkRequest &req QString fileName = url.toLocalFile(); if (fileName.isEmpty()) { - fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery); + if (url.scheme() == QLatin1String("qrc")) + fileName = QLatin1Char(':') + url.path(); + else + fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery); } QFileInfo fi(fileName); diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index ae4d257..ccdbb20 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -743,7 +743,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest() return; // try to get a free AND connected socket for (int i = 0; i < channelCount; ++i) { - if (!channels[i].isSocketBusy() && channels[i].socket->state() == QAbstractSocket::ConnectedState) { + if (!channels[i].reply && !channels[i].isSocketBusy() && channels[i].socket->state() == QAbstractSocket::ConnectedState) { dequeueAndSendRequest(channels[i].socket); } } @@ -753,7 +753,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest() return; // try to get a free unconnected socket for (int i = 0; i < channelCount; ++i) { - if (!channels[i].isSocketBusy()) { + if (!channels[i].reply && !channels[i].isSocketBusy()) { dequeueAndSendRequest(channels[i].socket); } } diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index b35c318..a637474 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -946,10 +946,10 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera // fast path for GET on file:// URLs // Also if the scheme is empty we consider it a file. - // The QNetworkAccessFileBackend will right now only be used - // for PUT or qrc:// + // The QNetworkAccessFileBackend will right now only be used for PUT if ((op == QNetworkAccessManager::GetOperation || op == QNetworkAccessManager::HeadOperation) && (req.url().scheme() == QLatin1String("file") + || req.url().scheme() == QLatin1String("qrc") || req.url().scheme().isEmpty())) { return new QFileNetworkReply(this, req, op); } diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index aa217f6..2347e66 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -866,6 +866,32 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path) if (do_vectorpath_cache) path.makeCacheable(); + if (!device->format().stencil()) { + // If there is no stencil buffer, triangulate the path instead. + + QRectF bbox = path.controlPointRect(); + // If the path doesn't fit within these limits, it is possible that the triangulation will fail. + bool withinLimits = (bbox.left() > -0x8000 * inverseScale) + && (bbox.right() < 0x8000 * inverseScale) + && (bbox.top() > -0x8000 * inverseScale) + && (bbox.bottom() < 0x8000 * inverseScale); + if (withinLimits) { + QTriangleSet polys = qTriangulate(path, QTransform().scale(1 / inverseScale, 1 / inverseScale)); + + QVarLengthArray<float> vertices(polys.vertices.size()); + for (int i = 0; i < polys.vertices.size(); ++i) + vertices[i] = float(inverseScale * polys.vertices.at(i)); + + prepareForDraw(currentBrush.isOpaque()); + setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, vertices.constData()); + glDrawElements(GL_TRIANGLES, polys.indices.size(), GL_UNSIGNED_INT, polys.indices.constData()); + } else { + // We can't handle big, concave painter paths with OpenGL without stencil buffer. + qWarning("Painter path exceeds +/-32767 pixels."); + } + return; + } + // The path is too complicated & needs the stencil technique vertexCoordinateArray.clear(); vertexCoordinateArray.addPath(path, inverseScale, false); diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp index 410cf21..f353995 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp @@ -129,7 +129,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height) GLuint oldTexture = m_texture; createTextureData(width, height); - + if (ctx->d_ptr->workaround_brokenFBOReadBack) { QImageTextureGlyphCache::resizeTextureData(width, height); Q_ASSERT(image().depth() == 8); @@ -281,4 +281,13 @@ int QGLTextureGlyphCache::glyphPadding() const return 1; } +int QGLTextureGlyphCache::maxTextureWidth() const +{ + return ctx->d_ptr->maxTextureSize(); +} + +int QGLTextureGlyphCache::maxTextureHeight() const +{ + return ctx->d_ptr->maxTextureSize(); +} QT_END_NAMESPACE diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index 6bcd655..eb3693c 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -73,6 +73,8 @@ public: virtual void resizeTextureData(int width, int height); virtual void fillTexture(const Coord &c, glyph_t glyph); virtual int glyphPadding() const; + virtual int maxTextureWidth() const; + virtual int maxTextureHeight() const; inline GLuint texture() const { return m_texture; } diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp index 9bc099d..7b0b8a2 100644 --- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp +++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp @@ -509,6 +509,7 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c m_dash_stroker.setDashPattern(pen.dashPattern()); m_dash_stroker.setStrokeWidth(cosmetic ? width * m_inv_scale : width); + m_dash_stroker.setDashOffset(pen.dashOffset()); m_dash_stroker.setMiterLimit(pen.miterLimit()); m_dash_stroker.setClipRect(clip); diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index bfb232d..f3a4c95 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -54,6 +54,7 @@ #include <private/qt_x11_p.h> #include <private/qpixmap_x11_p.h> #include <private/qimagepixmapcleanuphooks_p.h> +#include <private/qunicodetables_p.h> #ifdef Q_OS_HPUX // for GLXPBuffer #include <private/qglpixelbuffer_p.h> diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index 9b8a3d1..adbba85 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -324,6 +324,10 @@ void QGLFBOGLPaintDevice::setFBO(QGLFramebufferObject* f, fboFormat.setStencil(true); } else if (attachment == QGLFramebufferObject::Depth) { fboFormat.setDepth(true); + fboFormat.setStencil(false); + } else { + fboFormat.setDepth(false); + fboFormat.setStencil(false); } GLenum format = f->format().internalTextureFormat(); diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 9a8b243..994947b 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -67,7 +67,13 @@ when the pbuffer contents change, eliminating the need for additional copy operations. This is supported only on Windows and Mac OS X systems that provide the \c render_texture - extension. + extension. Note that under Windows, a multi-sampled pbuffer + can't be used in conjunction with the \c render_texture + extension. If a multi-sampled pbuffer is requested under + Windows, the \c render_texture extension is turned off for that + pbuffer. + + \endlist Pbuffers are provided by the OpenGL \c pbuffer extension; call diff --git a/src/opengl/qglpixelbuffer_win.cpp b/src/opengl/qglpixelbuffer_win.cpp index 8d0d105..b55f383 100644 --- a/src/opengl/qglpixelbuffer_win.cpp +++ b/src/opengl/qglpixelbuffer_win.cpp @@ -167,6 +167,11 @@ typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, con #define WGL_FLOAT_COMPONENTS_NV 0x20B0 #endif +#ifndef WGL_ARB_multisample +#define WGL_SAMPLE_BUFFERS_ARB 0x2041 +#define WGL_SAMPLES_ARB 0x2042 +#endif + QGLFormat pfiToQGLFormat(HDC hdc, int pfi); static void qt_format_to_attrib_list(bool has_render_texture, const QGLFormat &f, int attribs[]) @@ -226,14 +231,12 @@ static void qt_format_to_attrib_list(bool has_render_texture, const QGLFormat &f attribs[i++] = WGL_FLOAT_COMPONENTS_NV; attribs[i++] = TRUE; } - // sample buffers doesn't work in conjunction with the render_texture extension - // so igonre that for now - // if (f.sampleBuffers()) { - // attribs[i++] = WGL_SAMPLE_BUFFERS_ARB; - // attribs[i++] = 1; - // attribs[i++] = WGL_SAMPLES_ARB; - // attribs[i++] = f.samples() == -1 ? 16 : f.samples(); - // } + if (f.sampleBuffers()) { + attribs[i++] = WGL_SAMPLE_BUFFERS_ARB; + attribs[i++] = 1; + attribs[i++] = WGL_SAMPLES_ARB; + attribs[i++] = f.samples() == -1 ? 16 : f.samples(); + } attribs[i] = 0; } @@ -257,12 +260,17 @@ bool QGLPixelBufferPrivate::init(const QSize &size, const QGLFormat &f, QGLWidge dc = GetDC(dmy.winId()); Q_ASSERT(dc); - PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB = - (PFNWGLGETEXTENSIONSSTRINGARBPROC) wglGetProcAddress("wglGetExtensionsStringARB"); + // sample buffers doesn't work in conjunction with the render_texture extension + if (f.sampleBuffers()) { + has_render_texture = false; + } else { + PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB = + (PFNWGLGETEXTENSIONSSTRINGARBPROC) wglGetProcAddress("wglGetExtensionsStringARB"); - if (wglGetExtensionsStringARB) { - QString extensions(QLatin1String(wglGetExtensionsStringARB(dc))); - has_render_texture = extensions.contains(QLatin1String("WGL_ARB_render_texture")); + if (wglGetExtensionsStringARB) { + QString extensions(QLatin1String(wglGetExtensionsStringARB(dc))); + has_render_texture = extensions.contains(QLatin1String("WGL_ARB_render_texture")); + } } int attribs[40]; diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 12c487d..58778ea 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -921,6 +921,7 @@ static inline QPainterPath strokeForPath(const QPainterPath &path, const QPen &c stroker.setCapStyle(cpen.capStyle()); stroker.setJoinStyle(cpen.joinStyle()); stroker.setMiterLimit(cpen.miterLimit()); + stroker.setDashOffset(cpen.dashOffset()); qreal width = cpen.widthF(); if (width == 0) @@ -4734,9 +4735,11 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine, font_cache = new QGLFontGlyphHash; // qDebug() << "new context" << context << font_cache; qt_context_cache.insert(context, font_cache); - if (context->isValid() && context->device()->devType() == QInternal::Widget) { - QWidget *widget = static_cast<QWidget *>(context->device()); - connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*))); + if (context->isValid()) { + if (context->device()->devType() == QInternal::Widget) { + QWidget *widget = static_cast<QWidget *>(context->device()); + connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*))); + } connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext*)), SLOT(cleanupContext(const QGLContext*))); diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 3c2fd3d..74395a2 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -248,7 +248,11 @@ public: inline void ensurePathTransform() { if (!pathTransformSet) { - setTransform(VG_MATRIX_PATH_USER_TO_SURFACE, pathTransform); + QTransform aliasedTransform = pathTransform; + if (renderingQuality == VG_RENDERING_QUALITY_NONANTIALIASED && currentPen != Qt::NoPen) + aliasedTransform = aliasedTransform + * QTransform::fromTranslate(aliasedCoordinateDelta, -aliasedCoordinateDelta); + setTransform(VG_MATRIX_PATH_USER_TO_SURFACE, aliasedTransform); pathTransformSet = true; } } @@ -306,6 +310,7 @@ inline void QVGPaintEnginePrivate::setRenderingQuality(VGRenderingQuality mode) if (renderingQuality != mode) { vgSeti(VG_RENDERING_QUALITY, mode); renderingQuality = mode; + pathTransformSet = false; // need to tweak transform for aliased stroking } } diff --git a/src/plugins/graphicssystems/meego/qmeegoextensions.h b/src/plugins/graphicssystems/meego/qmeegoextensions.h index 7f219de..ee20bd8 100644 --- a/src/plugins/graphicssystems/meego/qmeegoextensions.h +++ b/src/plugins/graphicssystems/meego/qmeegoextensions.h @@ -42,13 +42,12 @@ #ifndef MEXTENSIONS_H #define MEXTENSIONS_H -#include <EGL/egl.h> -#include <EGL/eglext.h> -#include <GLES2/gl2.h> -#include <GLES2/gl2ext.h> #include <private/qgl_p.h> #include <private/qeglcontext_p.h> #include <private/qpixmapdata_gl_p.h> +#include <EGL/egl.h> +#include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> /* Extensions decls */ diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index c5671c3..fb254b8 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -3,20 +3,6 @@ include(../../qpluginbase.pri) QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)" -wince*: { - DEFINES += NO_GETENV - contains(CE_ARCH,x86):CONFIG -= stl exceptions - contains(CE_ARCH,x86):CONFIG += exceptions_off -} - -#Disable warnings in 3rdparty code due to unused arguments -symbian: { - QMAKE_CXXFLAGS.CW += -W nounusedarg - TARGET.UID3=0x2001E61B -} else:contains(QMAKE_CC, gcc): { - QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main -} - include(../../../gui/image/qjpeghandler.pri) SOURCES += main.cpp diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index 8b119b5..84009d8 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.7.0 + VERSION=4.7.1 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/src/qbase.pri b/src/qbase.pri index f6af22f..680693f 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -4,7 +4,7 @@ INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.7.0 + VERSION=4.7.1 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp index 35f7890..f9dfaa1 100644 --- a/src/qt3support/dialogs/q3filedialog.cpp +++ b/src/qt3support/dialogs/q3filedialog.cpp @@ -106,7 +106,6 @@ #ifdef Q_WS_MAC #include "qmacstyle_mac.h" #include "private/qt_mac_p.h" -#include "private/qunicodetables_p.h" #undef check #endif diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp index 8614076..d82d0f0 100644 --- a/src/qt3support/text/q3richtext.cpp +++ b/src/qt3support/text/q3richtext.cpp @@ -64,7 +64,6 @@ #include "q3stylesheet.h" #include "qtextstream.h" #include <private/qtextengine_p.h> -#include <private/qunicodetables_p.h> #include <stdlib.h> diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index cf2f325..f417892 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -242,7 +242,7 @@ EXPORTS ?idString@QDeclarativeDebugObjectReference@@QBE?AVQString@@XZ @ 241 NONAME ; class QString QDeclarativeDebugObjectReference::idString(void) const ?customTypeData@QDeclarativeDomObject@@QBE?AVQByteArray@@XZ @ 242 NONAME ; class QByteArray QDeclarativeDomObject::customTypeData(void) const ?stop@QDeclarativeTransition@@QAEXXZ @ 243 NONAME ; void QDeclarativeTransition::stop(void) - ?data@QDeclarativeListModel@@UBE?AV?$QHash@HVQVariant@@@@HABV?$QList@H@@@Z @ 244 NONAME ; class QHash<int, class QVariant> QDeclarativeListModel::data(int, class QList<int> const &) const + ?data@QDeclarativeListModel@@UBE?AV?$QHash@HVQVariant@@@@HABV?$QList@H@@@Z @ 244 NONAME ABSENT ; class QHash<int, class QVariant> QDeclarativeListModel::data(int, class QList<int> const &) const ?verticalCenterOffset@QDeclarativeAnchors@@QBEMXZ @ 245 NONAME ; float QDeclarativeAnchors::verticalCenterOffset(void) const ?metaObject@QDeclarativeText@@UBEPBUQMetaObject@@XZ @ 246 NONAME ; struct QMetaObject const * QDeclarativeText::metaObject(void) const ??0QDeclarativeComponent@@QAE@PAVQDeclarativeEngine@@PAVQObject@@@Z @ 247 NONAME ; QDeclarativeComponent::QDeclarativeComponent(class QDeclarativeEngine *, class QObject *) @@ -608,7 +608,7 @@ EXPORTS ??_EQDeclarativeDebugObjectExpressionWatch@@UAE@I@Z @ 607 NONAME ; QDeclarativeDebugObjectExpressionWatch::~QDeclarativeDebugObjectExpressionWatch(unsigned int) ?computeTransformOrigin@QDeclarativeItemPrivate@@QBE?AVQPointF@@XZ @ 608 NONAME ; class QPointF QDeclarativeItemPrivate::computeTransformOrigin(void) const ??0QDeclarativeListReference@@QAE@PAVQObject@@PBDPAVQDeclarativeEngine@@@Z @ 609 NONAME ; QDeclarativeListReference::QDeclarativeListReference(class QObject *, char const *, class QDeclarativeEngine *) - ?setData@QListModelInterface@@UAE_NHABV?$QHash@HVQVariant@@@@@Z @ 610 NONAME ; bool QListModelInterface::setData(int, class QHash<int, class QVariant> const &) + ?setData@QListModelInterface@@UAE_NHABV?$QHash@HVQVariant@@@@@Z @ 610 NONAME ABSENT ; bool QListModelInterface::setData(int, class QHash<int, class QVariant> const &) ??0QDeclarativePen@@QAE@PAVQObject@@@Z @ 611 NONAME ; QDeclarativePen::QDeclarativePen(class QObject *) ?trUtf8@QPacketProtocol@@SA?AVQString@@PBD0H@Z @ 612 NONAME ; class QString QPacketProtocol::trUtf8(char const *, char const *, int) ?setContextObject@QDeclarativeContext@@QAEXPAVQObject@@@Z @ 613 NONAME ; void QDeclarativeContext::setContextObject(class QObject *) @@ -1715,4 +1715,89 @@ EXPORTS ??0QDeclarativeListModel@@AAE@PBV0@PAVQDeclarativeListModelWorkerAgent@@@Z @ 1714 NONAME ; QDeclarativeListModel::QDeclarativeListModel(class QDeclarativeListModel const *, class QDeclarativeListModelWorkerAgent *) ?inWorkerThread@QDeclarativeListModel@@ABE_NXZ @ 1715 NONAME ; bool QDeclarativeListModel::inWorkerThread(void) const ?canMove@QDeclarativeListModel@@ABE_NHHH@Z @ 1716 NONAME ; bool QDeclarativeListModel::canMove(int, int, int) const + ?setLoops@QDeclarativeAbstractAnimation@@QAEXH@Z @ 1717 NONAME ; void QDeclarativeAbstractAnimation::setLoops(int) + ?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0@Z @ 1718 NONAME ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *) + ?staticMetaObject@QDeclarativeAbstractAnimation@@2UQMetaObject@@B @ 1719 NONAME ; struct QMetaObject const QDeclarativeAbstractAnimation::staticMetaObject + ?setRunning@QDeclarativeTimer@@QAEX_N@Z @ 1720 NONAME ; void QDeclarativeTimer::setRunning(bool) + ?tr@QDeclarativeTimer@@SA?AVQString@@PBD0@Z @ 1721 NONAME ; class QString QDeclarativeTimer::tr(char const *, char const *) + ?qt_metacall@QDeclarativeTimer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1722 NONAME ; int QDeclarativeTimer::qt_metacall(enum QMetaObject::Call, int, void * *) + ?setPaused@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1723 NONAME ; void QDeclarativeAbstractAnimation::setPaused(bool) + ?setRepeating@QDeclarativeTimer@@QAEX_N@Z @ 1724 NONAME ; void QDeclarativeTimer::setRepeating(bool) + ?interval@QDeclarativeTimer@@QBEHXZ @ 1725 NONAME ; int QDeclarativeTimer::interval(void) const + ?start@QDeclarativeTimer@@QAEXXZ @ 1726 NONAME ; void QDeclarativeTimer::start(void) + ?transition@QDeclarativeAbstractAnimation@@UAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@W4TransitionDirection@1@@Z @ 1727 NONAME ; void QDeclarativeAbstractAnimation::transition(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, enum QDeclarativeAbstractAnimation::TransitionDirection) + ?componentComplete@QDeclarativeAbstractAnimation@@UAEXXZ @ 1728 NONAME ; void QDeclarativeAbstractAnimation::componentComplete(void) + ?runningChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1729 NONAME ; void QDeclarativeAbstractAnimation::runningChanged(bool) + ?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1730 NONAME ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *, int) + ?metaObject@QDeclarativeTimer@@UBEPBUQMetaObject@@XZ @ 1731 NONAME ; struct QMetaObject const * QDeclarativeTimer::metaObject(void) const + ?setGroup@QDeclarativeAbstractAnimation@@QAEXPAVQDeclarativeAnimationGroup@@@Z @ 1732 NONAME ; void QDeclarativeAbstractAnimation::setGroup(class QDeclarativeAnimationGroup *) + ?isRepeating@QDeclarativeTimer@@QBE_NXZ @ 1733 NONAME ; bool QDeclarativeTimer::isRepeating(void) const + ?setTriggeredOnStart@QDeclarativeTimer@@QAEX_N@Z @ 1734 NONAME ; void QDeclarativeTimer::setTriggeredOnStart(bool) + ?currentTime@QDeclarativeAbstractAnimation@@QAEHXZ @ 1735 NONAME ; int QDeclarativeAbstractAnimation::currentTime(void) + ??1QDeclarativeAbstractAnimation@@UAE@XZ @ 1736 NONAME ; QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation(void) + ?triggered@QDeclarativeTimer@@IAEXXZ @ 1737 NONAME ; void QDeclarativeTimer::triggered(void) + ?finished@QDeclarativeTimer@@AAEXXZ @ 1738 NONAME ; void QDeclarativeTimer::finished(void) + ?pausedChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1739 NONAME ; void QDeclarativeAbstractAnimation::pausedChanged(bool) + ?complete@QDeclarativeAbstractAnimation@@QAEXXZ @ 1740 NONAME ; void QDeclarativeAbstractAnimation::complete(void) + ?setRunning@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1741 NONAME ; void QDeclarativeAbstractAnimation::setRunning(bool) + ?completed@QDeclarativeAbstractAnimation@@IAEXXZ @ 1742 NONAME ; void QDeclarativeAbstractAnimation::completed(void) + ?trUtf8@QDeclarativeTimer@@SA?AVQString@@PBD0@Z @ 1743 NONAME ; class QString QDeclarativeTimer::trUtf8(char const *, char const *) + ?loopCountChanged@QDeclarativeAbstractAnimation@@IAEXH@Z @ 1744 NONAME ; void QDeclarativeAbstractAnimation::loopCountChanged(int) + ?repeatChanged@QDeclarativeTimer@@IAEXXZ @ 1745 NONAME ; void QDeclarativeTimer::repeatChanged(void) + ?setDisableUserControl@QDeclarativeAbstractAnimation@@QAEXXZ @ 1746 NONAME ; void QDeclarativeAbstractAnimation::setDisableUserControl(void) + ?setDefaultTarget@QDeclarativeAbstractAnimation@@QAEXABVQDeclarativeProperty@@@Z @ 1747 NONAME ; void QDeclarativeAbstractAnimation::setDefaultTarget(class QDeclarativeProperty const &) + ?triggeredOnStart@QDeclarativeTimer@@QBE_NXZ @ 1748 NONAME ; bool QDeclarativeTimer::triggeredOnStart(void) const + ?notifyRunningChanged@QDeclarativeAbstractAnimation@@AAEX_N@Z @ 1749 NONAME ; void QDeclarativeAbstractAnimation::notifyRunningChanged(bool) + ?componentComplete@QDeclarativeTimer@@MAEXXZ @ 1750 NONAME ; void QDeclarativeTimer::componentComplete(void) + ?tr@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0@Z @ 1751 NONAME ; class QString QDeclarativeAbstractAnimation::tr(char const *, char const *) + ?isRunning@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1752 NONAME ; bool QDeclarativeAbstractAnimation::isRunning(void) const + ?d_func@QDeclarativeAbstractAnimation@@ABEPBVQDeclarativeAbstractAnimationPrivate@@XZ @ 1753 NONAME ; class QDeclarativeAbstractAnimationPrivate const * QDeclarativeAbstractAnimation::d_func(void) const + ??_EQDeclarativeAbstractAnimation@@UAE@I@Z @ 1754 NONAME ; QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation(unsigned int) + ?d_func@QDeclarativeAbstractAnimation@@AAEPAVQDeclarativeAbstractAnimationPrivate@@XZ @ 1755 NONAME ; class QDeclarativeAbstractAnimationPrivate * QDeclarativeAbstractAnimation::d_func(void) + ?componentFinalized@QDeclarativeAbstractAnimation@@AAEXXZ @ 1756 NONAME ; void QDeclarativeAbstractAnimation::componentFinalized(void) + ??_EQDeclarativeTimer@@UAE@I@Z @ 1757 NONAME ; QDeclarativeTimer::~QDeclarativeTimer(unsigned int) + ?pause@QDeclarativeAbstractAnimation@@QAEXXZ @ 1758 NONAME ; void QDeclarativeAbstractAnimation::pause(void) + ?stop@QDeclarativeTimer@@QAEXXZ @ 1759 NONAME ; void QDeclarativeTimer::stop(void) + ?timelineComplete@QDeclarativeAbstractAnimation@@AAEXXZ @ 1760 NONAME ; void QDeclarativeAbstractAnimation::timelineComplete(void) + ?setAlwaysRunToEnd@QDeclarativeAbstractAnimation@@QAEX_N@Z @ 1761 NONAME ; void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool) + ?classBegin@QDeclarativeAbstractAnimation@@UAEXXZ @ 1762 NONAME ; void QDeclarativeAbstractAnimation::classBegin(void) + ?d_func@QDeclarativeTimer@@AAEPAVQDeclarativeTimerPrivate@@XZ @ 1763 NONAME ; class QDeclarativeTimerPrivate * QDeclarativeTimer::d_func(void) + ??0QDeclarativeAbstractAnimation@@QAE@PAVQObject@@@Z @ 1764 NONAME ; QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(class QObject *) + ?metaObject@QDeclarativeAbstractAnimation@@UBEPBUQMetaObject@@XZ @ 1765 NONAME ; struct QMetaObject const * QDeclarativeAbstractAnimation::metaObject(void) const + ?tr@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1766 NONAME ; class QString QDeclarativeAbstractAnimation::tr(char const *, char const *, int) + ?started@QDeclarativeAbstractAnimation@@IAEXXZ @ 1767 NONAME ; void QDeclarativeAbstractAnimation::started(void) + ?setInterval@QDeclarativeTimer@@QAEXH@Z @ 1768 NONAME ; void QDeclarativeTimer::setInterval(int) + ?d_func@QDeclarativeTimer@@ABEPBVQDeclarativeTimerPrivate@@XZ @ 1769 NONAME ; class QDeclarativeTimerPrivate const * QDeclarativeTimer::d_func(void) const + ?staticMetaObject@QDeclarativeTimer@@2UQMetaObject@@B @ 1770 NONAME ; struct QMetaObject const QDeclarativeTimer::staticMetaObject + ?qt_metacast@QDeclarativeAbstractAnimation@@UAEPAXPBD@Z @ 1771 NONAME ; void * QDeclarativeAbstractAnimation::qt_metacast(char const *) + ?setCurrentTime@QDeclarativeAbstractAnimation@@QAEXH@Z @ 1772 NONAME ; void QDeclarativeAbstractAnimation::setCurrentTime(int) + ?restart@QDeclarativeAbstractAnimation@@QAEXXZ @ 1773 NONAME ; void QDeclarativeAbstractAnimation::restart(void) + ??0QDeclarativeAbstractAnimation@@IAE@AAVQDeclarativeAbstractAnimationPrivate@@PAVQObject@@@Z @ 1774 NONAME ; QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(class QDeclarativeAbstractAnimationPrivate &, class QObject *) + ?resume@QDeclarativeAbstractAnimation@@QAEXXZ @ 1775 NONAME ; void QDeclarativeAbstractAnimation::resume(void) + ?runningChanged@QDeclarativeTimer@@IAEXXZ @ 1776 NONAME ; void QDeclarativeTimer::runningChanged(void) + ?ticked@QDeclarativeTimer@@AAEXXZ @ 1777 NONAME ; void QDeclarativeTimer::ticked(void) + ?trUtf8@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1778 NONAME ; class QString QDeclarativeTimer::trUtf8(char const *, char const *, int) + ??0QDeclarativeTimer@@QAE@PAVQObject@@@Z @ 1779 NONAME ; QDeclarativeTimer::QDeclarativeTimer(class QObject *) + ?loops@QDeclarativeAbstractAnimation@@QBEHXZ @ 1780 NONAME ; int QDeclarativeAbstractAnimation::loops(void) const + ?setTarget@QDeclarativeAbstractAnimation@@EAEXABVQDeclarativeProperty@@@Z @ 1781 NONAME ; void QDeclarativeAbstractAnimation::setTarget(class QDeclarativeProperty const &) + ?alwaysRunToEnd@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1782 NONAME ; bool QDeclarativeAbstractAnimation::alwaysRunToEnd(void) const + ?tr@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1783 NONAME ; class QString QDeclarativeTimer::tr(char const *, char const *, int) + ?intervalChanged@QDeclarativeTimer@@IAEXXZ @ 1784 NONAME ; void QDeclarativeTimer::intervalChanged(void) + ?isPaused@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1785 NONAME ; bool QDeclarativeAbstractAnimation::isPaused(void) const + ?getStaticMetaObject@QDeclarativeAbstractAnimation@@SAABUQMetaObject@@XZ @ 1786 NONAME ; struct QMetaObject const & QDeclarativeAbstractAnimation::getStaticMetaObject(void) + ?group@QDeclarativeAbstractAnimation@@QBEPAVQDeclarativeAnimationGroup@@XZ @ 1787 NONAME ; class QDeclarativeAnimationGroup * QDeclarativeAbstractAnimation::group(void) const + ?classBegin@QDeclarativeTimer@@MAEXXZ @ 1788 NONAME ; void QDeclarativeTimer::classBegin(void) + ?restart@QDeclarativeTimer@@QAEXXZ @ 1789 NONAME ; void QDeclarativeTimer::restart(void) + ??1QDeclarativeTimer@@UAE@XZ @ 1790 NONAME ; QDeclarativeTimer::~QDeclarativeTimer(void) + ?getStaticMetaObject@QDeclarativeTimer@@SAABUQMetaObject@@XZ @ 1791 NONAME ; struct QMetaObject const & QDeclarativeTimer::getStaticMetaObject(void) + ?qt_metacast@QDeclarativeTimer@@UAEPAXPBD@Z @ 1792 NONAME ; void * QDeclarativeTimer::qt_metacast(char const *) + ?alwaysRunToEndChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1793 NONAME ; void QDeclarativeAbstractAnimation::alwaysRunToEndChanged(bool) + ?triggeredOnStartChanged@QDeclarativeTimer@@IAEXXZ @ 1794 NONAME ; void QDeclarativeTimer::triggeredOnStartChanged(void) + ?isRunning@QDeclarativeTimer@@QBE_NXZ @ 1795 NONAME ; bool QDeclarativeTimer::isRunning(void) const + ?update@QDeclarativeTimer@@AAEXXZ @ 1796 NONAME ; void QDeclarativeTimer::update(void) + ?stop@QDeclarativeAbstractAnimation@@QAEXXZ @ 1797 NONAME ; void QDeclarativeAbstractAnimation::stop(void) + ?start@QDeclarativeAbstractAnimation@@QAEXXZ @ 1798 NONAME ; void QDeclarativeAbstractAnimation::start(void) + ?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1799 NONAME ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *) + ?getScriptEngine@QDeclarativeDebugHelper@@SAPAVQScriptEngine@@PAVQDeclarativeEngine@@@Z @ 1800 NONAME ; class QScriptEngine * QDeclarativeDebugHelper::getScriptEngine(class QDeclarativeEngine *) + ?setAnimationSlowDownFactor@QDeclarativeDebugHelper@@SAXM@Z @ 1801 NONAME ; void QDeclarativeDebugHelper::setAnimationSlowDownFactor(float) diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def index 11dee4d..c4cd9b6 100644 --- a/src/s60installs/eabi/QtDeclarativeu.def +++ b/src/s60installs/eabi/QtDeclarativeu.def @@ -1351,7 +1351,7 @@ EXPORTS _ZNK21QDeclarativeDomObject8propertyERK10QByteArray @ 1350 NONAME _ZNK21QDeclarativeListModel10metaObjectEv @ 1351 NONAME _ZNK21QDeclarativeListModel3getEi @ 1352 NONAME - _ZNK21QDeclarativeListModel4dataEiRK5QListIiE @ 1353 NONAME + _ZNK21QDeclarativeListModel4dataEiRK5QListIiE @ 1353 NONAME ABSENT _ZNK21QDeclarativeListModel4dataEii @ 1354 NONAME _ZNK21QDeclarativeListModel5countEv @ 1355 NONAME _ZNK21QDeclarativeListModel5rolesEv @ 1356 NONAME @@ -1747,4 +1747,90 @@ EXPORTS _ZN21QDeclarativeListModelC1EPKS_P32QDeclarativeListModelWorkerAgent @ 1746 NONAME _ZN21QDeclarativeListModelC2EPKS_P32QDeclarativeListModelWorkerAgent @ 1747 NONAME _ZNK21QDeclarativeListModel14inWorkerThreadEv @ 1748 NONAME + _ZN17QDeclarativeTimer10classBeginEv @ 1749 NONAME + _ZN17QDeclarativeTimer10setRunningEb @ 1750 NONAME + _ZN17QDeclarativeTimer11qt_metacallEN11QMetaObject4CallEiPPv @ 1751 NONAME + _ZN17QDeclarativeTimer11qt_metacastEPKc @ 1752 NONAME + _ZN17QDeclarativeTimer11setIntervalEi @ 1753 NONAME + _ZN17QDeclarativeTimer12setRepeatingEb @ 1754 NONAME + _ZN17QDeclarativeTimer13repeatChangedEv @ 1755 NONAME + _ZN17QDeclarativeTimer14runningChangedEv @ 1756 NONAME + _ZN17QDeclarativeTimer15intervalChangedEv @ 1757 NONAME + _ZN17QDeclarativeTimer16staticMetaObjectE @ 1758 NONAME DATA 16 + _ZN17QDeclarativeTimer17componentCompleteEv @ 1759 NONAME + _ZN17QDeclarativeTimer19getStaticMetaObjectEv @ 1760 NONAME + _ZN17QDeclarativeTimer19setTriggeredOnStartEb @ 1761 NONAME + _ZN17QDeclarativeTimer23triggeredOnStartChangedEv @ 1762 NONAME + _ZN17QDeclarativeTimer4stopEv @ 1763 NONAME + _ZN17QDeclarativeTimer5startEv @ 1764 NONAME + _ZN17QDeclarativeTimer6tickedEv @ 1765 NONAME + _ZN17QDeclarativeTimer6updateEv @ 1766 NONAME + _ZN17QDeclarativeTimer7restartEv @ 1767 NONAME + _ZN17QDeclarativeTimer8finishedEv @ 1768 NONAME + _ZN17QDeclarativeTimer9triggeredEv @ 1769 NONAME + _ZN17QDeclarativeTimerC1EP7QObject @ 1770 NONAME + _ZN17QDeclarativeTimerC2EP7QObject @ 1771 NONAME + _ZN29QDeclarativeAbstractAnimation10classBeginEv @ 1772 NONAME + _ZN29QDeclarativeAbstractAnimation10setRunningEb @ 1773 NONAME + _ZN29QDeclarativeAbstractAnimation10transitionER5QListI18QDeclarativeActionERS0_I20QDeclarativePropertyENS_19TransitionDirectionE @ 1774 NONAME + _ZN29QDeclarativeAbstractAnimation11currentTimeEv @ 1775 NONAME + _ZN29QDeclarativeAbstractAnimation11qt_metacallEN11QMetaObject4CallEiPPv @ 1776 NONAME + _ZN29QDeclarativeAbstractAnimation11qt_metacastEPKc @ 1777 NONAME + _ZN29QDeclarativeAbstractAnimation13pausedChangedEb @ 1778 NONAME + _ZN29QDeclarativeAbstractAnimation14runningChangedEb @ 1779 NONAME + _ZN29QDeclarativeAbstractAnimation14setCurrentTimeEi @ 1780 NONAME + _ZN29QDeclarativeAbstractAnimation16loopCountChangedEi @ 1781 NONAME + _ZN29QDeclarativeAbstractAnimation16setDefaultTargetERK20QDeclarativeProperty @ 1782 NONAME + _ZN29QDeclarativeAbstractAnimation16staticMetaObjectE @ 1783 NONAME DATA 16 + _ZN29QDeclarativeAbstractAnimation16timelineCompleteEv @ 1784 NONAME + _ZN29QDeclarativeAbstractAnimation17componentCompleteEv @ 1785 NONAME + _ZN29QDeclarativeAbstractAnimation17setAlwaysRunToEndEb @ 1786 NONAME + _ZN29QDeclarativeAbstractAnimation18componentFinalizedEv @ 1787 NONAME + _ZN29QDeclarativeAbstractAnimation19getStaticMetaObjectEv @ 1788 NONAME + _ZN29QDeclarativeAbstractAnimation20notifyRunningChangedEb @ 1789 NONAME + _ZN29QDeclarativeAbstractAnimation21alwaysRunToEndChangedEb @ 1790 NONAME + _ZN29QDeclarativeAbstractAnimation21setDisableUserControlEv @ 1791 NONAME + _ZN29QDeclarativeAbstractAnimation4stopEv @ 1792 NONAME + _ZN29QDeclarativeAbstractAnimation5pauseEv @ 1793 NONAME + _ZN29QDeclarativeAbstractAnimation5startEv @ 1794 NONAME + _ZN29QDeclarativeAbstractAnimation6resumeEv @ 1795 NONAME + _ZN29QDeclarativeAbstractAnimation7restartEv @ 1796 NONAME + _ZN29QDeclarativeAbstractAnimation7startedEv @ 1797 NONAME + _ZN29QDeclarativeAbstractAnimation8completeEv @ 1798 NONAME + _ZN29QDeclarativeAbstractAnimation8setGroupEP26QDeclarativeAnimationGroup @ 1799 NONAME + _ZN29QDeclarativeAbstractAnimation8setLoopsEi @ 1800 NONAME + _ZN29QDeclarativeAbstractAnimation9completedEv @ 1801 NONAME + _ZN29QDeclarativeAbstractAnimation9setPausedEb @ 1802 NONAME + _ZN29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1803 NONAME + _ZN29QDeclarativeAbstractAnimationC2EP7QObject @ 1804 NONAME + _ZN29QDeclarativeAbstractAnimationC2ER36QDeclarativeAbstractAnimationPrivateP7QObject @ 1805 NONAME + _ZN29QDeclarativeAbstractAnimationD0Ev @ 1806 NONAME + _ZN29QDeclarativeAbstractAnimationD1Ev @ 1807 NONAME + _ZN29QDeclarativeAbstractAnimationD2Ev @ 1808 NONAME + _ZNK17QDeclarativeTimer10metaObjectEv @ 1809 NONAME + _ZNK17QDeclarativeTimer11isRepeatingEv @ 1810 NONAME + _ZNK17QDeclarativeTimer16triggeredOnStartEv @ 1811 NONAME + _ZNK17QDeclarativeTimer8intervalEv @ 1812 NONAME + _ZNK17QDeclarativeTimer9isRunningEv @ 1813 NONAME + _ZNK29QDeclarativeAbstractAnimation10metaObjectEv @ 1814 NONAME + _ZNK29QDeclarativeAbstractAnimation14alwaysRunToEndEv @ 1815 NONAME + _ZNK29QDeclarativeAbstractAnimation5groupEv @ 1816 NONAME + _ZNK29QDeclarativeAbstractAnimation5loopsEv @ 1817 NONAME + _ZNK29QDeclarativeAbstractAnimation8isPausedEv @ 1818 NONAME + _ZNK29QDeclarativeAbstractAnimation9isRunningEv @ 1819 NONAME + _ZTI17QDeclarativeTimer @ 1820 NONAME + _ZTI29QDeclarativeAbstractAnimation @ 1821 NONAME + _ZTV17QDeclarativeTimer @ 1822 NONAME + _ZTV29QDeclarativeAbstractAnimation @ 1823 NONAME + _ZThn12_N29QDeclarativeAbstractAnimation10classBeginEv @ 1824 NONAME + _ZThn12_N29QDeclarativeAbstractAnimation17componentCompleteEv @ 1825 NONAME + _ZThn12_N29QDeclarativeAbstractAnimationD0Ev @ 1826 NONAME + _ZThn12_N29QDeclarativeAbstractAnimationD1Ev @ 1827 NONAME + _ZThn8_N17QDeclarativeTimer10classBeginEv @ 1828 NONAME + _ZThn8_N17QDeclarativeTimer17componentCompleteEv @ 1829 NONAME + _ZThn8_N29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1830 NONAME + _ZThn8_N29QDeclarativeAbstractAnimationD0Ev @ 1831 NONAME + _ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1832 NONAME + _ZN23QDeclarativeDebugHelper15getScriptEngineEP18QDeclarativeEngine @ 1833 NONAME + _ZN23QDeclarativeDebugHelper26setAnimationSlowDownFactorEf @ 1834 NONAME diff --git a/src/xmlpatterns/schema/qxsdtypechecker.cpp b/src/xmlpatterns/schema/qxsdtypechecker.cpp index 4bb03f5..217932e 100644 --- a/src/xmlpatterns/schema/qxsdtypechecker.cpp +++ b/src/xmlpatterns/schema/qxsdtypechecker.cpp @@ -171,6 +171,7 @@ XsdTypeChecker::XsdTypeChecker(const XsdSchemaContext::Ptr &context, const QVect XsdTypeChecker::~XsdTypeChecker() { + delete m_reflection; } QString XsdTypeChecker::normalizedValue(const QString &value, const XsdFacet::Hash &facets) diff --git a/tests/auto/declarative/qdeclarativeconnection/data/error-object.qml b/tests/auto/declarative/qdeclarativeconnection/data/error-object.qml new file mode 100644 index 0000000..a8127a4 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeconnection/data/error-object.qml @@ -0,0 +1,7 @@ +import Qt 4.7 + +Item { + Connections { + onClicked: Item {} + } +} diff --git a/tests/auto/declarative/qdeclarativeconnection/data/error-property.qml b/tests/auto/declarative/qdeclarativeconnection/data/error-property.qml new file mode 100644 index 0000000..2791f56 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeconnection/data/error-property.qml @@ -0,0 +1,5 @@ +import Qt 4.7 + +Item { + Connections { fakeProperty: {} } +} diff --git a/tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml b/tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml new file mode 100644 index 0000000..0205c0a --- /dev/null +++ b/tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml @@ -0,0 +1,5 @@ +import Qt 4.7 + +Item { + Connections { onfakeProperty: {} } +} diff --git a/tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml b/tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml new file mode 100644 index 0000000..867e4e2 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml @@ -0,0 +1,9 @@ +import Qt 4.7 + +Item { + Connections { + onClicked { + onPressed: {} + } + } +} diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index d384372..a623e96 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -66,6 +66,8 @@ private slots: void targetChanged(); void unknownSignals_data(); void unknownSignals(); + void errors_data(); + void errors(); private: QDeclarativeEngine engine; @@ -195,9 +197,38 @@ void tst_qdeclarativeconnection::unknownSignals() QDeclarativeConnections *connections = item->findChild<QDeclarativeConnections*>("connections"); QVERIFY(connections); + if (file == "connection-unknownsignals-ignored.qml") + QVERIFY(connections->ignoreUnknownSignals()); + delete item; } +void tst_qdeclarativeconnection::errors_data() +{ + QTest::addColumn<QString>("file"); + QTest::addColumn<QString>("error"); + + QTest::newRow("no \"on\"") << "error-property.qml" << "Cannot assign to non-existent property \"fakeProperty\""; + QTest::newRow("3rd letter lowercase") << "error-property2.qml" << "Cannot assign to non-existent property \"onfakeProperty\""; + QTest::newRow("child object") << "error-object.qml" << "Connections: nested objects not allowed"; + QTest::newRow("grouped object") << "error-syntax.qml" << "Connections: syntax error"; +} + +void tst_qdeclarativeconnection::errors() +{ + QFETCH(QString, file); + QFETCH(QString, error); + + QUrl url = QUrl::fromLocalFile(SRCDIR "/data/" + file); + + QDeclarativeEngine engine; + QDeclarativeComponent c(&engine, url); + QVERIFY(c.isError() == true); + QList<QDeclarativeError> errors = c.errors(); + QVERIFY(errors.count() == 1); + QCOMPARE(errors.at(0).description(), error); +} + QTEST_MAIN(tst_qdeclarativeconnection) #include "tst_qdeclarativeconnection.moc" diff --git a/src/declarative/qml/qdeclarativeclassfactory_p.h b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h index 9f4a3de..c9cb839 100644 --- a/src/declarative/qml/qdeclarativeclassfactory_p.h +++ b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h @@ -39,36 +39,29 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVECLASSFACTORY_P_H -#define QDECLARATIVECLASSFACTORY_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// +#ifndef QDECLARATIVEDEBUGHELPER_P_H +#define QDECLARATIVEDEBUGHELPER_P_H #include <QtCore/qglobal.h> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +class QScriptEngine; class QDeclarativeEngine; -class QByteArray; -class QUrl; -class QDeclarativeComponent; -class QDeclarativeClassFactory +// Helper methods to access private API through a stable interface +// This is used in the qmljsdebugger library of QtCreator. +class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper { public: - virtual ~QDeclarativeClassFactory(); - virtual QDeclarativeComponent *create(const QByteArray &, const QUrl& baseUrl, QDeclarativeEngine*) = 0; + static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine); + static void setAnimationSlowDownFactor(qreal factor); }; QT_END_NAMESPACE -#endif // QDECLARATIVECLASSFACTORY_P_H +QT_END_HEADER + +#endif // QDECLARATIVEDEBUGHELPER_P_H diff --git a/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro new file mode 100644 index 0000000..c52c652 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro @@ -0,0 +1,5 @@ +load(qttest_p4) +contains(QT_CONFIG,declarative): QT += network declarative script +macx:CONFIG -= app_bundle + +SOURCES += tst_qdeclarativedebughelper.cpp diff --git a/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp new file mode 100644 index 0000000..36f2222 --- /dev/null +++ b/tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp @@ -0,0 +1,115 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <qtest.h> + +#include <QDeclarativeEngine> +#include <private/qdeclarativeengine_p.h> +#include <QAbstractAnimation> +#include <private/qabstractanimation_p.h> + +// We have copied the header which is used in the qmljsdebugger (part of QtCreator) +// to catch BC changes. Don't update it unless you know what you are doing! +#include "private_headers/qdeclarativedebughelper_p.h" + +class tst_qdeclarativedebughelper : public QObject { + Q_OBJECT +private slots: + void getScriptEngine(); + void setAnimationSlowDownFactor(); +}; + +class TestAnimation : public QAbstractAnimation { +public: + int updateCalled; + + TestAnimation() : updateCalled(0) {} + + virtual void updateCurrentTime(int /*currentTime*/) { + updateCalled++; + } + virtual int duration() const { + return 100; + } +}; + +void tst_qdeclarativedebughelper::getScriptEngine() +{ + QDeclarativeEngine engine; + + QScriptEngine *scriptEngine = QDeclarativeDebugHelper::getScriptEngine(&engine); + QVERIFY(scriptEngine); + QCOMPARE(scriptEngine, QDeclarativeEnginePrivate::getScriptEngine(&engine)); +} + +void tst_qdeclarativedebughelper::setAnimationSlowDownFactor() +{ + TestAnimation animation; + + // first check whether setup works + QCOMPARE(animation.updateCalled, 0); + animation.start(); + QTest::qWait(animation.totalDuration() + 50); +#ifdef Q_OS_WIN + if (animation.state() != QAbstractAnimation::Stopped) + QEXPECT_FAIL("", "On windows, consistent timing is not working properly due to bad timer resolution", Abort); +#endif + QCOMPARE(animation.state(), QAbstractAnimation::Stopped); + QVERIFY(animation.updateCalled > 1); + + // check if we can pause all animations + animation.updateCalled = 0; + QDeclarativeDebugHelper::setAnimationSlowDownFactor(0.0); + animation.start(); + QTest::qWait(animation.totalDuration() + 50); + QVERIFY(animation.updateCalled <= 1); // updateCurrentTime seems to be called at least once + + // now run them again + animation.updateCalled = 0; + QDeclarativeDebugHelper::setAnimationSlowDownFactor(2.0); + animation.start(); + QTest::qWait(animation.totalDuration() + 50); + QVERIFY(animation.updateCalled > 1); +} + +QTEST_MAIN(tst_qdeclarativedebughelper) + +#include "tst_qdeclarativedebughelper.moc" + diff --git a/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml b/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml new file mode 100644 index 0000000..b8f2f32 --- /dev/null +++ b/tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml @@ -0,0 +1,25 @@ +import Qt 4.7 +ListView { + width: 100 + height: 250 + delegate: Rectangle { + width: 100 + height: 50 + color: black ? "black": "white" + } + model: ListModel { + objectName: "listModel" + ListElement { + black: false + rounded: false + } + ListElement { + black: true + rounded: false + } + ListElement { + black: true + rounded: false + } + } +}
\ No newline at end of file diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index f456778..f8d2411 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -91,6 +91,7 @@ private slots: void enumerate(); void error_data(); void error(); + void syncError(); void set(); void get(); void get_data(); @@ -98,6 +99,7 @@ private slots: void get_worker_data(); void get_nested(); void get_nested_data(); + void crash_model_with_multiple_roles(); }; int tst_qdeclarativelistmodel::roleFromName(const QDeclarativeListModel *model, const QString &roleName) { @@ -259,7 +261,7 @@ void tst_qdeclarativelistmodel::dynamic_data() QTest::newRow("set2") << "{append({'foo':123});set(0,{'foo':456});get(0).foo}" << 456 << ""; QTest::newRow("set3a") << "{append({'foo':123,'bar':456});set(0,{'foo':999});get(0).foo}" << 999 << ""; QTest::newRow("set3b") << "{append({'foo':123,'bar':456});set(0,{'foo':999});get(0).bar}" << 456 << ""; - QTest::newRow("set4a") << "{set(0,{'foo':456})}" << 0 << "<Unknown File>: QML ListModel: set: index 0 out of range"; + QTest::newRow("set4a") << "{set(0,{'foo':456});count}" << 1 << ""; QTest::newRow("set4c") << "{set(-1,{'foo':456})}" << 0 << "<Unknown File>: QML ListModel: set: index -1 out of range"; QTest::newRow("set5a") << "{append({'foo':123,'bar':456});set(0,123);count}" << 1 << "<Unknown File>: QML ListModel: set: value is not an object"; QTest::newRow("set5b") << "{append({'foo':123,'bar':456});set(0,[1,2,3]);count}" << 1 << "<Unknown File>: QML ListModel: set: value is not an object"; @@ -660,6 +662,21 @@ void tst_qdeclarativelistmodel::error() } } +void tst_qdeclarativelistmodel::syncError() +{ + QString qml = "import Qt 4.7\nListModel { id: lm; Component.onCompleted: lm.sync() }"; + QString error = "file:dummy.qml:2:1: QML ListModel: List sync() can only be called from a WorkerScript"; + + QDeclarativeEngine engine; + QDeclarativeComponent component(&engine); + component.setData(qml.toUtf8(), + QUrl::fromLocalFile(QString("dummy.qml"))); + QTest::ignoreMessage(QtWarningMsg,error.toUtf8()); + QObject *obj = component.create(); + QVERIFY(obj); + delete obj; +} + /* Test model changes from set() are available to the view */ @@ -886,6 +903,21 @@ void tst_qdeclarativelistmodel::get_nested_data() get_data(); } +//QTBUG-13754 +void tst_qdeclarativelistmodel::crash_model_with_multiple_roles() +{ + QDeclarativeEngine eng; + QDeclarativeComponent component(&eng, QUrl::fromLocalFile(SRCDIR "/data/multipleroles.qml")); + QObject *rootItem = component.create(); + QVERIFY(component.errorString().isEmpty()); + QVERIFY(rootItem != 0); + QDeclarativeListModel *model = rootItem->findChild<QDeclarativeListModel*>("listModel"); + QVERIFY(model != 0); + + // used to cause a crash in QDeclarativeVisualDataModel + model->setProperty(0, "black", true); +} + QTEST_MAIN(tst_qdeclarativelistmodel) #include "tst_qdeclarativelistmodel.moc" diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index 2081f0e..e1022e0 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -117,6 +117,7 @@ void tst_qdeclarativemoduleplugin::importsPlugin() QObject *object = component.create(); QVERIFY(object != 0); QCOMPARE(object->property("value").toInt(),123); + delete object; } QTEST_MAIN(tst_qdeclarativemoduleplugin) diff --git a/tests/auto/declarative/qdeclarativeview/data/error1.qml b/tests/auto/declarative/qdeclarativeview/data/error1.qml new file mode 100644 index 0000000..c154716 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeview/data/error1.qml @@ -0,0 +1,5 @@ +import Qt 4.7 + +Rectangle { + nonExistentProperty: 5 +} diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp index 6450e38..9ac79e4 100644 --- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp +++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp @@ -62,6 +62,7 @@ public: private slots: void resizemodedeclarativeitem(); void resizemodegraphicswidget(); + void errors(); private: template<typename T> @@ -255,6 +256,22 @@ void tst_QDeclarativeView::resizemodegraphicswidget() delete canvas; } +static void silentErrorsMsgHandler(QtMsgType, const char *) +{ +} + +void tst_QDeclarativeView::errors() +{ + QDeclarativeView *canvas = new QDeclarativeView; + QVERIFY(canvas); + QtMsgHandler old = qInstallMsgHandler(silentErrorsMsgHandler); + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/error1.qml")); + qInstallMsgHandler(old); + QVERIFY(canvas->status() == QDeclarativeView::Error); + QVERIFY(canvas->errors().count() == 1); + delete canvas; +} + template<typename T> T *tst_QDeclarativeView::findItem(QGraphicsObject *parent, const QString &objectName) { diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt index 093610d..1eed403 100644 --- a/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt +++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt @@ -1,4 +1,3 @@ -*.*Function 'eval' is not implemented Updating 'project\.ts'\.\.\. Found 3 source text\(s\) \(3 new and 0 already existing\) Removed 5 obsolete entries diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp index 5ba6c52..e6d2135 100644 --- a/tests/auto/linguist/lupdate/tst_lupdate.cpp +++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp @@ -122,12 +122,19 @@ static bool prepareMatch(const QString &expect, QString *tmpl, int *require, int return true; } -void tst_lupdate::doCompare(const QStringList &actual, const QString &expectedFn, bool err) +void tst_lupdate::doCompare(const QStringList &_actual, const QString &expectedFn, bool err) { QFile file(expectedFn); QVERIFY2(file.open(QIODevice::ReadOnly | QIODevice::Text), qPrintable(expectedFn)); QStringList expected = QString(file.readAll()).split('\n'); + QStringList actual; + actual.reserve(_actual.size()); + QRegExp niRx(".*:Function '\\w+' is not implemented"); + foreach (const QString &a, _actual) + if (!niRx.exactMatch(a)) + actual << a; + int ei = 0, ai = 0, em = expected.size(), am = actual.size(); int oei = 0, oai = 0, oem = em, oam = am; int require = 0, accept = 0; diff --git a/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg b/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg Binary files differnew file mode 100644 index 0000000..605e8a8 --- /dev/null +++ b/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg diff --git a/tests/auto/qimagereader/qimagereader.qrc b/tests/auto/qimagereader/qimagereader.qrc index 1acc82f..5536b38 100644 --- a/tests/auto/qimagereader/qimagereader.qrc +++ b/tests/auto/qimagereader/qimagereader.qrc @@ -63,5 +63,6 @@ <file>images/rect.svgz</file> <file>images/corrupt.svg</file> <file>images/corrupt.svgz</file> + <file>images/qtbug13653-no_eoi.jpg</file> </qresource> </RCC> diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index 5b30b04..3bee5d9 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -239,6 +239,7 @@ void tst_QImageReader::readImage_data() #if defined QTEST_HAVE_JPEG QTest::newRow("JPEG: beavis") << QString("beavis.jpg") << true << QByteArray("jpeg"); + QTest::newRow("JPEG: qtbug13653") << QString("qtbug13653-no_eoi.jpg") << true << QByteArray("jpeg"); #endif #if defined QTEST_HAVE_GIF QTest::newRow("GIF: earth") << QString("earth.gif") << true << QByteArray("gif"); @@ -1039,6 +1040,7 @@ void tst_QImageReader::readFromDevice_data() QTest::newRow("jpeg-1") << QString("beavis.jpg") << QByteArray("jpeg"); QTest::newRow("jpeg-2") << QString("YCbCr_cmyk.jpg") << QByteArray("jpeg"); QTest::newRow("jpeg-3") << QString("YCbCr_rgb.jpg") << QByteArray("jpeg"); + QTest::newRow("jpeg-4") << QString("qtbug13653-no_eoi.jpg") << QByteArray("jpeg"); #endif // QTEST_HAVE_JPEG #ifdef QTEST_HAVE_GIF QTest::newRow("gif-1") << QString("earth.gif") << QByteArray("gif"); @@ -1314,6 +1316,9 @@ void tst_QImageReader::readFromResources_data() QTest::newRow("YCbCr_rgb.jpg") << QString("YCbCr_rgb.jpg") << QByteArray("jpg") << QSize(75, 50) << QString(""); + QTest::newRow("qtbug13653-no_eoi.jpg") << QString("qtbug13653-no_eoi.jpg") + << QByteArray("jpg") << QSize(240, 180) + << QString(""); #endif #ifdef QTEST_HAVE_MNG QTest::newRow("corrupt.mng") << QString("corrupt.mng") diff --git a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp index f0f087d..12d2c57 100644 --- a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp +++ b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp @@ -72,6 +72,7 @@ private slots: void convolutionBoundingRectFor(); void convolutionDrawSubRect(); void dropShadowBoundingRectFor(); + void blurIndexed8(); void testDefaultImplementations(); }; @@ -423,6 +424,27 @@ void tst_QPixmapFilter::dropShadowBoundingRectFor() QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-delta - 10, -delta - 10, 0, 0)); } +QT_BEGIN_NAMESPACE +void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); +QT_END_NAMESPACE + +void tst_QPixmapFilter::blurIndexed8() +{ + QImage img(16, 32, QImage::Format_Indexed8); + img.setColorCount(256); + for (int i = 0; i < 256; ++i) + img.setColor(i, qRgb(i, i, i)); + + img.fill(255); + + QImage original = img; + qt_blurImage(img, 10, true, false); + QCOMPARE(original.size(), img.size()); + + original = img; + qt_blurImage(img, 10, true, true); + QCOMPARE(original.size(), QSize(img.height(), img.width())); +} QTEST_MAIN(tst_QPixmapFilter) #include "tst_qpixmapfilter.moc" diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt index fd5b486..7f3aa9a 100644 --- a/tests/auto/selftests/expected_cmptest.txt +++ b/tests/auto/selftests/expected_cmptest.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_Cmptest ********* -Config: Using QTest library 4.7.0, Qt 4.7.0 +Config: Using QTest library 4.7.1, Qt 4.7.1 PASS : tst_Cmptest::initTestCase() PASS : tst_Cmptest::compare_boolfuncs() PASS : tst_Cmptest::compare_pointerfuncs() diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/selftests/expected_crashes_3.txt index 3aced25..7ded525 100644 --- a/tests/auto/selftests/expected_crashes_3.txt +++ b/tests/auto/selftests/expected_crashes_3.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_Crashes ********* -Config: Using QTest library 4.7.0, Qt 4.7.0 +Config: Using QTest library 4.7.1, Qt 4.7.1 PASS : tst_Crashes::initTestCase() QFATAL : tst_Crashes::crash() Received signal 11 FAIL! : tst_Crashes::crash() Received a fatal error. diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/selftests/expected_longstring.txt index 1461bc6..9ad6f56 100644 --- a/tests/auto/selftests/expected_longstring.txt +++ b/tests/auto/selftests/expected_longstring.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_LongString ********* -Config: Using QTest library 4.7.0, Qt 4.7.0 +Config: Using QTest library 4.7.1, Qt 4.7.1 PASS : tst_LongString::initTestCase() FAIL! : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/selftests/expected_maxwarnings.txt index 908bd5d..949da13 100644 --- a/tests/auto/selftests/expected_maxwarnings.txt +++ b/tests/auto/selftests/expected_maxwarnings.txt @@ -1,5 +1,5 @@ ********* Start testing of MaxWarnings ********* -Config: Using QTest library 4.7.0, Qt 4.7.0 +Config: Using QTest library 4.7.1, Qt 4.7.1 PASS : MaxWarnings::initTestCase() QWARN : MaxWarnings::warn() 0 QWARN : MaxWarnings::warn() 1 diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt index e5bf1ff..1f5bf7b 100644 --- a/tests/auto/selftests/expected_skip.txt +++ b/tests/auto/selftests/expected_skip.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_Skip ********* -Config: Using QTest library 4.7.0, Qt 4.7.0 +Config: Using QTest library 4.7.1, Qt 4.7.1 PASS : tst_Skip::initTestCase() SKIP : tst_Skip::test() skipping all Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)] diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index 3b4b5f8..26cdafb 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ "<td width=\"30%\" align=\"left\">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \ - "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.7.0</div></td>\n" \ + "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.7.1</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a2c7fe9..17bbadf 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -958,6 +958,8 @@ void Configure::parseCmdLine() dictionary[ "WEBKIT" ] = "no"; } else if (configCmdLine.at(i) == "-webkit") { dictionary[ "WEBKIT" ] = "yes"; + } else if (configCmdLine.at(i) == "-webkit-debug") { + dictionary[ "WEBKIT" ] = "debug"; } else if (configCmdLine.at(i) == "-no-declarative") { dictionary[ "DECLARATIVE" ] = "no"; } else if (configCmdLine.at(i) == "-declarative") { @@ -1651,7 +1653,7 @@ bool Configure::displayHelp() "[-phonon] [-no-phonon-backend] [-phonon-backend]\n" "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n" "[-no-script] [-script] [-no-scripttools] [-scripttools]\n" - "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7); + "[-no-webkit] [-webkit] [-webkit-debug] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7); desc("Installation options:\n\n"); @@ -1835,6 +1837,7 @@ bool Configure::displayHelp() desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into QtMultimedia"); desc("WEBKIT", "no", "-no-webkit", "Do not compile in the WebKit module"); desc("WEBKIT", "yes", "-webkit", "Compile in the WebKit module (WebKit is built if a decent C++ compiler is used.)"); + desc("WEBKIT", "debug", "-webkit-debug", "Compile in the WebKit module with debug symbols."); desc("SCRIPT", "no", "-no-script", "Do not build the QtScript module."); desc("SCRIPT", "yes", "-script", "Build the QtScript module."); desc("SCRIPTTOOLS", "no", "-no-scripttools", "Do not build the QtScriptTools module."); @@ -2692,10 +2695,12 @@ void Configure::generateOutputVars() QString dst = buildPath + "/mkspecs/modules/qt_webkit_version.pri"; QFile::remove(dst); - if (dictionary["WEBKIT"] == "yes") { + if (dictionary["WEBKIT"] != "no") { // This include takes care of adding "webkit" to QT_CONFIG. QString src = sourcePath + "/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri"; QFile::copy(src, dst); + if (dictionary["WEBKIT"] == "debug") + qtConfig += "webkit-debug"; } if (dictionary["DECLARATIVE"] == "yes") { @@ -3406,7 +3411,12 @@ void Configure::displayConfig() cout << "QtXmlPatterns support......." << dictionary[ "XMLPATTERNS" ] << endl; cout << "Phonon support.............." << dictionary[ "PHONON" ] << endl; cout << "QtMultimedia support........" << dictionary[ "MULTIMEDIA" ] << endl; - cout << "WebKit support.............." << dictionary[ "WEBKIT" ] << endl; + { + QString webkit = dictionary[ "WEBKIT" ]; + if (webkit == "debug") + webkit = "yes (debug)"; + cout << "WebKit support.............." << webkit; + } cout << "Declarative support........." << dictionary[ "DECLARATIVE" ] << endl; cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl; cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl; diff --git a/tools/qdoc3/doc/files/qt.qdocconf b/tools/qdoc3/doc/files/qt.qdocconf index 09c112a..4546c7a 100644 --- a/tools/qdoc3/doc/files/qt.qdocconf +++ b/tools/qdoc3/doc/files/qt.qdocconf @@ -22,7 +22,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.470 +qhp.Qt.namespace = com.trolltech.qt.471 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = @@ -36,9 +36,9 @@ qhp.Qt.extraFiles = classic.css \ images/dynamiclayouts-example.png \ images/stylesheet-coffee-plastique.png -qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.7.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 +qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.7.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 836c4bf..74b68df 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Assistant qhp.Assistant.file = assistant.qhp -qhp.Assistant.namespace = com.trolltech.assistant.470 +qhp.Assistant.namespace = com.trolltech.assistant.471 qhp.Assistant.virtualFolder = qdoc qhp.Assistant.indexTitle = Qt Assistant Manual qhp.Assistant.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.Assistant.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Assistant.filterAttributes = qt 4.7.0 tools assistant +qhp.Assistant.filterAttributes = qt 4.7.1 tools assistant qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant qhp.Assistant.subprojects = manual examples diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 9136619..ab66792 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Designer qhp.Designer.file = designer.qhp -qhp.Designer.namespace = com.trolltech.designer.470 +qhp.Designer.namespace = com.trolltech.designer.471 qhp.Designer.virtualFolder = qdoc qhp.Designer.indexTitle = Qt Designer Manual qhp.Designer.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.Designer.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Designer.filterAttributes = qt 4.7.0 tools designer +qhp.Designer.filterAttributes = qt 4.7.1 tools designer qhp.Designer.customFilters.Designer.name = Qt Designer Manual qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer qhp.Designer.subprojects = manual examples diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 696802a..0d920e2 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Linguist qhp.Linguist.file = linguist.qhp -qhp.Linguist.namespace = com.trolltech.linguist.470 +qhp.Linguist.namespace = com.trolltech.linguist.471 qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.Linguist.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Linguist.filterAttributes = qt 4.7.0 tools linguist +qhp.Linguist.filterAttributes = qt 4.7.1 tools linguist qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist qhp.Linguist.subprojects = manual examples diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf index 45f48a6..9aaebcb 100644 --- a/tools/qdoc3/test/qdeclarative.qdocconf +++ b/tools/qdoc3/test/qdeclarative.qdocconf @@ -21,7 +21,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qml qhp.Qml.file = qml.qhp -qhp.Qml.namespace = com.trolltech.qml.470 +qhp.Qml.namespace = com.trolltech.qml.471 qhp.Qml.virtualFolder = qdoc qhp.Qml.indexTitle = Qml Reference @@ -61,9 +61,9 @@ qhp.Qml.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Qml.filterAttributes = qt 4.7.0 qtrefdoc -qhp.Qml.customFilters.Qt.name = Qt 4.7.0 -qhp.Qml.customFilters.Qt.filterAttributes = qt 4.7.0 +qhp.Qml.filterAttributes = qt 4.7.1 qtrefdoc +qhp.Qml.customFilters.Qt.name = Qt 4.7.1 +qhp.Qml.customFilters.Qt.filterAttributes = qt 4.7.1 qhp.Qml.subprojects = classes qhp.Qml.subprojects.classes.title = Elements qhp.Qml.subprojects.classes.indexTitle = Qml Elements diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 8125166..be2e9d3 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = qmake qhp.qmake.file = qmake.qhp -qhp.qmake.namespace = com.trolltech.qmake.470 +qhp.qmake.namespace = com.trolltech.qmake.471 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.qmake.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.qmake.filterAttributes = qt 4.7.0 tools qmake +qhp.qmake.filterAttributes = qt 4.7.1 tools qmake qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 639585c..dcabeb4 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -15,7 +15,7 @@ naturallanguage = en_US qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.470 +qhp.Qt.namespace = com.trolltech.qt.471 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = @@ -59,9 +59,9 @@ qhp.Qt.extraFiles = index.html \ -qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.7.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 +qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.7.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes diff --git a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf index c24ddef..7e28fa2 100644 --- a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf @@ -17,15 +17,15 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.470 +qhp.Qt.namespace = com.trolltech.qt.471 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = Qt qhp.Qt.indexTitle = Qt qhp.Qt.selectors = fake:example -qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc ja_JP -qhp.Qt.customFilters.Qt.name = Qt 4.7.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 +qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc ja_JP +qhp.Qt.customFilters.Qt.name = Qt 4.7.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index a983faa..cfcc76d 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -17,15 +17,15 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.470 +qhp.Qt.namespace = com.trolltech.qt.471 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = 教程 qhp.Qt.indexTitle = 教程 qhp.Qt.selectors = fake:example -qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc zh_CN -qhp.Qt.customFilters.Qt.name = Qt 4.7.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 +qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc zh_CN +qhp.Qt.customFilters.Qt.name = Qt 4.7.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 215e0d6..ea97205 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -17,7 +17,7 @@ naturallanguage = en_US qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.470 +qhp.Qt.namespace = com.trolltech.qt.471 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = @@ -59,9 +59,9 @@ qhp.Qt.extraFiles = index.html \ style/style_ie8.css \ style/style.css -qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.7.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 +qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.7.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes diff --git a/tools/qdoc3/test/qt_ja_JP.qdocconf b/tools/qdoc3/test/qt_ja_JP.qdocconf index f9ce142..32bba06 100644 --- a/tools/qdoc3/test/qt_ja_JP.qdocconf +++ b/tools/qdoc3/test/qt_ja_JP.qdocconf @@ -19,15 +19,15 @@ indexes = $QTDIR/doc/html/qt.index qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.470 +qhp.Qt.namespace = com.trolltech.qt.471 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = Qt qhp.Qt.indexTitle = Qt qhp.Qt.selectors = fake:example -qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc ja_JP -qhp.Qt.customFilters.Qt.name = Qt 4.7.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 +qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc ja_JP +qhp.Qt.customFilters.Qt.name = Qt 4.7.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf index 5bf8171..40d3d5a 100644 --- a/tools/qdoc3/test/qt_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt_zh_CN.qdocconf @@ -19,15 +19,15 @@ indexes = $QTDIR/doc/html/qt.index qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.470 +qhp.Qt.namespace = com.trolltech.qt.471 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = 教程 qhp.Qt.indexTitle = 教程 qhp.Qt.selectors = fake:example -qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc zh_CN -qhp.Qt.customFilters.Qt.name = Qt 4.7.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 +qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc zh_CN +qhp.Qt.customFilters.Qt.name = Qt 4.7.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML diff --git a/translations/assistant_sl.ts b/translations/assistant_sl.ts index 05429bd..cb3779c 100644 --- a/translations/assistant_sl.ts +++ b/translations/assistant_sl.ts @@ -115,6 +115,17 @@ Razlog: </message> </context> <context> + <name>BookmarkItem</name> + <message> + <source>New Folder</source> + <translation>Nova mapa</translation> + </message> + <message> + <source>Untitled</source> + <translation>Brez naslova</translation> + </message> +</context> +<context> <name>BookmarkManager</name> <message> <source>Untitled</source> @@ -320,6 +331,64 @@ Razlog: <context> <name>CmdLineParser</name> <message> + <source>Usage: assistant [Options] + +-collectionFile file Uses the specified collection + file instead of the default one +-showUrl url Shows the document with the + url. +-enableRemoteControl Enables Assistant to be + remotely controlled. +-show widget Shows the specified dockwidget + which can be "contents", "index", + "bookmarks" or "search". +-activate widget Activates the specified dockwidget + which can be "contents", "index", + "bookmarks" or "search". +-hide widget Hides the specified dockwidget + which can be "contents", "index" + "bookmarks" or "search". +-register helpFile Registers the specified help file + (.qch) in the given collection + file. +-unregister helpFile Unregisters the specified help file + (.qch) from the give collection + file. +-setCurrentFilter filter Set the filter as the active filter. +-remove-search-index Removes the full text search index. +-rebuild-search-index Re-builds the full text search index (potentially slow). +-quiet Does not display any error or + status message. +-help Displays this help. +</source> + <translation>Uporaba: assistant [možnosti] + +-collectionFile file Namesto privzete datoteke zbirke + uporabi navedeno +-showUrl url Prikaže dokument z URL-jem +-enableRemoteControl Omogoča oddaljeni nadzor +-show podokno Prikaže navedeno podokno, + ki je lahko »contents«, »index«, + »bookmarks« ali »search«. +-activate podokno Aktivira navedeno podokno, + ki je lahko »contents«, »index«, + »bookmarks« ali »search». +-hide podokno Skrije navedeno podokno, + ki je lahko »contents«, »index« + »bookmarks« ali »search«. +-register datoteka Registrira navedeno datoteko s pomočjo + (.qch) v dani datoteki zbirke. +-unregister datoteka Odregistrira navedeno datoteko s pomočjo + (.qch) iz dane datoteke zbirke. +-setCurrentFilter filter Nastavi filter kot aktiven. +-remove-search-index Odstrani kazalo za iskanje po celotnem besedilu. +-rebuild-search-index Znova zgradi kazalo za iskanje po celotnem besedilu (lahko počasno). +-quiet Ne prikaže nobenega sporočila + napake ali stanja. +-help Prikaže to pomoč. +</translation> + </message> + <message> <source>Unknown option: %1</source> <translation>Neznana možnost: %1</translation> </message> @@ -380,6 +449,56 @@ Razlog: </message> </context> <context> + <name>ConversionWizard</name> + <message> + <source>Help Conversion Wizard</source> + <translation>Čarovnik za pretvorbo pomoči</translation> + </message> + <message> + <source>Converting %1...</source> + <translation>Pretvarjanje %1 ...</translation> + </message> + <message> + <source>Writing help collection file...</source> + <translation>Zapisovanje datoteke z zbirko pomoči ...</translation> + </message> + <message> + <source>Done.</source> + <translation>Opravljeno.</translation> + </message> +</context> +<context> + <name>FilesPage</name> + <message> + <source>Form</source> + <translation>Obrazec</translation> + </message> + <message> + <source>Files:</source> + <translation>Datoteke:</translation> + </message> + <message> + <source>Remove</source> + <translation>Odstrani</translation> + </message> + <message> + <source>Remove All</source> + <translation>Odstrani vse</translation> + </message> + <message> + <source>Unreferenced Files</source> + <translation>Nesklicevane datoteke</translation> + </message> + <message> + <source>Remove files which are neither referenced by a keyword nor by the TOC.</source> + <translation>Odstrani datoteke, na katere se ne sklicuje niti ključna beseda niti vsebinsko kazalo.</translation> + </message> + <message> + <source><p><b>Warning:</b> Be aware when removing images or stylesheets since those files are not directly referenced by the .adp or .dcf file.</p></source> + <translation><p><b>Opozorilo:</b> Pazite pri odstranjevanju slik ali slogovnih predlog, saj se nanje datoteke *.adp ali *.dcf ne sklicujejo neposredno.</p></translation> + </message> +</context> +<context> <name>FilterNameDialogClass</name> <message> <source>Add Filter Name</source> @@ -391,6 +510,66 @@ Razlog: </message> </context> <context> + <name>FilterPage</name> + <message> + <source>Form</source> + <translation>Obrazec</translation> + </message> + <message> + <source>Filter attributes for current documentation (comma separated list):</source> + <translation>Filtrirne lastnosti za trenutno dokumentacijo (seznam, ločen z vejicami):</translation> + </message> + <message> + <source>Custom Filters</source> + <translation>Filtri po meri</translation> + </message> + <message> + <source>1</source> + <translation>1</translation> + </message> + <message> + <source>2</source> + <translation>2</translation> + </message> + <message> + <source>Add</source> + <translation>Dodaj</translation> + </message> + <message> + <source>Remove</source> + <translation>Odstrani</translation> + </message> + <message> + <source>Filter Settings</source> + <translation>Nastavitve filtra</translation> + </message> + <message> + <source>Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both, the filter attributes and the custom filters are optional.</source> + <translation>Določite filtrirne lastnosti za dokumentacijo. Če so uporabljene filtrirne lastnosti, določite tudi filter po meri zanje. Filtrirne lastnosti in filtri po meri niso obvezni.</translation> + </message> + <message> + <source>Filter Name</source> + <translation>Ime filtra</translation> + </message> + <message> + <source>Filter Attributes</source> + <translation>Filtrirne lastnosti</translation> + </message> + <message> + <source>The custom filter '%1' is defined multiple times.</source> + <translation>Filter po meri »%1« je določen večkrat.</translation> + </message> + <message> + <source>The attributes for custom filter '%1' are defined multiple times.</source> + <translation>Lastnosti za filer po meri »%1« so določene večkrat.</translation> + </message> + <message> + <source>unfiltered</source> + <comment>list of available documentation</comment> + <translation>nefiltrirano</translation> + </message> +</context> +<context> <name>FindWidget</name> <message> <source>Previous</source> @@ -410,6 +589,17 @@ Razlog: </message> </context> <context> + <name>FinishPage</name> + <message> + <source>Converting File</source> + <translation>Pretvarjanje datoteke</translation> + </message> + <message> + <source>Creating the new Qt help files from the old ADP file.</source> + <translation>Ustvarjanje novih datotek s pomočjo za Qt iz starih datotek ADP.</translation> + </message> +</context> +<context> <name>FontPanel</name> <message> <source>Font</source> @@ -433,6 +623,52 @@ Razlog: </message> </context> <context> + <name>GeneralPage</name> + <message> + <source>Form</source> + <translation>Obrazec</translation> + </message> + <message> + <source>Namespace:</source> + <translation>Imenski prostor:</translation> + </message> + <message> + <source>Virtual Folder:</source> + <translation>Navidezna mapa:</translation> + </message> + <message> + <source>General Settings</source> + <translation>Splošne nastavitve</translation> + </message> + <message> + <source>Specify the namespace and the virtual folder for the documentation.</source> + <translation>Določite imenski prostor in navidezno mapo za dokumentacijo.</translation> + </message> + <message> + <source>Namespace Error</source> + <translation>Napaka imenskega prostora</translation> + </message> + <message> + <source>The namespace contains some invalid characters.</source> + <translation>Imenski prostor vsebuje neveljavne znake.</translation> + </message> + <message> + <source>Virtual Folder Error</source> + <translation>Napaka navidezne mape</translation> + </message> + <message> + <source>The virtual folder contains some invalid characters.</source> + <translation>Navidezna mapa vsebuje neveljavne znake.</translation> + </message> +</context> +<context> + <name>HelpGenerator</name> + <message> + <source>Warning: %1</source> + <translation>Opozorilo: %1</translation> + </message> +</context> +<context> <name>HelpViewer</name> <message> <source><title>about:blank</title></source> @@ -456,6 +692,40 @@ Razlog: </message> </context> <context> + <name>HelpWindow</name> + <message> + <source><center><b>Wizard Assistant</b></center></source> + <translation><center><b>Čarovniški pomočnik</b></center></translation> + </message> +</context> +<context> + <name>IdentifierPage</name> + <message> + <source>Form</source> + <translation>Obrazec</translation> + </message> + <message> + <source>Create identifiers</source> + <translation>Ustvari identifikatorje</translation> + </message> + <message> + <source>Global prefix:</source> + <translation>Globalna predpona:</translation> + </message> + <message> + <source>Inherit prefix from file names</source> + <translation>Predpono prevzemi iz imen datotek</translation> + </message> + <message> + <source>Identifiers</source> + <translation>Identifikatorji</translation> + </message> + <message> + <source>This page allows you to create identifiers from the keywords found in the .adp or .dcf file.</source> + <translation>Ta stran vam omogoča, da iz ključnih besed v datoteki *.adp ali *.dcf ustvarite identifikatorje.</translation> + </message> +</context> +<context> <name>IndexWindow</name> <message> <source>&Look for:</source> @@ -471,6 +741,53 @@ Razlog: </message> </context> <context> + <name>InputPage</name> + <message> + <source>Form</source> + <translation>Obrazec</translation> + </message> + <message> + <source>File name:</source> + <translation>Ime datoteke:</translation> + </message> + <message> + <source>...</source> + <translation>...</translation> + </message> + <message> + <source>Input File</source> + <translation>Vhodna datoteka</translation> + </message> + <message> + <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source> + <translation>Določite datoteko *.adp ali *.dcf, ki jo želite pretvoriti v novo obliko projekta pomoči za Qt in/ali zbirke.</translation> + </message> + <message> + <source>Open file</source> + <translation>Odpri datoteko</translation> + </message> + <message> + <source>Qt Help Files (*.adp *.dcf)</source> + <translation>Datoteke s pomočjo za Qt (*.adp, *.dcf)</translation> + </message> + <message> + <source>File Open Error</source> + <translation>Napaka odpiranja datoteke</translation> + </message> + <message> + <source>The specified file could not be opened!</source> + <translation>Navedene datoteke ni bilo moč odpreti.</translation> + </message> + <message> + <source>File Parsing Error</source> + <translation>Napaka razčlenjevanja datoteke</translation> + </message> + <message> + <source>Parsing error in line %1!</source> + <translation>Napaka razčlenjevanja v vrstici %1.</translation> + </message> +</context> +<context> <name>InstallDialog</name> <message> <source>Install Documentation</source> @@ -770,6 +1087,10 @@ Razlog: <translation>Povezane postavke vsebine ni bilo moč najti.</translation> </message> <message> + <source><center><h3>%1</h3><p>Version %2</p></center><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p></source> + <translation><center><h3>%1</h3><p>Različica %2</p></center><p>Avtorske pravice © 2010 Nokia Corporation in/ali njene podružnice.</p><p>Prevedel: <a href="mailto:jlp@holodeck1.com">Jure Repinc</a>, <a href="http://www.lugos.si/">LUGOS</a></p></translation> + </message> + <message> <source>About %1</source> <translation>O %1</translation> </message> @@ -783,6 +1104,92 @@ Razlog: </message> </context> <context> + <name>OutputPage</name> + <message> + <source>Form</source> + <translation>Obrazec</translation> + </message> + <message> + <source>Project file name:</source> + <translation>Ime projektne datoteke:</translation> + </message> + <message> + <source>Collection file name:</source> + <translation>Ime datoteke zbirke:</translation> + </message> + <message> + <source>Output File Names</source> + <translation>Imena izhodnih datotek</translation> + </message> + <message> + <source>Specify the file names for the output files.</source> + <translation>Določite imena datotek za izhodne datoteke.</translation> + </message> + <message> + <source>Convert...</source> + <translation>Pretvori ...</translation> + </message> + <message> + <source>Qt Help Project File</source> + <translation>Projektna datoteka pomoči za Qt</translation> + </message> + <message> + <source>Qt Help Collection Project File</source> + <translation>Projektna datoteka zbirke pomoči za Qt</translation> + </message> + <message> + <source>The specified file %1 already exist. + +Do you want to remove it?</source> + <translation>Navedena datoteka %1 že obstaja. + +Ali jo želite odstraniti?</translation> + </message> + <message> + <source>Remove</source> + <translation>Odstrani</translation> + </message> + <message> + <source>Cancel</source> + <translation>Prekliči</translation> + </message> +</context> +<context> + <name>PathPage</name> + <message> + <source>Form</source> + <translation>Obrazec</translation> + </message> + <message> + <source>File filters:</source> + <translation>Datotečni filtri:</translation> + </message> + <message> + <source>Documentation source file paths:</source> + <translation>Poti z izvornimi datotekami za dokumentacijo:</translation> + </message> + <message> + <source>Add</source> + <translation>Dodaj</translation> + </message> + <message> + <source>Remove</source> + <translation>Odstrani</translation> + </message> + <message> + <source>Source File Paths</source> + <translation>Poti izvornih datotek</translation> + </message> + <message> + <source>Specify the paths where the sources files are located. By default, all files in those directories matched by the file filter will be included.</source> + <translation>Določite poti do mest, kjer se nahajajo izvorne datoteke. Privzeto bodo vključene vse datoteke iz map, ki se ujemajo z datotečnim filtrom.</translation> + </message> + <message> + <source>Source File Path</source> + <translation>Pot izvorne datoteke</translation> + </message> +</context> +<context> <name>PreferencesDialog</name> <message> <source>Add Documentation</source> @@ -917,6 +1324,176 @@ Razlog: </message> </context> <context> + <name>QCollectionGenerator</name> + <message> + <source>Unknown token at line %1.</source> + <translation>Neznan žeton v vrstici %1.</translation> + </message> + <message> + <source>Unknown token at line %1. Expected "QtHelpCollectionProject".</source> + <translation>Neznan žeton v vrstici %1. Pričakocan »QtHelpCollectionProject«.</translation> + </message> + <message> + <source>Missing end tags.</source> + <translation>Manjkajoče končne značke.</translation> + </message> + <message> + <source>Missing input or output file for help file generation.</source> + <translation>Manjkajoča vhodna ali izhodna datoteka za ustvarjanje datoteke s pomočjo.</translation> + </message> + <message> + <source>Missing output file name.</source> + <translation>Manjkajoče ime izhodne datoteke.</translation> + </message> + <message> + <source>Qt Collection Generator version 1.0 (Qt %1) +</source> + <translation>Qt Collection Generator različice 1.0 (Qt %1) +</translation> + </message> + <message> + <source>Missing collection config file.</source> + <translation>Manjkajoča nastavitvena datoteka zbirke.</translation> + </message> + <message> + <source> +Usage: + +qcollectiongenerator <collection-config-file> [options] + + -o <collection-file> Generates a collection file + called <collection-file>. If + this option is not specified + a default name will be used. + -v Displays the version of + qcollectiongenerator. + +</source> + <translation> +Uporaba: + +qcollectiongenerator <nastavitvena-datoteka> [možnosti] + + -o <datoteka-zbirke> Ustvari datoteko zbirke z + imenom <datoteka-zbirke>. če + ta možnost ni uporabljena, + se uporabi privzeto ime. + -v Prikaže različico za + qcollectiongenerator. + +</translation> + </message> + <message> + <source>Could not open %1. +</source> + <translation>Ni bilo moč odpreti %1. +</translation> + </message> + <message> + <source>Reading collection config file... +</source> + <translation>Branje nastavitvene datoteke zbirke ... +</translation> + </message> + <message> + <source>Collection config file error: %1 +</source> + <translation>Napaka nastavitvene datoteke zbirke: %1 +</translation> + </message> + <message> + <source>Generating help for %1... +</source> + <translation>Ustvarjanje pomoči za %1 ... +</translation> + </message> + <message> + <source>Creating collection file... +</source> + <translation>Ustvarjanje datoteke zbirke ... +</translation> + </message> + <message> + <source>The file %1 cannot be overwritten. +</source> + <translation>Datoteke %1 ni moč nadomestiti. +</translation> + </message> + <message> + <source>Cannot open %1. +</source> + <translation>Ni moč odpreti %1. +</translation> + </message> + <message> + <source>Cannot open referenced image file %1. +</source> + <translation>Ni moč odpreti sklicane slikovne datoteke %1. +</translation> + </message> +</context> +<context> + <name>QHelpGenerator</name> + <message> + <source>Missing output file name.</source> + <translation>Manjkajoče ime izhodne datoteke.</translation> + </message> + <message> + <source>Qt Help Generator version 1.0 (Qt %1) +</source> + <translation>Qt Help Generator različice 1.0 (Qt %1) +</translation> + </message> + <message> + <source>Missing Qt help project file.</source> + <translation>Manjkajoča projektna datoteka pomoči za Qt.</translation> + </message> + <message> + <source> +Usage: + +qhelpgenerator <help-project-file> [options] + + -o <compressed-file> Generates a Qt compressed help + file called <compressed-file>. + If this option is not specified + a default name will be used. + -c Checks whether all links in HTML files + point to files in this help project. + -v Displays the version of + qhelpgenerator. + +</source> + <translation> +Uporaba: + +qcollectiongenerator <projektna-datoteka> [možnosti] + + -o <stisnjena-datoteka> Ustvari stisnjeno datoteko pomoči + za Qt, z imenom <stisnjena-datoteka>. če + ta možnost ni uporabljena, + se uporabi privzeto ime. + -c Preveri, ali vse povezave v datotekah HTML + kažejo na datoteke v tem projektu pomoči. + -v Prikaže različico za + qhelpgenerator + +</translation> + </message> + <message> + <source>Could not open %1. +</source> + <translation>Ni bilo moč odpreti %1. +</translation> + </message> + <message> + <source>Could not create output directory: %1 +</source> + <translation>Ni bilo moč ustvariti izhodne mape: %1 +</translation> + </message> +</context> +<context> <name>RemoteControl</name> <message> <source>Debugging Remote Control</source> @@ -939,7 +1516,7 @@ Razlog: </message> <message> <source>Open Link in New Tab</source> - <translation>Odpri povezavo v novem &zavihku</translation> + <translation>Odpri povezavo v novem zavihku</translation> </message> <message> <source>Select All</source> diff --git a/translations/designer_sl.ts b/translations/designer_sl.ts index d925f09..1b906f5 100644 --- a/translations/designer_sl.ts +++ b/translations/designer_sl.ts @@ -32,6 +32,49 @@ </message> </context> <context> + <name>AbstractItemEditor</name> + <message> + <source>Selectable</source> + <translation>Moč izbrati</translation> + </message> + <message> + <source>Editable</source> + <translation>Moč urejati</translation> + </message> + <message> + <source>DragEnabled</source> + <translation>Omogočena vleka</translation> + </message> + <message> + <source>DropEnabled</source> + <translation>Omogočeno spuščanje</translation> + </message> + <message> + <source>UserCheckable</source> + <translation>Uporabnik lahko omogoči</translation> + </message> + <message> + <source>Enabled</source> + <translation>Omogočeno</translation> + </message> + <message> + <source>Tristate</source> + <translation>Tri stanja</translation> + </message> + <message> + <source>Unchecked</source> + <translation>Neomogočeno</translation> + </message> + <message> + <source>PartiallyChecked</source> + <translation>Delno omogočeno</translation> + </message> + <message> + <source>Checked</source> + <translation>Omogočeno</translation> + </message> +</context> +<context> <name>AddLinkDialog</name> <message> <source>Insert Link</source> @@ -2546,6 +2589,10 @@ Empty class name passed to widget factory method <context> <name>QtLocalePropertyManager</name> <message> + <source><Invalid></source> + <translation><neveljavno></translation> + </message> + <message> <source>%1, %2</source> <translation>%1, %2</translation> </message> @@ -3658,7 +3705,7 @@ Ali želite nadomestiti predlogo?</translation> </message> <message> <source>Page</source> - <translation>Stran %1</translation> + <translation>Stran</translation> </message> <message> <source>Page %1 of %2</source> @@ -3843,7 +3890,7 @@ Ali želite nadomestiti predlogo?</translation> </message> <message> <source>Delete String</source> - <translation>Z&briši niz</translation> + <translation>Zbriši niz</translation> </message> <message> <source>&Delete</source> @@ -3962,7 +4009,7 @@ Ali želite nadomestiti predlogo?</translation> </message> <message> <source>Key Resize</source> - <translation type="unfinished"></translation> + <translation>Sprememba velikosti s tipko</translation> </message> <message> <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source> @@ -4632,7 +4679,7 @@ Please select another name.</source> <name>qdesigner_internal::ObjectInspector</name> <message> <source>Change Current Page</source> - <translation type="unfinished">Spreminjanje trenutne strani</translation> + <translation>Spremeni trenutno stran</translation> </message> <message> <source>&Find in Text...</source> @@ -4780,6 +4827,14 @@ Please select another name.</source> <translation>Preveri razpoložljivost na novo nameščenih vstavkov za gradnike po meri.</translation> </message> <message> + <source>Loaded Plugins</source> + <translation>Naloženi vstavki</translation> + </message> + <message> + <source>Failed Plugins</source> + <translation>Neuspeli vstavki</translation> + </message> + <message> <source>Qt Designer couldn't find any plugins</source> <translation>Qt Designer ni našel nobenega vstavka</translation> </message> @@ -4815,7 +4870,7 @@ Please select another name.</source> </message> <message> <source>Load Custom Device Skin</source> - <translation type="unfinished">Naloži temo za napravo po meri</translation> + <translation>Naloži temo za napravo po meri</translation> </message> <message> <source>All QVFB Skins (*.%1)</source> @@ -5826,49 +5881,4 @@ To nakazuje na neskladnost v datoteki *.ui.</translation> <translation>&Povečava</translation> </message> </context> -<context> - <name></name> - <message> - <source><Filter></source> - <comment>qdesigner_internal::FilterWidget|</comment> - <translation type="obsolete"><filter></translation> - </message> - <message> - <source>Change Current Page</source> - <comment>qdesigner_internal::ObjectInspector::ObjectInspectorPrivate|</comment> - <translation type="obsolete">Spreminjanje trenutne strani</translation> - </message> - <message> - <source>Load Custom Device Skin</source> - <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment> - <translation type="obsolete">Naloži temo za napravo po meri</translation> - </message> - <message> - <source>All QVFB Skins (*.%1)</source> - <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment> - <translation type="obsolete">Vse teme za QVFB (*.%1)</translation> - </message> - <message> - <source>%1 - Duplicate Skin</source> - <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment> - <translation type="obsolete">%1 - podvojena tema</translation> - </message> - <message> - <source>The skin '%1' already exists.</source> - <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment> - <translation type="obsolete">Tema »%1« že obstaja.</translation> - </message> - <message> - <source>%1 - Error</source> - <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment> - <translation type="obsolete">%1 - napaka</translation> - </message> - <message> - <source>%1 is not a valid skin directory: -%2</source> - <comment>qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate|</comment> - <translation type="obsolete">%1 ni veljavna mapa s temo: -%2</translation> - </message> -</context> </TS> diff --git a/translations/linguist_sl.ts b/translations/linguist_sl.ts index 0b5b084..f749513 100644 --- a/translations/linguist_sl.ts +++ b/translations/linguist_sl.ts @@ -233,6 +233,11 @@ Privzeta bo edninska univerzalna oblika.</translation> <source>Cancel</source> <translation>Prekliči</translation> </message> + <message> + <source></source> + <comment>Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog</comment> + <translation></translation> + </message> </context> <context> <name>FormMultiWidget</name> @@ -264,6 +269,99 @@ Privzeta bo edninska univerzalna oblika.</translation> </message> </context> <context> + <name>LConvert</name> + <message> + <source> +Usage: + lconvert [options] <infile> [<infile>...] + +lconvert is part of Qt's Linguist tool chain. It can be used as a +stand-alone tool to convert and filter translation data files. +The following file formats are supported: + +%1 +If multiple input files are specified, they are merged with +translations from later files taking precedence. + +Options: + -h + --help Display this information and exit. + + -i <infile> + --input-file <infile> + Specify input file. Use if <infile> might start with a dash. + This option can be used several times to merge inputs. + May be '-' (standard input) for use in a pipe. + + -o <outfile> + --output-file <outfile> + Specify output file. Default is '-' (standard output). + + -if <informat> + --input-format <format> + Specify input format for subsequent <infile>s. + The format is auto-detected from the file name and defaults to 'ts'. + + -of <outformat> + --output-format <outformat> + Specify output format. See -if. + + --input-codec <codec> + Specify encoding for QM and PO input files. Default is 'Latin1' + for QM and 'UTF-8' for PO files. UTF-8 is always tried as well for + QM, corresponding to the possible use of the trUtf8() function. + + --output-codec <codec> + Specify encoding for PO output files. Default is 'UTF-8'. + + --drop-tags <regexp> + Drop named extra tags when writing TS or XLIFF files. + May be specified repeatedly. + + --drop-translations + Drop existing translations and reset the status to 'unfinished'. + Note: this implies --no-obsolete. + + --source-language <language>[_<region>] + Specify/override the language of the source strings. Defaults to + POSIX if not specified and the file does not name it yet. + + --target-language <language>[_<region>] + Specify/override the language of the translation. + The target language is guessed from the file name if this option + is not specified and the file contents name no language yet. + + --no-obsolete + Drop obsolete messages. + + --no-finished + Drop finished messages. + + --sort-contexts + Sort contexts in output TS file alphabetically. + + --locations {absolute|relative|none} + Override how source code references are saved in TS files. + Default is absolute. + + --no-ui-lines + Drop line numbers from references to UI files. + + --verbose + be a bit more verbose + +Long options can be specified with only one leading dash, too. + +Return value: + 0 on success + 1 on command line parse failures + 2 on read failures + 3 on write failures +</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>LRelease</name> <message numerus="yes"> <source>Dropped %n message(s) which had no ID.</source> @@ -301,6 +399,590 @@ Privzeta bo edninska univerzalna oblika.</translation> <numerusform> Prezrl %n neprevedenih izvornih besedil</numerusform> </translation> </message> + <message> + <source>Usage: + lrelease [options] project-file + lrelease [options] ts-files [-qm qm-file] + +lrelease is part of Qt's Linguist tool chain. It can be used as a +stand-alone tool to convert XML-based translations files in the TS +format into the 'compiled' QM format used by QTranslator objects. + +Options: + -help Display this information and exit + -idbased + Use IDs instead of source strings for message keying + -compress + Compress the QM files + -nounfinished + Do not include unfinished translations + -removeidentical + If the translated text is the same as + the source text, do not include the message + -markuntranslated <prefix> + If a message has no real translation, use the source text + prefixed with the given string instead + -silent + Do not explain what is being done + -version + Display the version of lrelease and exit +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lrelease error: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Updating '%1'... +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Removing translations equal to source text in '%1'... +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lrelease error: cannot create '%1': %2 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lrelease error: cannot save '%1': %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lrelease version %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lrelease error: cannot read project file '%1'. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lrelease error: cannot process project file '%1'. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lrelease warning: Met no 'TRANSLATIONS' entry in project file '%1' +</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LUpdate</name> + <message> + <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Parenthesis/brace mismatch between #if and #else branches; using #if branch +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unterminated C++ comment +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unterminated C++ string +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Excess closing brace in C++ code (or abuse of the C++ preprocessor) +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Excess closing parenthesis in C++ code (or abuse of the C++ preprocessor) +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Excess closing bracket in C++ code (or abuse of the C++ preprocessor) +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>circular inclusion of %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot open %1: %2 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>//% cannot be used with tr() / QT_TR_NOOP(). Ignoring +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Qualifying with unknown namespace/class %1::%2 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>tr() cannot be called without context +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Class '%1' lacks Q_OBJECT macro +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>It is not recommended to call tr() from within a constructor '%1::%2' +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unexpected character in meta string +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unterminated meta string +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot invoke tr() like this +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Discarding unconsumed meta data +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor) +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor) +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unbalanced opening bracket in C++ code (or abuse of the C++ preprocessor) +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cannot open %1: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unterminated Java comment. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Invalid Unicode value. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unterminated string. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>String used in translation can contain only literals concatenated with other literals, not expressions or numbers. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>'class' must be followed by a class name. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Excess closing brace. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>'package' must be followed by package name. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unbalanced opening brace. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unbalanced opening parenthesis. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Usage: + lupdate [options] [project-file]... + lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file + +lupdate is part of Qt's Linguist tool chain. It extracts translatable +messages from Qt UI files, C++, Java and JavaScript/QtScript source code. +Extracted messages are stored in textual translation source files (typically +Qt TS XML). New and modified messages can be merged into existing TS files. + +Options: + -help Display this information and exit. + -no-obsolete + Drop all obsolete strings. + -extensions <ext>[,<ext>]... + Process files with the given extensions only. + The extension list must be separated with commas, not with whitespace. + Default: '%1'. + -pluralonly + Only include plural form messages. + -silent + Do not explain what is being done. + -no-sort + Do not sort contexts in TS files. + -no-recursive + Do not recursively scan the following directories. + -recursive + Recursively scan the following directories (default). + -I <includepath> or -I<includepath> + Additional location to look for include files. + May be specified multiple times. + -locations {absolute|relative|none} + Specify/override how source code references are saved in TS files. + Default is absolute. + -no-ui-lines + Do not record line numbers in references to UI files. + -disable-heuristic {sametext|similartext|number} + Disable the named merge heuristic. Can be specified multiple times. + -pro <filename> + Name of a .pro file. Useful for files with .pro file syntax but + different file suffix. Projects are recursed into and merged. + -source-language <language>[_<region>] + Specify the language of the source strings for new files. + Defaults to POSIX if not specified. + -target-language <language>[_<region>] + Specify the language of the translations for new files. + Guessed from the file name if not specified. + -ts <ts-file>... + Specify the output file(s). This will override the TRANSLATIONS + and nullify the CODECFORTR from possibly specified project files. + -codecfortr <codec> + Specify the codec assumed for tr() calls. Effective only with -ts. + -version + Display the version of lupdate and exit. + @lst-file + Read additional file names (one per line) from lst-file. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: Codec for tr() '%1' disagrees with existing file's codec '%2'. Expect trouble. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: Specified target language '%1' disagrees with existing file's language '%2'. Ignoring. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: Specified source language '%1' disagrees with existing file's language '%2'. Ignoring. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Updating '%1'... +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Stripping non plural forms in '%1'... +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: Codec for source '%1' is invalid. Falling back to codec for tr(). +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: TS files from command line will override TRANSLATIONS in %1. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: TS files from command line prevent recursing into %1. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: no TS files specified. Only diagnostics will be produced for '%1'. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The option -target-language requires a parameter. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The option -source-language requires a parameter. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The option -disable-heuristic requires a parameter. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Invalid heuristic name passed to -disable-heuristic. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The option -locations requires a parameter. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Invalid parameter passed to -locations. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The -codecfortr option should be followed by a codec name. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The -extensions option should be followed by an extension list. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The -pro option should be followed by a filename of .pro file. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The -I option should be followed by a path. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unrecognized option '%1'. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate error: List file '%1' is not readable. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: For some reason, '%1' is not writable. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate error: File '%1' has no recognized extension. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate error: File '%1' does not exist. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Scanning directory '%1'... +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: -target-language usually only makes sense with exactly one TS file. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: -codecfortr has no effect without -ts. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate warning: no TS files specified. Only diagnostics will be produced. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>lupdate error: Both project and source files / include paths specified. +</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <source> Found %n source text(s) (%1 new and %2 already existing) +</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Removed %n obsolete entries +</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Kept %n obsolete entries +</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Number heuristic provided %n translation(s) +</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Same-text heuristic provided %n translation(s) +</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Similar-text heuristic provided %n translation(s) +</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <source>Illegal character</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unclosed string at end of line</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Illegal escape squence</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Illegal unicode escape sequence</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unclosed comment at end of file</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Illegal syntax for exponential number</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Identifier cannot start with numeric literal</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unterminated regular expression literal</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>//% cannot be used with %1(). Ignoring +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1() requires at least two arguments. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1(): both arguments must be literal strings. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1() requires at least one argument. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1(): text to translate must be a literal string. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>//= cannot be used with %1(). Ignoring +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1(): identifier must be a literal string. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Expected </source> + <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment> + <translation type="unfinished"></translation> + </message> + <message> + <source>XML error: Parse error at line %1, column %2 (%3).</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Parse error in UI file</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MainWindow</name> @@ -845,6 +1527,11 @@ Privzeta bo edninska univerzalna oblika.</translation> <translation>Dolžinske inačice</translation> </message> <message> + <source></source> + <comment>This is the application's main window.</comment> + <translation></translation> + </message> + <message> <source>Source text</source> <translation>Izvorno besedilo</translation> </message> @@ -1192,6 +1879,11 @@ Vse datoteke (*)</translation> <context> <name>MessageEditor</name> <message> + <source></source> + <comment>This is the right panel of the main window.</comment> + <translation></translation> + </message> + <message> <source>Russian</source> <translation>Ruščina</translation> </message> @@ -1290,6 +1982,13 @@ Vrstica: %2</translation> </message> </context> <context> + <name>PhraseBook</name> + <message> + <source>Parse error at line %1, column %2 (%3).</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PhraseBookBox</name> <message> <source>Edit Phrase Book</source> @@ -1360,6 +2059,11 @@ Vrstica: %2</translation> <translation>Zapri</translation> </message> <message> + <source></source> + <comment>Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox.</comment> + <translation></translation> + </message> + <message> <source>(New Entry)</source> <translation>(Nov vnos)</translation> </message> @@ -1456,6 +2160,11 @@ Vrstica: %2</translation> <source>XLIFF localization files</source> <translation>Prevajalske datoteke XLIFF</translation> </message> + <message> + <source>lupdate version %1 +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SourceCodeView</name> diff --git a/translations/qt_gl.ts b/translations/qt_gl.ts new file mode 100644 index 0000000..6f41ddf --- /dev/null +++ b/translations/qt_gl.ts @@ -0,0 +1,9828 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="gl_ES" sourcelanguage="en"> +<context> + <name>CloseButton</name> + <message> + <source>Close Tab</source> + <translation>Pechar a lingüeta</translation> + </message> +</context> +<context> + <name>FakeReply</name> + <message> + <source>Fake error !</source> + <translation>Erro falso!</translation> + </message> + <message> + <source>Invalid URL</source> + <translation>URL non válido</translation> + </message> +</context> +<context> + <name>MAC_APPLICATION_MENU</name> + <message> + <source>Services</source> + <translation>Servizos</translation> + </message> + <message> + <source>Hide %1</source> + <translation>Acochar %1</translation> + </message> + <message> + <source>Hide Others</source> + <translation>Acochar os outros</translation> + </message> + <message> + <source>Show All</source> + <translation>Mostrar todos</translation> + </message> + <message> + <source>Preferences...</source> + <translation>Preferencias...</translation> + </message> + <message> + <source>Quit %1</source> + <translation>Saír de %1</translation> + </message> + <message> + <source>About %1</source> + <translation>Acerca de %1</translation> + </message> +</context> +<context> + <name>QApplication</name> + <message> + <source>QT_LAYOUT_DIRECTION</source> + <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment> + <translation>LTR</translation> + </message> + <message> + <source>Activate</source> + <translation>Activar</translation> + </message> + <message> + <source>Activates the program's main window</source> + <translation>Activa a fiestra principal do programa</translation> + </message> + <message> + <source>Executable '%1' requires Qt %2, found Qt %3.</source> + <translation>O executábel «%1» require de Qt %2, e achouse Qt %3.</translation> + </message> + <message> + <source>Incompatible Qt Library Error</source> + <translation>Erro de bibliotecas Qt incompatíbeis</translation> + </message> +</context> +<context> + <name>Phonon::</name> + <message> + <source>Notifications</source> + <translation>Notificacións</translation> + </message> + <message> + <source>Music</source> + <translation>Música</translation> + </message> + <message> + <source>Video</source> + <translation>Vídeo</translation> + </message> + <message> + <source>Communication</source> + <translation>Comunicación</translation> + </message> + <message> + <source>Games</source> + <translation>Xogos</translation> + </message> + <message> + <source>Accessibility</source> + <translation>Accesibilidade</translation> + </message> +</context> +<context> + <name>Phonon::AudioOutput</name> + <message> + <source><html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html></source> + <translation><html>O dispositivo de reprodución de son <b>%1</b> non funciona.<br/>No seu +lugar usarase o <b>%2</b>.</html></translation> + </message> + <message> + <source><html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html></source> + <translation><html>Mudando para o dispositivo de reprodución de son <b>%1</b><br/>que +acaba de pórse dispoñíbel e ten maior preferencia.</html></translation> + </message> + <message> + <source>Revert back to device '%1'</source> + <translation>Estase a voltar para o dispositivo «%1»</translation> + </message> + <message> + <source><html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html></source> + <translation><html>Mudando para o dispositivo de reprodución de son <b>%1</b><br/>que ten +máis preferencia ou está configurado especificamente para este fluxo.</html></translation> + </message> +</context> +<context> + <name>Phonon::Gstreamer::Backend</name> + <message> + <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. + Some video features have been disabled.</source> + <translation>Aviso: Non semella ter instalado o paquete gstreamer0.10-plugins-good. + Desactiváronse algunhas funcionalidades de vídeo.</translation> + </message> + <message> + <source>Warning: You do not seem to have the base GStreamer plugins installed. + All audio and video support has been disabled</source> + <translation>Aviso: Non semella ter instaladas as extensións básicas de GStreamer. + Desactivouse todo o soporte de son e vídeo</translation> + </message> +</context> +<context> + <name>Phonon::Gstreamer::MediaObject</name> + <message> + <source>Cannot start playback. + +Check your GStreamer installation and make sure you +have libgstreamer-plugins-base installed.</source> + <translation>Non é posíbel reproducir. + +Comprobe a instalación de GStreamer e verifique que ten instalado libgstreamer-plugins-base.</translation> + </message> + <message> + <source>Missing codec helper script assistant.</source> + <translation>Falta o asistente do script auxiliar do códec.</translation> + </message> + <message> + <source>Plugin codec installation failed for codec: %0</source> + <translation>Fallou a instalación da extensión dun códec: %0</translation> + </message> + <message> + <source>A required codec is missing. You need to install the following codec(s) to play this content: %0</source> + <translation>Falta un códec requirido, polo que deberá instalar os seguintes códecs para +reproducir este contido: %0</translation> + </message> + <message> + <source>Could not open media source.</source> + <translation>Non foi posíbel abrir a orixe dos medios.</translation> + </message> + <message> + <source>Invalid source type.</source> + <translation>Tipo de orixe non válido.</translation> + </message> + <message> + <source>Could not locate media source.</source> + <translation>Non foi posíbel localizar a orixe do medio.</translation> + </message> + <message> + <source>Could not open audio device. The device is already in use.</source> + <translation>Non foi posíbel abrir o dispositivo de audio. O dispositivo xa está en uso.</translation> + </message> + <message> + <source>Could not decode media source.</source> + <translation>Non foi posíbel descodificar a fonte do medio.</translation> + </message> +</context> +<context> + <name>Phonon::MMF</name> + <message> + <source>Audio Output</source> + <translation>Saída de son</translation> + </message> + <message> + <source>The audio output device</source> + <translation>O dispositivo de saída do son</translation> + </message> + <message> + <source>No error</source> + <translation>Sen erros</translation> + </message> + <message> + <source>Not found</source> + <translation>Non atopado</translation> + </message> + <message> + <source>Out of memory</source> + <translation>Esgotouse a memoria</translation> + </message> + <message> + <source>Not supported</source> + <translation>Non soportado</translation> + </message> + <message> + <source>Overflow</source> + <translation>Desbordamento</translation> + </message> + <message> + <source>Underflow</source> + <translation>Esgotamento</translation> + </message> + <message> + <source>Already exists</source> + <translation>Xa existe</translation> + </message> + <message> + <source>Path not found</source> + <translation>Non se atopou a rota</translation> + </message> + <message> + <source>In use</source> + <translation>En uso</translation> + </message> + <message> + <source>Not ready</source> + <translation>Non preparado</translation> + </message> + <message> + <source>Access denied</source> + <translation>Acceso denegado</translation> + </message> + <message> + <source>Could not connect</source> + <translation>Non foi posíbel conectar</translation> + </message> + <message> + <source>Disconnected</source> + <translation>Desconectado</translation> + </message> + <message> + <source>Permission denied</source> + <translation>Permiso negado</translation> + </message> + <message> + <source>Insufficient bandwidth</source> + <translation>Largo de banda insuficiente</translation> + </message> + <message> + <source>Network unavailable</source> + <translation>Rede non dispoñíbel</translation> + </message> + <message> + <source>Network communication error</source> + <translation>Erro de comunicación pola reda</translation> + </message> + <message> + <source>Streaming not supported</source> + <translation>Non está soportada a retransmisión</translation> + </message> + <message> + <source>Server alert</source> + <translation>Alerta do servidor</translation> + </message> + <message> + <source>Invalid protocol</source> + <translation>Protocolo non válido</translation> + </message> + <message> + <source>Invalid URL</source> + <translation>URL non válido</translation> + </message> + <message> + <source>Multicast error</source> + <translation>Erro de multicast</translation> + </message> + <message> + <source>Proxy server error</source> + <translation>Erro do servidor proxy</translation> + </message> + <message> + <source>Proxy server not supported</source> + <translation>O servidor proxy non está soportado</translation> + </message> + <message> + <source>Audio output error</source> + <translation>Erro da saída de son</translation> + </message> + <message> + <source>Video output error</source> + <translation>Erro da saída de vídeo</translation> + </message> + <message> + <source>Decoder error</source> + <translation>Erro do descodificador</translation> + </message> + <message> + <source>Audio or video components could not be played</source> + <translation>Non foi posíbel reproducir as compoñentes de son nin de video</translation> + </message> + <message> + <source>DRM error</source> + <translation>Erro da DRM</translation> + </message> + <message> + <source>Unknown error (%1)</source> + <translation>Erro descoñecido (%1)</translation> + </message> +</context> +<context> + <name>Phonon::MMF::AbstractMediaPlayer</name> + <message> + <source>Not ready to play</source> + <translation>Non está preparado para reproducir</translation> + </message> + <message> + <source>Error opening file</source> + <translation>Aconteceu un erro ao abrir o ficheiro</translation> + </message> + <message> + <source>Error opening URL</source> + <translation>Aconteceu un erro ao abrir o URL</translation> + </message> + <message> + <source>Error opening resource</source> + <translation>Aconteceu un erro ao abrir o recurso</translation> + </message> + <message> + <source>Error opening source: resource not opened</source> + <translation>Erro ao abrir o recurso: non se abriu o recurso</translation> + </message> + <message> + <source>Setting volume failed</source> + <translation>Fallou a configuración do volume</translation> + </message> + <message> + <source>Loading clip failed</source> + <translation>Fallou a carga do clip</translation> + </message> + <message> + <source>Playback complete</source> + <translation>Completouse a reprodución</translation> + </message> +</context> +<context> + <name>Phonon::MMF::AbstractVideoPlayer</name> + <message> + <source>Pause failed</source> + <translation>Fallou o pór en pausa</translation> + </message> + <message> + <source>Seek failed</source> + <translation>Fallou o salto</translation> + </message> + <message> + <source>Getting position failed</source> + <translation>Fallou a obtención da posición</translation> + </message> + <message> + <source>Opening clip failed</source> + <translation>Fallou a abertura do clip</translation> + </message> +</context> +<context> + <name>Phonon::MMF::AudioEqualizer</name> + <message> + <source>%1 Hz</source> + <translation>%1 Hz</translation> + </message> +</context> +<context> + <name>Phonon::MMF::AudioPlayer</name> + <message> + <source>Getting position failed</source> + <translation>Fallou a obtención da posición</translation> + </message> +</context> +<context> + <name>Phonon::MMF::DsaVideoPlayer</name> + <message> + <source>Video display error</source> + <translation>Erro na visualización do vídeo</translation> + </message> +</context> +<context> + <name>Phonon::MMF::EffectFactory</name> + <message> + <source>Enabled</source> + <translation>Activado</translation> + </message> +</context> +<context> + <name>Phonon::MMF::EnvironmentalReverb</name> + <message> + <source>Decay HF ratio (%)</source> + <extracomment>DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime.</extracomment> + <translation>Taxa de decaemento de HF (%)</translation> + </message> + <message> + <source>Decay time (ms)</source> + <extracomment>DecayTime: Time over which reverberation is diminished.</extracomment> + <translation>Período de decaemento (ms)</translation> + </message> + <message> + <source>Density (%)</source> + <extracomment>Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value.</extracomment> + <translation>Densidade (%)</translation> + </message> + <message> + <source>Diffusion (%)</source> + <extracomment>Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value.</extracomment> + <translation>Difusión (%)</translation> + </message> + <message> + <source>Reflections delay (ms)</source> + <extracomment>ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection.</extracomment> + <translation>Retardo dos reflexos (ms)</translation> + </message> + <message> + <source>Reflections level (mB)</source> + <extracomment>ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude.</extracomment> + <translation>Nivel dos reflexos (mB)</translation> + </message> + <message> + <source>Reverb delay (ms)</source> + <extracomment>ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation.</extracomment> + <translation>Retardo da reverberación (ms)</translation> + </message> + <message> + <source>Reverb level (mB)</source> + <extracomment>ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude.</extracomment> + <translation>Nivel da reverberación (mB)</translation> + </message> + <message> + <source>Room HF level</source> + <extracomment>RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound.</extracomment> + <translation>Nivel de HF da sala</translation> + </message> + <message> + <source>Room level (mB)</source> + <extracomment>RoomLevel: Master volume control for all reflected sound.</extracomment> + <translation>Nivel da sala (mB)</translation> + </message> +</context> +<context> + <name>Phonon::MMF::MediaObject</name> + <message> + <source>Error opening source: type not supported</source> + <translation>Erro ao abrir a fonte: tipo non soportado</translation> + </message> + <message> + <source>Error opening source: resource is compressed</source> + <translation>Erro ao abrir a fonte: o recurso está comprimido</translation> + </message> + <message> + <source>Error opening source: resource not valid</source> + <translation>Erro ao abrir a fonte: o recurso non é válido</translation> + </message> + <message> + <source>Error opening source: media type could not be determined</source> + <translation>Erro ao abrir a fonte: non foi posíbel determinar o tipo de medio</translation> + </message> +</context> +<context> + <name>Phonon::MMF::StereoWidening</name> + <message> + <source>Level (%)</source> + <translation>Nivel (%)</translation> + </message> +</context> +<context> + <name>Phonon::MMF::SurfaceVideoPlayer</name> + <message> + <source>Video display error</source> + <translation>Erro na visualización do vídeo</translation> + </message> +</context> +<context> + <name>Phonon::VolumeSlider</name> + <message> + <source>Volume: %1%</source> + <translation>Volume: %1%</translation> + </message> + <message> + <source>Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%</source> + <translation>Use esta barra deslizante para axustar o volume. A posición da esquerda é o +0%, a da dereita o %1%</translation> + </message> + <message> + <source>Muted</source> + <translation>Silenciado</translation> + </message> +</context> +<context> + <name>Q3Accel</name> + <message> + <source>%1, %2 not defined</source> + <translation>%1, %2 non definido</translation> + </message> + <message> + <source>Ambiguous %1 not handled</source> + <translation>Non se xestionou o %1 ambiguo</translation> + </message> +</context> +<context> + <name>Q3DataTable</name> + <message> + <source>True</source> + <translation>Verdadeiro</translation> + </message> + <message> + <source>False</source> + <translation>Falso</translation> + </message> + <message> + <source>Insert</source> + <translation>Inserir</translation> + </message> + <message> + <source>Update</source> + <translation>Actualizar</translation> + </message> + <message> + <source>Delete</source> + <translation>Borrar</translation> + </message> +</context> +<context> + <name>Q3FileDialog</name> + <message> + <source>Copy or Move a File</source> + <translation>Copiar ou mover un ficheiro</translation> + </message> + <message> + <source>Read: %1</source> + <translation>Ler: %1</translation> + </message> + <message> + <source>Write: %1</source> + <translation>Escribir: %1</translation> + </message> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <source>All Files (*)</source> + <translation>Todos os ficheiros (*)</translation> + </message> + <message> + <source>Name</source> + <translation>Nome</translation> + </message> + <message> + <source>Size</source> + <translation>Tamaño</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Attributes</source> + <translation>Atributos</translation> + </message> + <message> + <source>&OK</source> + <translation>&Aceptar</translation> + </message> + <message> + <source>Look &in:</source> + <translation>P&rocurar en:</translation> + </message> + <message> + <source>File &name:</source> + <translation>&Nome do ficheiro:</translation> + </message> + <message> + <source>File &type:</source> + <translation>&Tipo de ficheiro:</translation> + </message> + <message> + <source>Back</source> + <translation>Atrás</translation> + </message> + <message> + <source>One directory up</source> + <translation>Subir un directorio</translation> + </message> + <message> + <source>Create New Folder</source> + <translation>Crear un cartafol novo</translation> + </message> + <message> + <source>List View</source> + <translation>Vista en lista</translation> + </message> + <message> + <source>Detail View</source> + <translation>Vista de detalles</translation> + </message> + <message> + <source>Preview File Info</source> + <translation>Información da vista previa do ficheiro</translation> + </message> + <message> + <source>Preview File Contents</source> + <translation>Contido da previsualización do ficheiro</translation> + </message> + <message> + <source>Read-write</source> + <translation>Lectura e escrita</translation> + </message> + <message> + <source>Read-only</source> + <translation>Só lectura</translation> + </message> + <message> + <source>Write-only</source> + <translation>Só escrita</translation> + </message> + <message> + <source>Inaccessible</source> + <translation>Inaccesíbel</translation> + </message> + <message> + <source>Symlink to File</source> + <translation>Ligazón simbólica a un ficheiro</translation> + </message> + <message> + <source>Symlink to Directory</source> + <translation>Ligazón simbólica a un directorio</translation> + </message> + <message> + <source>Symlink to Special</source> + <translation>Ligazón simbólica a un ficheiro especial</translation> + </message> + <message> + <source>File</source> + <translation>Ficheiro</translation> + </message> + <message> + <source>Dir</source> + <translation>Dir</translation> + </message> + <message> + <source>Special</source> + <translation>Especial</translation> + </message> + <message> + <source>Open</source> + <translation>Abrir</translation> + </message> + <message> + <source>Save As</source> + <translation>Gardar como</translation> + </message> + <message> + <source>&Open</source> + <translation>&Abrir</translation> + </message> + <message> + <source>&Save</source> + <translation>&Gardar</translation> + </message> + <message> + <source>&Rename</source> + <translation>&Mudar o nome</translation> + </message> + <message> + <source>&Delete</source> + <translation>&Borrar</translation> + </message> + <message> + <source>R&eload</source> + <translation>&Cargar de novo</translation> + </message> + <message> + <source>Sort by &Name</source> + <translation>Ordenar segundo o &nome</translation> + </message> + <message> + <source>Sort by &Size</source> + <translation>Ordenar segundo o &tamaño</translation> + </message> + <message> + <source>Sort by &Date</source> + <translation>Ordenar segundo a &data</translation> + </message> + <message> + <source>&Unsorted</source> + <translation>&Sen ordenar</translation> + </message> + <message> + <source>Sort</source> + <translation>Ordenar</translation> + </message> + <message> + <source>Show &hidden files</source> + <translation>Mostrar os ficheiros &acochados</translation> + </message> + <message> + <source>the file</source> + <translation>o ficheiro</translation> + </message> + <message> + <source>the directory</source> + <translation>o cartafol</translation> + </message> + <message> + <source>the symlink</source> + <translation>a ligazón simbólica</translation> + </message> + <message> + <source>Delete %1</source> + <translation>Borrar %1</translation> + </message> + <message> + <source><qt>Are you sure you wish to delete %1 "%2"?</qt></source> + <translation><qt>Desexa realmente borrar %1 «%2»?</qt></translation> + </message> + <message> + <source>&Yes</source> + <translation>&Si</translation> + </message> + <message> + <source>&No</source> + <translation>&Non</translation> + </message> + <message> + <source>New Folder 1</source> + <translation>Novo cartafol 1</translation> + </message> + <message> + <source>New Folder</source> + <translation>Novo cartafol</translation> + </message> + <message> + <source>New Folder %1</source> + <translation>Novo cartafol %1</translation> + </message> + <message> + <source>Find Directory</source> + <translation>Procurar un cartafol</translation> + </message> + <message> + <source>Directories</source> + <translation>Cartafoles</translation> + </message> + <message> + <source>Directory:</source> + <translation>Cartafol:</translation> + </message> + <message> + <source>Error</source> + <translation>Erro</translation> + </message> + <message> + <source>%1 +File not found. +Check path and filename.</source> + <translation>%1 +Non se atopou o ficheiro. +Verifique a rota e o nome do ficheiro.</translation> + </message> + <message> + <source>All Files (*.*)</source> + <translation>Todos os ficheiros (*.*)</translation> + </message> + <message> + <source>Open </source> + <translation>Abrir</translation> + </message> + <message> + <source>Select a Directory</source> + <translation>Escolla un cartafol</translation> + </message> +</context> +<context> + <name>Q3LocalFs</name> + <message> + <source>Could not read directory +%1</source> + <translation>Non foi posíbel ler o cartafol +%1</translation> + </message> + <message> + <source>Could not create directory +%1</source> + <translation>Non foi posíbel crear o cartafol %1</translation> + </message> + <message> + <source>Could not remove file or directory +%1</source> + <translation>Non foi posíbel eliminar o ficheiro ou cartafol +%1</translation> + </message> + <message> + <source>Could not rename +%1 +to +%2</source> + <translation>Non foi posíbel mudar o nome de +%1 +para +%2</translation> + </message> + <message> + <source>Could not open +%1</source> + <translation>Non foi posíbel abrir +%1</translation> + </message> + <message> + <source>Could not write +%1</source> + <translation>Non foi posíbel escribir +%1</translation> + </message> +</context> +<context> + <name>Q3MainWindow</name> + <message> + <source>Line up</source> + <translation>Aliñar en riba</translation> + </message> + <message> + <source>Customize...</source> + <translation>Personalizar...</translation> + </message> +</context> +<context> + <name>Q3NetworkProtocol</name> + <message> + <source>Operation stopped by the user</source> + <translation>Operación interrompida polo usuario</translation> + </message> +</context> +<context> + <name>Q3ProgressDialog</name> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> +</context> +<context> + <name>Q3TabDialog</name> + <message> + <source>OK</source> + <translation>Aceptar</translation> + </message> + <message> + <source>Apply</source> + <translation>Aplicar</translation> + </message> + <message> + <source>Help</source> + <translation>Axuda</translation> + </message> + <message> + <source>Defaults</source> + <translation>Predeterminado</translation> + </message> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> +</context> +<context> + <name>Q3TextEdit</name> + <message> + <source>&Undo</source> + <translation>&Desfacer</translation> + </message> + <message> + <source>&Redo</source> + <translation>&Refacer</translation> + </message> + <message> + <source>Cu&t</source> + <translation>Cor&tar</translation> + </message> + <message> + <source>&Copy</source> + <translation>&Copiar</translation> + </message> + <message> + <source>&Paste</source> + <translation>A&pegar</translation> + </message> + <message> + <source>Clear</source> + <translation>Limpar</translation> + </message> + <message> + <source>Select All</source> + <translation>Escoller todo</translation> + </message> +</context> +<context> + <name>Q3TitleBar</name> + <message> + <source>System</source> + <translation>Sistema</translation> + </message> + <message> + <source>Restore up</source> + <translation>Restaurar</translation> + </message> + <message> + <source>Minimize</source> + <translation>Minimizar</translation> + </message> + <message> + <source>Restore down</source> + <translation>Restaurar en pequeno</translation> + </message> + <message> + <source>Maximize</source> + <translation>Maximizar</translation> + </message> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Contains commands to manipulate the window</source> + <translation>Contén ordes para manipular a fiestra</translation> + </message> + <message> + <source>Puts a minimized window back to normal</source> + <translation>Volta unha fiestra minimizada ao tamaño normal</translation> + </message> + <message> + <source>Moves the window out of the way</source> + <translation>Vota a un lado a fiestra</translation> + </message> + <message> + <source>Puts a maximized window back to normal</source> + <translation>Volta unha fiestra maximizada ao tamaño normal</translation> + </message> + <message> + <source>Makes the window full screen</source> + <translation>Pon a fiestra a pantalla completa</translation> + </message> + <message> + <source>Closes the window</source> + <translation>Pecha a fiestra</translation> + </message> + <message> + <source>Displays the name of the window and contains controls to manipulate it</source> + <translation>Mostra o nome da fiestra e contén controles para manipulala</translation> + </message> +</context> +<context> + <name>Q3ToolBar</name> + <message> + <source>More...</source> + <translation>Máis...</translation> + </message> +</context> +<context> + <name>Q3UrlOperator</name> + <message> + <source>The protocol `%1' is not supported</source> + <translation>O protocolo «%1» non está soportado.</translation> + </message> + <message> + <source>The protocol `%1' does not support listing directories</source> + <translation>O protocolo «%1» non soporta sacar listaxes de cartafoles</translation> + </message> + <message> + <source>The protocol `%1' does not support creating new directories</source> + <translation>O protocolo «%1» non soporta crear cartafoles novos</translation> + </message> + <message> + <source>The protocol `%1' does not support removing files or directories</source> + <translation>O protocolo «%1» non soporta eliminar nin ficheiros nin cartafoles</translation> + </message> + <message> + <source>The protocol `%1' does not support renaming files or directories</source> + <translation>O protocolo «%1» non soporta mudar o nome dos ficheiros nin dos cartafoles</translation> + </message> + <message> + <source>The protocol `%1' does not support getting files</source> + <translation>O protocolo «%1» non soporta obter ficheiros</translation> + </message> + <message> + <source>The protocol `%1' does not support putting files</source> + <translation>O protocolo «%1» non soporta enviar ficheiros</translation> + </message> + <message> + <source>The protocol `%1' does not support copying or moving files or directories</source> + <translation>O protocolo «%1» non soporta copiar nin mover nin ficheiros nin cartafoles</translation> + </message> + <message> + <source>(unknown)</source> + <translation>(descoñecido)</translation> + </message> +</context> +<context> + <name>Q3Wizard</name> + <message> + <source>&Cancel</source> + <translation>&Cancelar</translation> + </message> + <message> + <source>< &Back</source> + <translation>< &Anterior</translation> + </message> + <message> + <source>&Next ></source> + <translation>&Seguinte ></translation> + </message> + <message> + <source>&Finish</source> + <translation>&Finalizar</translation> + </message> + <message> + <source>&Help</source> + <translation>&Axuda</translation> + </message> +</context> +<context> + <name>QAbstractSocket</name> + <message> + <source>Socket operation timed out</source> + <translation>A operación do socket esgotou o tempo-límite</translation> + </message> + <message> + <source>Operation on socket is not supported</source> + <translation>A operación no socket non está soportada</translation> + </message> + <message> + <source>Host not found</source> + <translation>Non se atopou o servidor</translation> + </message> + <message> + <source>Connection refused</source> + <translation>A conexión foi rexeitada</translation> + </message> + <message> + <source>Connection timed out</source> + <translation>A conexión esgotou o tempo-límite</translation> + </message> + <message> + <source>Socket is not connected</source> + <translation>O socket non está conectado</translation> + </message> + <message> + <source>Network unreachable</source> + <translation>Non foi posíbel acadar a rede</translation> + </message> +</context> +<context> + <name>QHttp</name> + <message> + <source>Connection refused</source> + <translation>Rexeitouse a conexión</translation> + </message> + <message> + <source>Connection closed</source> + <translation>Pechouse a conexión</translation> + </message> + <message> + <source>Proxy requires authentication</source> + <translation>O proxy require autenticación</translation> + </message> + <message> + <source>Host requires authentication</source> + <translation>O servidor require autenticación</translation> + </message> + <message> + <source>Data corrupted</source> + <translation>Datos corrompidos</translation> + </message> + <message> + <source>Unknown protocol specified</source> + <translation>Especificouse un protocolo descoñecido</translation> + </message> + <message> + <source>SSL handshake failed</source> + <translation>Fallou a negociación de SSL</translation> + </message> + <message> + <source>HTTPS connection requested but SSL support not compiled in</source> + <translation>Pediuse unha conexión HTTPS pero non se compilou con soporte de SSL</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> + <message> + <source>Request aborted</source> + <translation>Pedido abortado</translation> + </message> + <message> + <source>No server set to connect to</source> + <translation>Non se indicou ningún servidor co que conectar</translation> + </message> + <message> + <source>Wrong content length</source> + <translation>Longitude do contido incorrecta</translation> + </message> + <message> + <source>Server closed connection unexpectedly</source> + <translation>O servidor pechou a conexión inesperadamente</translation> + </message> + <message> + <source>Connection refused (or timed out)</source> + <translation>Rexeitouse a conexión (ou esgouto o tempo-límite)</translation> + </message> + <message> + <source>Host %1 not found</source> + <translation>Non se atopou o servidor %1</translation> + </message> + <message> + <source>HTTP request failed</source> + <translation>O pedido HTTP fallou</translation> + </message> + <message> + <source>Invalid HTTP response header</source> + <translation>A cabeceira da resposta HTTP non é válida</translation> + </message> + <message> + <source>Unknown authentication method</source> + <translation>Método descoñecido de autenticación</translation> + </message> + <message> + <source>Proxy authentication required</source> + <translation>Requírese de autenticación no proxy</translation> + </message> + <message> + <source>Authentication required</source> + <translation>Requírese de autenticación</translation> + </message> + <message> + <source>Invalid HTTP chunked body</source> + <translation>Corpo HTTP en pedazos non válido</translation> + </message> + <message> + <source>Error writing response to device</source> + <translation>Erro ao escribir a resposta no dispositivo</translation> + </message> + <message> + <source>Host %1 found</source> + <translation>Atopouse o servidor %1</translation> + </message> + <message> + <source>Connected to host %1</source> + <translation>Conectado co servidor %1</translation> + </message> + <message> + <source>Connection to %1 closed</source> + <translation>Pechouse a conexión con %1</translation> + </message> + <message> + <source>Host found</source> + <translation>Atopouse un servidor</translation> + </message> + <message> + <source>Connected to host</source> + <translation>Conectado co servidor</translation> + </message> +</context> +<context> + <name>QSocks5SocketEngine</name> + <message> + <source>Connection to proxy refused</source> + <translation>A conexión co proxy foi rexeitada</translation> + </message> + <message> + <source>Connection to proxy closed prematurely</source> + <translation>A conexión co proxy pechouse antes de tempo</translation> + </message> + <message> + <source>Proxy host not found</source> + <translation>Non se atopou o servidor proxy</translation> + </message> + <message> + <source>Connection to proxy timed out</source> + <translation>A conexión co proxy esgotou o tempo-límite</translation> + </message> + <message> + <source>Proxy authentication failed</source> + <translation>Fallou a autenticación co proxy</translation> + </message> + <message> + <source>Proxy authentication failed: %1</source> + <translation>Fallou a autenticación no proxy: %1</translation> + </message> + <message> + <source>SOCKS version 5 protocol error</source> + <translation>Erro do protocolo SOCKS versión 5</translation> + </message> + <message> + <source>General SOCKSv5 server failure</source> + <translation>Fallo xeral do servidor SOCKSv5</translation> + </message> + <message> + <source>Connection not allowed by SOCKSv5 server</source> + <translation>O servidor SOCKSv5 non permitiu a conexión</translation> + </message> + <message> + <source>TTL expired</source> + <translation>Esgotouse o TTL</translation> + </message> + <message> + <source>SOCKSv5 command not supported</source> + <translation>A orde SOCKSv5 non está soportada</translation> + </message> + <message> + <source>Address type not supported</source> + <translation>Tipo de enderezo non soportado</translation> + </message> + <message> + <source>Unknown SOCKSv5 proxy error code 0x%1</source> + <translation>Código de erro descoñecido (0x%1) do proxy SOCKSv5</translation> + </message> + <message> + <source>Network operation timed out</source> + <translation>A operación de rede esgotou o tempo-límite</translation> + </message> +</context> +<context> + <name>QAbstractSpinBox</name> + <message> + <source>&Select All</source> + <translation>Escoller &todo</translation> + </message> + <message> + <source>&Step up</source> + <translation>&Subir</translation> + </message> + <message> + <source>Step &down</source> + <translation>&Baixar</translation> + </message> +</context> +<context> + <name>QAccessibleButton</name> + <message> + <source>Press</source> + <translation>Premer</translation> + </message> +</context> +<context> + <name>QCheckBox</name> + <message> + <source>Uncheck</source> + <translation>Desmarcar</translation> + </message> + <message> + <source>Check</source> + <translation>Marcar</translation> + </message> + <message> + <source>Toggle</source> + <translation>Conmutar</translation> + </message> +</context> +<context> + <name>QPushButton</name> + <message> + <source>Open</source> + <translation>Abrir</translation> + </message> +</context> +<context> + <name>QRadioButton</name> + <message> + <source>Check</source> + <translation>Marcar</translation> + </message> +</context> +<context> + <name>QToolButton</name> + <message> + <source>Press</source> + <translation>Premer</translation> + </message> + <message> + <source>Open</source> + <translation>Abrir</translation> + </message> +</context> +<context> + <name>QAxSelect</name> + <message> + <source>Select ActiveX Control</source> + <translation>Escoller n control ActiveX</translation> + </message> + <message> + <source>OK</source> + <translation>Aceptar</translation> + </message> + <message> + <source>&Cancel</source> + <translation>&Cancelar</translation> + </message> + <message> + <source>COM &Object:</source> + <translation>&Obxecto COM:</translation> + </message> +</context> +<context> + <name>QColorDialog</name> + <message> + <source>Hu&e:</source> + <translation>&Ton:</translation> + </message> + <message> + <source>&Sat:</source> + <translation>&Satur:</translation> + </message> + <message> + <source>&Val:</source> + <translation>&Valor:</translation> + </message> + <message> + <source>&Red:</source> + <translation>&Vermello:</translation> + </message> + <message> + <source>&Green:</source> + <translation>V&erde:</translation> + </message> + <message> + <source>Bl&ue:</source> + <translation>A&zul:</translation> + </message> + <message> + <source>A&lpha channel:</source> + <translation>Canle &alfa:</translation> + </message> + <message> + <source>Select Color</source> + <translation>Escoller unha cor</translation> + </message> + <message> + <source>&Basic colors</source> + <translation>Cores &básicas</translation> + </message> + <message> + <source>&Custom colors</source> + <translation>Cores &personalizadas</translation> + </message> + <message> + <source>&Add to Custom Colors</source> + <translation>&Engadir ás cores personalizadas</translation> + </message> +</context> +<context> + <name>QComboBox</name> + <message> + <source>False</source> + <translation>Falso</translation> + </message> + <message> + <source>True</source> + <translation>Verdadeiro</translation> + </message> + <message> + <source>Open</source> + <translation>Abrir</translation> + </message> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> +</context> +<context> + <name>QTabBar</name> + <message> + <source>Scroll Left</source> + <translation>Desprazar cara a esquerda</translation> + </message> + <message> + <source>Scroll Right</source> + <translation>Desprazar cara a dereita</translation> + </message> +</context> +<context> + <name>QCoreApplication</name> + <message> + <source>%1: already exists</source> + <comment>QSystemSemaphore</comment> + <translation>%1: xa existe</translation> + </message> + <message> + <source>%1: does not exist</source> + <comment>QSystemSemaphore</comment> + <translation>%1: non existe</translation> + </message> + <message> + <source>%1: out of resources</source> + <comment>QSystemSemaphore</comment> + <translation>%1: esgotou os recursos</translation> + </message> + <message> + <source>%1: unknown error %2</source> + <comment>QSystemSemaphore</comment> + <translation>%1: erro descoñecido %2</translation> + </message> + <message> + <source>%1: key is empty</source> + <comment>QSystemSemaphore</comment> + <translation>%1: a chave está baleira</translation> + </message> + <message> + <source>%1: unable to make key</source> + <comment>QSystemSemaphore</comment> + <translation>%1: non foi posíbel crear a chave</translation> + </message> + <message> + <source>%1: ftok failed</source> + <comment>QSystemSemaphore</comment> + <translation>%1: fallou ftok</translation> + </message> +</context> +<context> + <name>QSystemSemaphore</name> + <message> + <source>%1: permission denied</source> + <translation>%1: negouse o permiso</translation> + </message> + <message> + <source>%1: already exists</source> + <translation>%1: xa existe</translation> + </message> + <message> + <source>%1: does not exist</source> + <translation>%1: non existe</translation> + </message> + <message> + <source>%1: out of resources</source> + <translation>%1: esgotou os recursos</translation> + </message> + <message> + <source>%1: unknown error %2</source> + <translation>%1: erro descoñecido %2</translation> + </message> +</context> +<context> + <name>QDB2Driver</name> + <message> + <source>Unable to connect</source> + <translation>Non foi posíbel conectar</translation> + </message> + <message> + <source>Unable to commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Unable to rollback transaction</source> + <translation>Non foi posíbel anular a transacción</translation> + </message> + <message> + <source>Unable to set autocommit</source> + <translation>Non foi posíbel activar a entrega automática</translation> + </message> +</context> +<context> + <name>QDB2Result</name> + <message> + <source>Unable to execute statement</source> + <translation>Non foi posíbel executar a sentenza</translation> + </message> + <message> + <source>Unable to prepare statement</source> + <translation>Non foi posíbel preparar a sentenza</translation> + </message> + <message> + <source>Unable to bind variable</source> + <translation>Non foi posíbel asociar a variábel</translation> + </message> + <message> + <source>Unable to fetch record %1</source> + <translation>Non foi posíbel traer o rexistro %1</translation> + </message> + <message> + <source>Unable to fetch next</source> + <translation>Non foi posíbel acadar o seguinte</translation> + </message> + <message> + <source>Unable to fetch first</source> + <translation>Non foi posíbel acadar o primeiro</translation> + </message> +</context> +<context> + <name>QODBCResult</name> + <message> + <source>Unable to fetch last</source> + <translation>Non foi posíbel acadar o último</translation> + </message> + <message> + <source>QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration</source> + <translation>QODBCResult::reset: Non foi posíbel estabelecer «SQL_CURSOR_STATIC» como +atributo da sentenza. Verifique a configuración do controlador ODBC</translation> + </message> + <message> + <source>Unable to execute statement</source> + <translation>Non foi posíbel executar a sentenza</translation> + </message> + <message> + <source>Unable to fetch</source> + <translation>Non foi posíbel acadar</translation> + </message> + <message> + <source>Unable to fetch next</source> + <translation>Non foi posíbel acadar o seguinte</translation> + </message> + <message> + <source>Unable to fetch first</source> + <translation>Non foi posíbel acadar o primeiro</translation> + </message> + <message> + <source>Unable to fetch previous</source> + <translation>Non foi posíbel acadar o anterior</translation> + </message> + <message> + <source>Unable to prepare statement</source> + <translation>Non foi posíbel preparar a sentenza</translation> + </message> + <message> + <source>Unable to bind variable</source> + <translation>Non foi posíbel asociar a variábel</translation> + </message> +</context> +<context> + <name>QDateTimeEdit</name> + <message> + <source>AM</source> + <translation>AM</translation> + </message> + <message> + <source>am</source> + <translation>am</translation> + </message> + <message> + <source>PM</source> + <translation>PM</translation> + </message> + <message> + <source>pm</source> + <translation>pm</translation> + </message> +</context> +<context> + <name>QDeclarativeAbstractAnimation</name> + <message> + <source>Cannot animate non-existent property "%1"</source> + <translation>Non se pode animar a propriedade inexistente «%1»</translation> + </message> + <message> + <source>Cannot animate read-only property "%1"</source> + <translation>Non se pode animar a propriedade só para lectura «%1»</translation> + </message> + <message> + <source>Animation is an abstract class</source> + <translation>A animación é unha clase abstracta</translation> + </message> +</context> +<context> + <name>QDeclarativeAnchorAnimation</name> + <message> + <source>Cannot set a duration of < 0</source> + <translation>Non se pode indicar unha duración < 0</translation> + </message> +</context> +<context> + <name>QDeclarativeParentAnimation</name> + <message> + <source>Unable to preserve appearance under complex transform</source> + <translation>Non é posíbel conservar a aparencia con transformación complexa</translation> + </message> + <message> + <source>Unable to preserve appearance under non-uniform scale</source> + <translation>Non é posíbel conservar a aparencia con escalado non uniforme</translation> + </message> + <message> + <source>Unable to preserve appearance under scale of 0</source> + <translation>Non é posíbel conservar a aparencia con escala de 0</translation> + </message> +</context> +<context> + <name>QDeclarativePauseAnimation</name> + <message> + <source>Cannot set a duration of < 0</source> + <translation>Non se pode indicar unha duración < 0</translation> + </message> +</context> +<context> + <name>QDeclarativePropertyAnimation</name> + <message> + <source>Cannot set a duration of < 0</source> + <translation>Non se pode indicar unha duración < 0</translation> + </message> +</context> +<context> + <name>QDeclarativeXmlListModel</name> + <message> + <source>Qt was built without support for xmlpatterns</source> + <translation>Qt construíuse sen soporte para xmlpatterns</translation> + </message> +</context> +<context> + <name>QDeclarativeAnchors</name> + <message> + <source>Possible anchor loop detected on fill.</source> + <translation>Detectouse un posíbel ciclo de enganche no recheo.</translation> + </message> + <message> + <source>Possible anchor loop detected on centerIn.</source> + <translation>Detectouse un posíbel ciclo de enganche en centerIn.</translation> + </message> + <message> + <source>Cannot anchor to an item that isn't a parent or sibling.</source> + <translation>Non se pode enganchar a un elemento que non é pai nin irmao.</translation> + </message> + <message> + <source>Possible anchor loop detected on vertical anchor.</source> + <translation>Detectouse un posíbel ciclo de enganche no enganche vertical.</translation> + </message> + <message> + <source>Possible anchor loop detected on horizontal anchor.</source> + <translation>Detectouse un posíbel ciclo de enganche no enganche horizontal.</translation> + </message> + <message> + <source>Cannot specify left, right, and hcenter anchors.</source> + <translation>Non se poden especificar os enganches esquerdo, dereito e hcenter.</translation> + </message> + <message> + <source>Cannot anchor to a null item.</source> + <translation>Non se pode enganchar a un elemento nulo.</translation> + </message> + <message> + <source>Cannot anchor a horizontal edge to a vertical edge.</source> + <translation>Non se pode enganchar un contorno horizontal a un vertical.</translation> + </message> + <message> + <source>Cannot anchor item to self.</source> + <translation>Non se pode enganchar o elemento consigo mesmo.</translation> + </message> + <message> + <source>Cannot specify top, bottom, and vcenter anchors.</source> + <translation>Non se poden especificar os enganches superior, inferior e vcenter.</translation> + </message> + <message> + <source>Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.</source> + <translation>O enganche de liña de base non se pode empregar xunto cos enganches +superior, inferior nin vcenter.</translation> + </message> + <message> + <source>Cannot anchor a vertical edge to a horizontal edge.</source> + <translation>Non se pode enganchar un contorno vertical a un horizontal.</translation> + </message> +</context> +<context> + <name>QDeclarativeAnimatedImage</name> + <message> + <source>Qt was built without support for QMovie</source> + <translation>Qt construíuse sen soporte para QMovie</translation> + </message> +</context> +<context> + <name>QDeclarativeKeyNavigationAttached</name> + <message> + <source>KeyNavigation is only available via attached properties</source> + <translation>KeyNavigation só está dispoñíbel mediante as propriedades anexadas</translation> + </message> +</context> +<context> + <name>QDeclarativeKeysAttached</name> + <message> + <source>Keys is only available via attached properties</source> + <translation>Keys só está dispoñíbel mediante as propriedades anexadas</translation> + </message> +</context> +<context> + <name>QDeclarativeBehavior</name> + <message> + <source>Cannot change the animation assigned to a Behavior.</source> + <translation>Non se pode mudar a animación asignada a un Behavior.</translation> + </message> +</context> +<context> + <name>QDeclarativeBinding</name> + <message> + <source>Binding loop detected for property "%1"</source> + <translation>Detectouse un ciclo de unión para a propriedade «%1»</translation> + </message> +</context> +<context> + <name>QDeclarativeCompiledBindings</name> + <message> + <source>Binding loop detected for property "%1"</source> + <translation>Detectouse un ciclo de unión para a propriedade «%1»</translation> + </message> +</context> +<context> + <name>QDeclarativeCompiler</name> + <message> + <source>Invalid property assignment: "%1" is a read-only property</source> + <translation>Asignación de propriedade non válida: «%1» é unha propriedade só para lectura</translation> + </message> + <message> + <source>Invalid property assignment: unknown enumeration</source> + <translation>Asignación de propriedade non válida: enumeración descoñecida</translation> + </message> + <message> + <source>Invalid property assignment: string expected</source> + <translation>Asignación de propriedade non válida: agardábase unha cadea</translation> + </message> + <message> + <source>Invalid property assignment: url expected</source> + <translation>Asignación de propriedade non válida: agardábase un URL</translation> + </message> + <message> + <source>Invalid property assignment: unsigned int expected</source> + <translation>Asignación de propriedade non válida: agardábase un unsigned int</translation> + </message> + <message> + <source>Invalid property assignment: int expected</source> + <translation>Asignación de propriedade non válida: agardábase un int</translation> + </message> + <message> + <source>Invalid property assignment: number expected</source> + <translation>Asignación de propriedade non válida: agardábase un número</translation> + </message> + <message> + <source>Invalid property assignment: color expected</source> + <translation>Asignación de propriedade non válida: agardábase unha cor</translation> + </message> + <message> + <source>Invalid property assignment: date expected</source> + <translation>Asignación de propriedade non válida: agardábase unha date</translation> + </message> + <message> + <source>Invalid property assignment: time expected</source> + <translation>Asignación de propriedade non válida: agardábase un time</translation> + </message> + <message> + <source>Invalid property assignment: datetime expected</source> + <translation>Asignación de propriedade non válida: agardábase un datetime</translation> + </message> + <message> + <source>Invalid property assignment: point expected</source> + <translation>Asignación de propriedade non válida: agardábase un punto</translation> + </message> + <message> + <source>Invalid property assignment: size expected</source> + <translation>Asignación de propriedade non válida: agardábase un tamaño</translation> + </message> + <message> + <source>Invalid property assignment: rect expected</source> + <translation>Asignación de propriedade non válida: agardábase un rect</translation> + </message> + <message> + <source>Invalid property assignment: boolean expected</source> + <translation>Asignación de propriedade non válida: agardábase un booleano</translation> + </message> + <message> + <source>Invalid property assignment: 3D vector expected</source> + <translation>Asignación de propriedade non válida: agardábase un vector 3D</translation> + </message> + <message> + <source>Invalid property assignment: unsupported type "%1"</source> + <translation>Asignación de propriedade non válida: tipo non soportado «%1»</translation> + </message> + <message> + <source>Element is not creatable.</source> + <translation>O elemento non é creábel.</translation> + </message> + <message> + <source>Component elements may not contain properties other than id</source> + <translation>Os elementos compoñentes non poden conter máis propriedades que o id</translation> + </message> + <message> + <source>Invalid component id specification</source> + <translation>Especificación non válida do id dun compoñente</translation> + </message> + <message> + <source>id is not unique</source> + <translation>O id non é único</translation> + </message> + <message> + <source>Invalid component body specification</source> + <translation>Especificación non válida do corpo dun compoñente</translation> + </message> + <message> + <source>Component objects cannot declare new properties.</source> + <translation>Os obxectos compoñentes non poden declarar novas propriedades.</translation> + </message> + <message> + <source>Component objects cannot declare new signals.</source> + <translation>Os obxectos compoñentes non poden declarar novas sinais.</translation> + </message> + <message> + <source>Component objects cannot declare new functions.</source> + <translation>Os obxectos compoñentes non poden declarar novas funcións.</translation> + </message> + <message> + <source>Cannot create empty component specification</source> + <translation>Non se pode crear unha especificación de compoñente baleira</translation> + </message> + <message> + <source>Incorrectly specified signal assignment</source> + <translation>Especificouse incorrectamente a asignación de sinal</translation> + </message> + <message> + <source>Cannot assign a value to a signal (expecting a script to be run)</source> + <translation>Non foi posíbel asignar un valor a un sinal (agardábase que se executase un script)</translation> + </message> + <message> + <source>Empty signal assignment</source> + <translation>Asignación baleira de sinal</translation> + </message> + <message> + <source>Empty property assignment</source> + <translation>Asignación baleira de propriedade</translation> + </message> + <message> + <source>Attached properties cannot be used here</source> + <translation>As propriedades anexas non se poden empregar aquí</translation> + </message> + <message> + <source>Non-existent attached object</source> + <translation>Anexáronse propriedades inexistentes</translation> + </message> + <message> + <source>Invalid attached object assignment</source> + <translation>Asignación de obxecto anexo non válido</translation> + </message> + <message> + <source>Cannot assign to non-existent default property</source> + <translation>Non se pode asignar a unha propriedade predeterminada inexistente</translation> + </message> + <message> + <source>Cannot assign to non-existent property "%1"</source> + <translation>Non se pode asignar a unha propriedade inexistente «%1»</translation> + </message> + <message> + <source>Invalid use of namespace</source> + <translation>Uso non válido do espazo de nomes</translation> + </message> + <message> + <source>Not an attached property name</source> + <translation>Non é un nome de propriedade anexa</translation> + </message> + <message> + <source>Invalid use of id property</source> + <translation>Uso non válido da propriedade id</translation> + </message> + <message> + <source>Property has already been assigned a value</source> + <translation>Xa se lle asignou un valor a esta propriedade</translation> + </message> + <message> + <source>Invalid grouped property access</source> + <translation>Acceso non válido a unha propriedade agrupada</translation> + </message> + <message> + <source>Cannot assign a value directly to a grouped property</source> + <translation>Non se pode asignar directamente un valor a unha propriedade agrupada</translation> + </message> + <message> + <source>Invalid property use</source> + <translation>Uso non válido da propriedade</translation> + </message> + <message> + <source>Property assignment expected</source> + <translation>Agardábase unha asignación de propriedade</translation> + </message> + <message> + <source>Single property assignment expected</source> + <translation>Agardábase unha única asignación a propriedade</translation> + </message> + <message> + <source>Unexpected object assignment</source> + <translation>Asignación de obxecto inesperada</translation> + </message> + <message> + <source>Cannot assign object to list</source> + <translation>Non se pode asignar un obxecto a unha lista</translation> + </message> + <message> + <source>Can only assign one binding to lists</source> + <translation>Só se pode asignar unha combinación ás listas</translation> + </message> + <message> + <source>Cannot assign primitives to lists</source> + <translation>Non se poden asignar primitivas ás listas</translation> + </message> + <message> + <source>Cannot assign multiple values to a script property</source> + <translation>Non se poden asignar varios valores a unha propriedade de script</translation> + </message> + <message> + <source>Invalid property assignment: script expected</source> + <translation>Asignación de propriedade non válida: agardábase un script</translation> + </message> + <message> + <source>Cannot assign object to property</source> + <translation>Non se pode asignar un obxecto a unha propriedade</translation> + </message> + <message> + <source>"%1" cannot operate on "%2"</source> + <translation>«%1» non pode operar en «%2»</translation> + </message> + <message> + <source>Duplicate default property</source> + <translation>Propriedade predeterminada duplicada</translation> + </message> + <message> + <source>Duplicate property name</source> + <translation>Nome de propriedade duplicado</translation> + </message> + <message> + <source>Property names cannot begin with an upper case letter</source> + <translation>Os nomes das propriedades non poden comezar por maiúscula</translation> + </message> + <message> + <source>Illegal property name</source> + <translation>Nome ilegal de propriedade</translation> + </message> + <message> + <source>Duplicate signal name</source> + <translation>Nome de sinal duplicado</translation> + </message> + <message> + <source>Signal names cannot begin with an upper case letter</source> + <translation>Os nomes de sinal non poden comezar por maiúscula</translation> + </message> + <message> + <source>Illegal signal name</source> + <translation>Nome ilegal de sinal</translation> + </message> + <message> + <source>Duplicate method name</source> + <translation>Nome de método duplicado</translation> + </message> + <message> + <source>Method names cannot begin with an upper case letter</source> + <translation>Os nomes de método non poden comezar por maiúscula</translation> + </message> + <message> + <source>Illegal method name</source> + <translation>Nome ilegal de método</translation> + </message> + <message> + <source>Property value set multiple times</source> + <translation>O valor dunha propriedade indicouse varias veces</translation> + </message> + <message> + <source>Invalid property nesting</source> + <translation>Aniñamento non válido de propriedade</translation> + </message> + <message> + <source>Cannot override FINAL property</source> + <translation>Non se pode sobrescribir a propriedade FINAL</translation> + </message> + <message> + <source>Invalid property type</source> + <translation>Tipo de propriedade non válido</translation> + </message> + <message> + <source>Invalid empty ID</source> + <translation>ID baleiro non válido</translation> + </message> + <message> + <source>IDs cannot start with an uppercase letter</source> + <translation>Os ID non poden iniciar por unha maiúscula</translation> + </message> + <message> + <source>IDs must start with a letter or underscore</source> + <translation>Os ID deben comezar por unha letra ou por un guión baixo</translation> + </message> + <message> + <source>IDs must contain only letters, numbers, and underscores</source> + <translation>Os ID só deben conter letras, números e guións baixos</translation> + </message> + <message> + <source>ID illegally masks global JavaScript property</source> + <translation>O ID enmascara ilegalmente unha propriedade JavaScript global</translation> + </message> + <message> + <source>No property alias location</source> + <translation>Falta a localización dun alcume dunha propriedade</translation> + </message> + <message> + <source>Invalid alias location</source> + <translation>Localización non válida dun alcume</translation> + </message> + <message> + <source>Invalid alias reference. An alias reference must be specified as <id> or <id>.<property></source> + <translation>Referencianon válida a un alcume. Unha referencia a un alcume debe indicarse como <id> ou como <id>.<propriedade></translation> + </message> + <message> + <source>Invalid alias reference. Unable to find id "%1"</source> + <translation>Referencia non válida a un alcume. Non foi posíbel achar o id «%1»</translation> + </message> +</context> +<context> + <name>QDeclarativeComponent</name> + <message> + <source>Invalid empty URL</source> + <translation>URL baleiro non válido</translation> + </message> +</context> +<context> + <name>QDeclarativeCompositeTypeManager</name> + <message> + <source>Resource %1 unavailable</source> + <translation>O recurso %1 non está dispoñíbel</translation> + </message> + <message> + <source>Namespace %1 cannot be used as a type</source> + <translation>O espazo de nomes %1 non se pode empregar como un tipo</translation> + </message> + <message> + <source>%1 %2</source> + <translation>%1 %2</translation> + </message> + <message> + <source>Type %1 unavailable</source> + <translation>O tipo %1 non está dispoñíbel</translation> + </message> +</context> +<context> + <name>QDeclarativeConnections</name> + <message> + <source>Cannot assign to non-existent property "%1"</source> + <translation>Non é posíbel asignar a unha propriedade non existente «%1»</translation> + </message> + <message> + <source>Connections: nested objects not allowed</source> + <translation>Conexións: non se permiten obxectos aniñados</translation> + </message> + <message> + <source>Connections: syntax error</source> + <translation>Conexións: erro de sintaxe</translation> + </message> + <message> + <source>Connections: script expected</source> + <translation>Conexións: agardábase un script</translation> + </message> +</context> +<context> + <name>QDeclarativeEngine</name> + <message> + <source>executeSql called outside transaction()</source> + <translation>chamouse a executeSql fora dunha transaction()</translation> + </message> + <message> + <source>Read-only Transaction</source> + <translation>Transacción só para lectura</translation> + </message> + <message> + <source>Version mismatch: expected %1, found %2</source> + <translation>Non se corresponden as versións: agardábase a %1 pero achouse a %2</translation> + </message> + <message> + <source>SQL transaction failed</source> + <translation>Fallou a transacción SQL</translation> + </message> + <message> + <source>transaction: missing callback</source> + <translation>transacción: falta a chamada de retorno</translation> + </message> + <message> + <source>SQL: database version mismatch</source> + <translation>SQL: a versión da base de datos non se corresponde</translation> + </message> +</context> +<context> + <name>QDeclarativeFlipable</name> + <message> + <source>front is a write-once property</source> + <translation>front é unha propriedade só para escrita</translation> + </message> + <message> + <source>back is a write-once property</source> + <translation>bach é unha propriedade só para escrita</translation> + </message> +</context> +<context> + <name>QDeclarativeImportDatabase</name> + <message> + <source>module "%1" definition "%2" not readable</source> + <translation>a definición «%2» no módulo «%1» non é lexíbel</translation> + </message> + <message> + <source>plugin cannot be loaded for module "%1": %2</source> + <translation>non foi posíbel cargar a extensión para o módulo «%1»: %2</translation> + </message> + <message> + <source>module "%1" plugin "%2" not found</source> + <translation>non se atopou a extensión «%2» do módulo «%1»</translation> + </message> + <message> + <source>module "%1" version %2.%3 is not installed</source> + <translation>a versión %2.%3 do módulo «%1» non está instalada</translation> + </message> + <message> + <source>module "%1" is not installed</source> + <translation>o módulo «%1» non está instalado</translation> + </message> + <message> + <source>"%1": no such directory</source> + <translation>«%1»: non hai tal directorio</translation> + </message> + <message> + <source>import "%1" has no qmldir and no namespace</source> + <translation>import "%1" non ten qmldir nin espazo de nomes</translation> + </message> + <message> + <source>- %1 is not a namespace</source> + <translation>: %1 non é un espazo de nomes</translation> + </message> + <message> + <source>- nested namespaces not allowed</source> + <translation>: non se permiten os espazos de nomes aniñados</translation> + </message> + <message> + <source>local directory</source> + <translation>directorio local</translation> + </message> + <message> + <source>is ambiguous. Found in %1 and in %2</source> + <translation>é ambíguo. Atopouse en %1 e en %2</translation> + </message> + <message> + <source>is ambiguous. Found in %1 in version %2.%3 and %4.%5</source> + <translation>é ambiguo. Atopouse en %1 nas versións %2.%3 e %4.%5</translation> + </message> + <message> + <source>is instantiated recursively</source> + <translation>é instanciada de xeito recursivo</translation> + </message> + <message> + <source>is not a type</source> + <translation>non é un tipo</translation> + </message> +</context> +<context> + <name>QDeclarativeListModel</name> + <message> + <source>remove: index %1 out of range</source> + <translation>eliminar: o índice %1 está fora do intervalo</translation> + </message> + <message> + <source>insert: value is not an object</source> + <translation>inserir: o valor non é un obxecto</translation> + </message> + <message> + <source>insert: index %1 out of range</source> + <translation>inserir: o índice %1 está fora do intervalo</translation> + </message> + <message> + <source>move: out of range</source> + <translation>mover: fora do intervalo</translation> + </message> + <message> + <source>append: value is not an object</source> + <translation>engadir: o valor non é un obxecto</translation> + </message> + <message> + <source>set: value is not an object</source> + <translation>definir: o valor non é un obxecto</translation> + </message> + <message> + <source>set: index %1 out of range</source> + <translation>definir: o índice %1 está fora do intervalo</translation> + </message> + <message> + <source>ListElement: cannot contain nested elements</source> + <translation>Elemento de lista: non pode conter elementos aniñados</translation> + </message> + <message> + <source>ListElement: cannot use reserved "id" property</source> + <translation>Elemento de lista: non pode empregar a propriedade «id» porque está reservada</translation> + </message> + <message> + <source>ListElement: cannot use script for property value</source> + <translation>Elemento de lista: non pode empregar script como valor de propriedade</translation> + </message> + <message> + <source>ListModel: undefined property '%1'</source> + <translation>Modelo de lista: a propriedade «%1» non está definida</translation> + </message> +</context> +<context> + <name>QDeclarativeLoader</name> + <message> + <source>Loader does not support loading non-visual elements.</source> + <translation>O cargador non permite cargar elementos non visuais.</translation> + </message> +</context> +<context> + <name>QDeclarativeParentChange</name> + <message> + <source>Unable to preserve appearance under complex transform</source> + <translation>Non é posíbel conservar a aparencia con transformación complexa</translation> + </message> + <message> + <source>Unable to preserve appearance under non-uniform scale</source> + <translation>Non é posíbel conservar a aparencia con escalado non uniforme</translation> + </message> + <message> + <source>Unable to preserve appearance under scale of 0</source> + <translation>Non é posíbel conservar a aparencia con escala de 0</translation> + </message> +</context> +<context> + <name>QDeclarativeParser</name> + <message> + <source>Illegal unicode escape sequence</source> + <translation>Secuencia de escape unicode ilegal</translation> + </message> + <message> + <source>Illegal character</source> + <translation>Caracter ilegal</translation> + </message> + <message> + <source>Unclosed string at end of line</source> + <translation>Cadea non pechada no fin dunha liña</translation> + </message> + <message> + <source>Illegal escape squence</source> + <translation>Secuencia de escape ilegal</translation> + </message> + <message> + <source>Unclosed comment at end of file</source> + <translation>Comentario non pechado ao final dunha liña</translation> + </message> + <message> + <source>Illegal syntax for exponential number</source> + <translation>Sintaxe ilegal para un número exponencial</translation> + </message> + <message> + <source>Identifier cannot start with numeric literal</source> + <translation>O identificador non pode comezar por un literal numérico</translation> + </message> + <message> + <source>Unterminated regular expression literal</source> + <translation>Literal de expresión regular non terminado</translation> + </message> + <message> + <source>Invalid regular expression flag '%0'</source> + <translation>Indicador de expresión regular «%0 »non válido</translation> + </message> + <message> + <source>Unterminated regular expression backslash sequence</source> + <translation>Secuencia de expresión regular non terminda con contrabarra</translation> + </message> + <message> + <source>Unterminated regular expression class</source> + <translation>Clase de expresión regular non terminada</translation> + </message> + <message> + <source>Syntax error</source> + <translation>Erro de sintaxe</translation> + </message> + <message> + <source>Unexpected token `%1'</source> + <translation>Token «%1» non agardado.</translation> + </message> + <message> + <source>Expected token `%1'</source> + <translation>Agardábase o token «%1»</translation> + </message> + <message> + <source>Property value set multiple times</source> + <translation>O valor da propriedade estabeleceuse varias veces</translation> + </message> + <message> + <source>Expected type name</source> + <translation>Agardábase o nome dun tipo</translation> + </message> + <message> + <source>Invalid import qualifier ID</source> + <translation>ID do calificador de importación non válido</translation> + </message> + <message> + <source>Reserved name "Qt" cannot be used as an qualifier</source> + <translation>O nome reservado «Qt» non se pode empregar como calificador</translation> + </message> + <message> + <source>Script import qualifiers must be unique.</source> + <translation>Os calificadores de importación de script deben ser únicos.</translation> + </message> + <message> + <source>Script import requires a qualifier</source> + <translation>A importación de script require dun calificador</translation> + </message> + <message> + <source>Library import requires a version</source> + <translation>A importación de bibliotecas require dunha versión</translation> + </message> + <message> + <source>Expected parameter type</source> + <translation>Agardábase un tipo de parámetro</translation> + </message> + <message> + <source>Invalid property type modifier</source> + <translation>Modificador de tipo da propriedade non válido</translation> + </message> + <message> + <source>Unexpected property type modifier</source> + <translation>Modificador do tipo da propriedade non agardado</translation> + </message> + <message> + <source>Expected property type</source> + <translation>Agardábase o tipo dunha propriedade</translation> + </message> + <message> + <source>Readonly not yet supported</source> + <translation>Aínda non se soporta o só para leitura</translation> + </message> + <message> + <source>JavaScript declaration outside Script element</source> + <translation>Declaración de JavaScript fora dun elemento Script</translation> + </message> +</context> +<context> + <name>QDeclarativePixmap</name> + <message> + <source>Error decoding: %1: %2</source> + <translation>Aconteceu un erro ao descodificar: %1: %2</translation> + </message> + <message> + <source>Failed to get image from provider: %1</source> + <translation>Fallou a obtención da imaxe do provedor: %1</translation> + </message> + <message> + <source>Cannot open: %1</source> + <translation>Non foi posíbel abrir %1</translation> + </message> +</context> +<context> + <name>QDeclarativePropertyChanges</name> + <message> + <source>PropertyChanges does not support creating state-specific objects.</source> + <translation>PropertyChanges non soporta crear obxectos específicos dun estado.</translation> + </message> + <message> + <source>Cannot assign to non-existent property "%1"</source> + <translation>Non é posíbel asignar á propriedade inexistente «%1»</translation> + </message> + <message> + <source>Cannot assign to read-only property "%1"</source> + <translation>Non é posíbel asignar a unha propriedade só para lectura «%1»</translation> + </message> +</context> +<context> + <name>QDeclarativeTextInput</name> + <message> + <source>Could not load cursor delegate</source> + <translation>Non foi posíbel cargar o delegado do cursor</translation> + </message> + <message> + <source>Could not instantiate cursor delegate</source> + <translation>Non foi posíbel instanciar o delegado do cursor</translation> + </message> +</context> +<context> + <name>QDeclarativeVME</name> + <message> + <source>Unable to create object of type %1</source> + <translation>Non foi posíbel crear un obxecto do tipo %1</translation> + </message> + <message> + <source>Cannot assign value %1 to property %2</source> + <translation>Non é posíbel asignar o valor %1 á propriedade %2</translation> + </message> + <message> + <source>Cannot assign object type %1 with no default method</source> + <translation>Non é posíbel asignar un obxecto do tipo %1 sen método predeterminado</translation> + </message> + <message> + <source>Cannot connect mismatched signal/slot %1 %vs. %2</source> + <translation>Non é posíbel conectar o sinal/slot non coincidente %1 %vs. %2</translation> + </message> + <message> + <source>Cannot assign an object to signal property %1</source> + <translation>Non é posíbel asignar un obxecto á propriedade de sinal %1</translation> + </message> + <message> + <source>Cannot assign object to list</source> + <translation>Non é posíbel asignar un obxecto a unha listaxe</translation> + </message> + <message> + <source>Cannot assign object to interface property</source> + <translation>Non é posíbel asignar un obxecto a unha propriedade dunha interface</translation> + </message> + <message> + <source>Unable to create attached object</source> + <translation>Non foi posíbel crear o obxecto anexo</translation> + </message> + <message> + <source>Cannot set properties on %1 as it is null</source> + <translation>Non se poden definir propriedades de %1 porque é nulo</translation> + </message> +</context> +<context> + <name>QDeclarativeVisualDataModel</name> + <message> + <source>Delegate component must be Item type.</source> + <translation>O componente delegado debe ser do tipo Item.</translation> + </message> +</context> +<context> + <name>QDeclarativeXmlListModelRole</name> + <message> + <source>An XmlRole query must not start with '/'</source> + <translation>Unha pescuda XmlRole non pode comezar por «/»</translation> + </message> +</context> +<context> + <name>QDeclarativeXmlRoleList</name> + <message> + <source>An XmlListModel query must start with '/' or "//"</source> + <translation>Unha pescuda XmlListModel non pode comezar por «/» nin por «//»</translation> + </message> +</context> +<context> + <name>QObject</name> + <message> + <source>"%1" duplicates a previous role name and will be disabled.</source> + <translation>«%1» duplica un nome de rol anterior e desactivarase.</translation> + </message> + <message> + <source>invalid query: "%1"</source> + <translation>pescuda non válida: «%1»</translation> + </message> + <message> + <source>PulseAudio Sound Server</source> + <translation>Servidor de son PulseAudio</translation> + </message> +</context> +<context> + <name>QDial</name> + <message> + <source>QDial</source> + <translation>QDial</translation> + </message> + <message> + <source>SpeedoMeter</source> + <translation>Velocímetro</translation> + </message> + <message> + <source>SliderHandle</source> + <translation>Asa da barra deslizante</translation> + </message> +</context> +<context> + <name>QDoubleSpinBox</name> + <message> + <source>More</source> + <translation>Máis</translation> + </message> + <message> + <source>Less</source> + <translation>Menos</translation> + </message> +</context> +<context> + <name>QScrollBar</name> + <message> + <source>Line up</source> + <translation>Aliñar en riba</translation> + </message> + <message> + <source>Position</source> + <translation>Posición</translation> + </message> + <message> + <source>Line down</source> + <translation>Aliñar en baixo</translation> + </message> + <message> + <source>Scroll here</source> + <translation>Desprazar cara aquí</translation> + </message> + <message> + <source>Left edge</source> + <translation>Borde esquerdo</translation> + </message> + <message> + <source>Top</source> + <translation>Cume</translation> + </message> + <message> + <source>Right edge</source> + <translation>Borde dereito</translation> + </message> + <message> + <source>Bottom</source> + <translation>Fondo</translation> + </message> + <message> + <source>Page left</source> + <translation>Páxina á esquerda</translation> + </message> + <message> + <source>Page up</source> + <translation>Páxina en riba</translation> + </message> + <message> + <source>Page right</source> + <translation>Páxina á dereita</translation> + </message> + <message> + <source>Page down</source> + <translation>Páxina en baixo</translation> + </message> + <message> + <source>Scroll left</source> + <translation>Desprazar cara á esquerda</translation> + </message> + <message> + <source>Scroll up</source> + <translation>Desprazar cara arriba</translation> + </message> + <message> + <source>Scroll right</source> + <translation>Desprazar cara á dereita</translation> + </message> + <message> + <source>Scroll down</source> + <translation>Desprazar cara abaixo</translation> + </message> +</context> +<context> + <name>QSlider</name> + <message> + <source>Page left</source> + <translation>Páxina á esquerda</translation> + </message> + <message> + <source>Page up</source> + <translation>Páxina en riba</translation> + </message> + <message> + <source>Position</source> + <translation>Posición</translation> + </message> + <message> + <source>Page right</source> + <translation>Páxina á dereita</translation> + </message> + <message> + <source>Page down</source> + <translation>Páxina en baixo</translation> + </message> +</context> +<context> + <name>QSpinBox</name> + <message> + <source>More</source> + <translation>Máis</translation> + </message> + <message> + <source>Less</source> + <translation>Menos</translation> + </message> +</context> +<context> + <name>QDialog</name> + <message> + <source>Done</source> + <translation>Feito</translation> + </message> + <message> + <source>What's This?</source> + <translation>Que é isto?</translation> + </message> +</context> +<context> + <name>QDialogButtonBox</name> + <message> + <source>OK</source> + <translation>Aceptar</translation> + </message> + <message> + <source>&OK</source> + <translation>&Aceptar</translation> + </message> + <message> + <source>&Save</source> + <translation>&Gardar</translation> + </message> + <message> + <source>Save</source> + <translation>Gardar</translation> + </message> + <message> + <source>Open</source> + <translation>Abrir</translation> + </message> + <message> + <source>&Cancel</source> + <translation>&Cancelar</translation> + </message> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <source>&Close</source> + <translation>&Pechar</translation> + </message> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Apply</source> + <translation>Aplicar</translation> + </message> + <message> + <source>Reset</source> + <translation>Reiniciar</translation> + </message> + <message> + <source>Help</source> + <translation>Axuda</translation> + </message> + <message> + <source>Don't Save</source> + <translation>Non gardar</translation> + </message> + <message> + <source>Close without Saving</source> + <translation>Pechar sen gardar</translation> + </message> + <message> + <source>Discard</source> + <translation>Descartar</translation> + </message> + <message> + <source>&Yes</source> + <translation>&Si</translation> + </message> + <message> + <source>Yes to &All</source> + <translation>Si a &todo</translation> + </message> + <message> + <source>&No</source> + <translation>&Non</translation> + </message> + <message> + <source>N&o to All</source> + <translation>Non a to&do</translation> + </message> + <message> + <source>Save All</source> + <translation>Gardar todo</translation> + </message> + <message> + <source>Abort</source> + <translation>Abortar</translation> + </message> + <message> + <source>Retry</source> + <translation>Tentar de novo</translation> + </message> + <message> + <source>Ignore</source> + <translation>Ignorar</translation> + </message> + <message> + <source>Restore Defaults</source> + <translation>Repor as predefinicións</translation> + </message> +</context> +<context> + <name>QMessageBox</name> + <message> + <source>Show Details...</source> + <translation>Mostrar os detalles...</translation> + </message> + <message> + <source>Hide Details...</source> + <translation>Agochar os detalles...</translation> + </message> + <message> + <source>OK</source> + <translation>Aceptar</translation> + </message> + <message> + <source>Help</source> + <translation>Axuda</translation> + </message> + <message> + <source><h3>About Qt</h3><p>This program uses Qt version %1.</p></source> + <translation><h3>Acerca de Qt</h3><p>Este programa emprega a versión %1 de Qt.</p></translation> + </message> + <message> + <source><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p></source> + <translation><p>Qt é un toolkit de C++ para o desenvolvemento de programas multiplataforma.</p> <p>Qt fornece portabilidade entre MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux e as principais variantes comerciais de Unix cun único código fonte. Qt tamén está dispoñíbel para dispositivos incrustados como Qt para Embedded Linux e Qt para Windows CE.</p> +<p>Qt está dispoñíbel en tres opcións de licenzas diferentes deseñadas para adaptarse ás necesidades dos diferentes usuarios.</p> +</p>Qt distribuída sob o acordo de licenza comercial é adecuado para o desenvolvemento de software proprietario +ou comercial onde non é preciso compartir ningún código fonte con terceiras partes ou que non poden cumprir os termos das licenzas GNU LGPL versión 2.1 nin da versión 3.0.</p> +<p>Qt sob a licenza GNU General Public License versión 2.1 é apropriada para o desenvolvemento de programas Qt (proprietario ou de fontes abertas) supoñendo que poda cumprir cos termos e condicións da licenza GNU GPL versión 2.1.</p> +<p>Qt sob a licenza GNU General Public License versión 3.0 é apropriada para o desenvolvemento de programas Qt onde desexe empregar tales programas en combinación con software suxeito aos termos da GNU GPL versión 3.0 ou onde desexe cumprir cos termos da GNU GPL versión 3.0.</p> +<p>Consulte <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> para ler un resumo das licenzas de Qt.</p> +<p>Copyright (C) 2010 Nokia Corporation ou as súas subsidiarias.</p> +<p>Qt é un produto de Nokia. Consulte <a href="http://qt.nokia.com/">qt.nokia.com</a> para máis información.</p></translation> + </message> + <message> + <source>About Qt</source> + <translation>Acerca de Qt</translation> + </message> +</context> +<context> + <name>QDirModel</name> + <message> + <source>Name</source> + <translation>Nome</translation> + </message> + <message> + <source>Size</source> + <translation>Tamaño</translation> + </message> + <message> + <source>Kind</source> + <comment>Match OS X Finder</comment> + <translation>Tipo</translation> + </message> + <message> + <source>Type</source> + <comment>All other platforms</comment> + <translation>Tipo</translation> + </message> + <message> + <source>Date Modified</source> + <translation>Data de modificación</translation> + </message> +</context> +<context> + <name>QFileDialog</name> + <message> + <source>My Computer</source> + <translation>O meu ordenador</translation> + </message> + <message> + <source>Look in:</source> + <translation>Procurar en:</translation> + </message> + <message> + <source>Back</source> + <translation>Atrás</translation> + </message> + <message> + <source>Go back</source> + <translation>Recuar</translation> + </message> + <message> + <source>Forward</source> + <translation>Adiante</translation> + </message> + <message> + <source>Go forward</source> + <translation>Avanzar</translation> + </message> + <message> + <source>Parent Directory</source> + <translation>Cartafol superior</translation> + </message> + <message> + <source>Go to the parent directory</source> + <translation>Ir ao directorio superior</translation> + </message> + <message> + <source>Create New Folder</source> + <translation>Crear un cartafol novo</translation> + </message> + <message> + <source>Create a New Folder</source> + <translation>Crea un cartafol novo</translation> + </message> + <message> + <source>List View</source> + <translation>Vista de lista</translation> + </message> + <message> + <source>Change to list view mode</source> + <translation>Troca para o modo de vista en lista</translation> + </message> + <message> + <source>Detail View</source> + <translation>Vista de detalles</translation> + </message> + <message> + <source>Change to detail view mode</source> + <translation>Troca para o modo de vista de detalles</translation> + </message> + <message> + <source>Files of type:</source> + <translation>Ficheiros do tipo:</translation> + </message> + <message> + <source>Find Directory</source> + <translation>Procurar un cartafol</translation> + </message> + <message> + <source>Open</source> + <translation>Abrir</translation> + </message> + <message> + <source>Save As</source> + <translation>Gardar como</translation> + </message> + <message> + <source>All Files (*)</source> + <translation>Todos os ficheiros (*)</translation> + </message> + <message> + <source>Show </source> + <translation>Mostrar</translation> + </message> + <message> + <source>&Rename</source> + <translation>&Mudar o nome</translation> + </message> + <message> + <source>&Delete</source> + <translation>&Borrar</translation> + </message> + <message> + <source>Show &hidden files</source> + <translation>Mostrar os ficheiros &acochados</translation> + </message> + <message> + <source>&New Folder</source> + <translation>&Novo cartafol</translation> + </message> + <message> + <source>Directory:</source> + <translation>Cartafol:</translation> + </message> + <message> + <source>File &name:</source> + <translation>&Nome do ficheiro:</translation> + </message> + <message> + <source>&Open</source> + <translation>&Abrir</translation> + </message> + <message> + <source>&Save</source> + <translation>&Gardar</translation> + </message> + <message> + <source>Directories</source> + <translation>Cartafoles</translation> + </message> + <message> + <source>&Choose</source> + <translation>&Escoller</translation> + </message> + <message> + <source>%1 +Directory not found. +Please verify the correct directory name was given.</source> + <translation>%1 +Non se achou o cartafol. +Verifique que se indicase o nome correcto.</translation> + </message> + <message> + <source>%1 already exists. +Do you want to replace it?</source> + <translation>Xa existe %1. +Desexa substituílo?</translation> + </message> + <message> + <source>%1 +File not found. +Please verify the correct file name was given.</source> + <translation>%1 +Non se atopou o ficheiro. +Verifique que se indicase o nome de ficheiro correcto.</translation> + </message> + <message> + <source>New Folder</source> + <translation>Novo cartafol</translation> + </message> + <message> + <source>'%1' is write protected. +Do you want to delete it anyway?</source> + <translation>«%1» está protexido contra escrita. +Desexa aínda así borralo?</translation> + </message> + <message> + <source>Are sure you want to delete '%1'?</source> + <translation>Desexa realmente borrar «%1»?</translation> + </message> + <message> + <source>Could not delete directory.</source> + <translation>Non foi posíbel borrar o cartafol.</translation> + </message> + <message> + <source>Recent Places</source> + <translation>Lugares recentes</translation> + </message> + <message> + <source>All Files (*.*)</source> + <translation>Todos os ficheiros (*.*)</translation> + </message> + <message> + <source>Remove</source> + <translation>Eliminar</translation> + </message> + <message> + <source>Drive</source> + <translation>Dispositivo</translation> + </message> + <message> + <source>File</source> + <translation>Ficheiro</translation> + </message> + <message> + <source>File Folder</source> + <comment>Match Windows Explorer</comment> + <translation>Cartafol</translation> + </message> + <message> + <source>Folder</source> + <comment>All other platforms</comment> + <translation>Cartafol</translation> + </message> + <message> + <source>Alias</source> + <comment>Mac OS X Finder</comment> + <translation>Atallo</translation> + </message> + <message> + <source>Shortcut</source> + <comment>All other platforms</comment> + <translation>Atallo</translation> + </message> + <message> + <source>Unknown</source> + <translation>Descoñecido</translation> + </message> +</context> +<context> + <name>QFileSystemModel</name> + <message> + <source>%1 byte(s)</source> + <translation>%1 byte(s)</translation> + </message> + <message> + <source>%1 TB</source> + <translation>%1 TB</translation> + </message> + <message> + <source>%1 GB</source> + <translation>%1 GB</translation> + </message> + <message> + <source>%1 MB</source> + <translation>%1 MB</translation> + </message> + <message> + <source>%1 KB</source> + <translation>%1 KB</translation> + </message> + <message> + <source>%1 bytes</source> + <translation>%1 bytes</translation> + </message> + <message> + <source>Invalid filename</source> + <translation>O nome do ficheiro non é válido</translation> + </message> + <message> + <source><b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks.</source> + <translation><b>O nome «%1» non pode ser usado.</b><p>Probe con outro nome, máis curto ou sen signos de puntuación.</translation> + </message> + <message> + <source>Name</source> + <translation>Nome</translation> + </message> + <message> + <source>Size</source> + <translation>Tamaño</translation> + </message> + <message> + <source>Kind</source> + <comment>Match OS X Finder</comment> + <translation>Tipo</translation> + </message> + <message> + <source>Type</source> + <comment>All other platforms</comment> + <translation>Tipo</translation> + </message> + <message> + <source>Date Modified</source> + <translation>Data de modificación</translation> + </message> + <message> + <source>My Computer</source> + <translation>O meu ordenador</translation> + </message> + <message> + <source>Computer</source> + <translation>Ordenador</translation> + </message> +</context> +<context> + <name>QDockWidget</name> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Dock</source> + <translation>Acoplar</translation> + </message> + <message> + <source>Float</source> + <translation>Flutuante</translation> + </message> +</context> +<context> + <name>QErrorMessage</name> + <message> + <source>Debug Message:</source> + <translation>Mensaxe de depuración:</translation> + </message> + <message> + <source>Warning:</source> + <translation>Aviso:</translation> + </message> + <message> + <source>Fatal Error:</source> + <translation>Erro fatal:</translation> + </message> + <message> + <source>&Show this message again</source> + <translation>&Mostrar esta mensaxe de novo</translation> + </message> + <message> + <source>&OK</source> + <translation>&Aceptar</translation> + </message> +</context> +<context> + <name>QFile</name> + <message> + <source>Destination file exists</source> + <translation>O ficheiro de destino xa existe</translation> + </message> + <message> + <source>Will not rename sequential file using block copy</source> + <translation>Non se mudará o nome do ficheiro secuencial empregando a copia de bloques</translation> + </message> + <message> + <source>Cannot remove source file</source> + <translation>Non é posíbel eliminar o ficheiro de orixe</translation> + </message> + <message> + <source>Cannot open %1 for input</source> + <translation>Non é posíbel abrir %1 como entrada</translation> + </message> + <message> + <source>Cannot open for output</source> + <translation>Non foi posíbel abrir o ficheiro de saída</translation> + </message> + <message> + <source>Failure to write block</source> + <translation>Non foi posíbel escribir o bloque</translation> + </message> + <message> + <source>Cannot create %1 for output</source> + <translation>Non foi posíbel crear %1 para a saída</translation> + </message> +</context> +<context> + <name>QFontDatabase</name> + <message> + <source>Normal</source> + <translation>Normal</translation> + </message> + <message> + <source>Bold</source> + <translation>Negriña</translation> + </message> + <message> + <source>Demi Bold</source> + <translation>Demi negriña</translation> + </message> + <message> + <source>Black</source> + <translation>Escura</translation> + </message> + <message> + <source>Demi</source> + <translation>Demi</translation> + </message> + <message> + <source>Light</source> + <translation>Clara</translation> + </message> + <message> + <source>Italic</source> + <translation>Cursiva</translation> + </message> + <message> + <source>Oblique</source> + <translation>Oblicua</translation> + </message> + <message> + <source>Any</source> + <translation>Calquera</translation> + </message> + <message> + <source>Latin</source> + <translation>Latino</translation> + </message> + <message> + <source>Greek</source> + <translation>Grego</translation> + </message> + <message> + <source>Cyrillic</source> + <translation>Cirílico</translation> + </message> + <message> + <source>Armenian</source> + <translation>Armenio</translation> + </message> + <message> + <source>Hebrew</source> + <translation>Hebreo</translation> + </message> + <message> + <source>Arabic</source> + <translation>Árabe</translation> + </message> + <message> + <source>Syriac</source> + <translation>Sirio</translation> + </message> + <message> + <source>Thaana</source> + <translation>Thaana</translation> + </message> + <message> + <source>Devanagari</source> + <translation>Devanagárico</translation> + </message> + <message> + <source>Bengali</source> + <translation>Bengalí</translation> + </message> + <message> + <source>Gurmukhi</source> + <translation>Gurmukhi</translation> + </message> + <message> + <source>Gujarati</source> + <translation>Guxaratí</translation> + </message> + <message> + <source>Oriya</source> + <translation>Orixa</translation> + </message> + <message> + <source>Tamil</source> + <translation>Tamil</translation> + </message> + <message> + <source>Telugu</source> + <translation>Telugu</translation> + </message> + <message> + <source>Kannada</source> + <translation>Kannada</translation> + </message> + <message> + <source>Malayalam</source> + <translation>Malayalam</translation> + </message> + <message> + <source>Sinhala</source> + <translation>Sinhala</translation> + </message> + <message> + <source>Thai</source> + <translation>Tailandés</translation> + </message> + <message> + <source>Lao</source> + <translation>Lao</translation> + </message> + <message> + <source>Tibetan</source> + <translation>Tibetano</translation> + </message> + <message> + <source>Myanmar</source> + <translation>Myanmar</translation> + </message> + <message> + <source>Georgian</source> + <translation>Xeorxiano</translation> + </message> + <message> + <source>Khmer</source> + <translation>Khmer</translation> + </message> + <message> + <source>Simplified Chinese</source> + <translation>Chinés simplificado</translation> + </message> + <message> + <source>Traditional Chinese</source> + <translation>Chinés tradicional</translation> + </message> + <message> + <source>Japanese</source> + <translation>Xaponés</translation> + </message> + <message> + <source>Korean</source> + <translation>Coreano</translation> + </message> + <message> + <source>Vietnamese</source> + <translation>Vietnamita</translation> + </message> + <message> + <source>Symbol</source> + <translation>Símbolo</translation> + </message> + <message> + <source>Ogham</source> + <translation>Ogham</translation> + </message> + <message> + <source>Runic</source> + <translation>Runas</translation> + </message> + <message> + <source>N'Ko</source> + <translation>N'Ko</translation> + </message> +</context> +<context> + <name>QFontDialog</name> + <message> + <source>Select Font</source> + <translation>Seleccionar o tipo de letra</translation> + </message> + <message> + <source>&Font</source> + <translation>Tipo de &letra</translation> + </message> + <message> + <source>Font st&yle</source> + <translation>&Estilo de letra</translation> + </message> + <message> + <source>&Size</source> + <translation>&Tamaño</translation> + </message> + <message> + <source>Effects</source> + <translation>Efectos</translation> + </message> + <message> + <source>Stri&keout</source> + <translation>&Riscada</translation> + </message> + <message> + <source>&Underline</source> + <translation>&Subraiada</translation> + </message> + <message> + <source>Sample</source> + <translation>Mostra</translation> + </message> + <message> + <source>Wr&iting System</source> + <translation>Sistema de es&crita</translation> + </message> +</context> +<context> + <name>QFtp</name> + <message> + <source>Not connected</source> + <translation>Non conectado</translation> + </message> + <message> + <source>Host %1 not found</source> + <translation>Non se atopou o servidor %1</translation> + </message> + <message> + <source>Connection refused to host %1</source> + <translation>Rexeitouse a conexión co servidor %1</translation> + </message> + <message> + <source>Connection timed out to host %1</source> + <translation>A conexión co servidor %1 esgotou o tempo límite</translation> + </message> + <message> + <source>Connected to host %1</source> + <translation>Conectado co servidor %1</translation> + </message> + <message> + <source>Connection refused for data connection</source> + <translation>Rexeitouse a conexión para conexión de datos</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> + <message> + <source>Connecting to host failed: +%1</source> + <translation>Fallou a conexión co servidor: +%1</translation> + </message> + <message> + <source>Login failed: +%1</source> + <translation>Fallou a autenticación: +%1</translation> + </message> + <message> + <source>Listing directory failed: +%1</source> + <translation>Fallou a listaxe do cartafol: +%1</translation> + </message> + <message> + <source>Changing directory failed: +%1</source> + <translation>Fallou o troco de cartafol: +%1</translation> + </message> + <message> + <source>Downloading file failed: +%1</source> + <translation>Fallou a obtención do ficheiro: +%1</translation> + </message> + <message> + <source>Uploading file failed: +%1</source> + <translation>Fallou o envío do ficheiros: +%1</translation> + </message> + <message> + <source>Removing file failed: +%1</source> + <translation>Fallou a eliminación do ficheiro: +%1</translation> + </message> + <message> + <source>Creating directory failed: +%1</source> + <translation>Fallou a creación do cartafol: +%1</translation> + </message> + <message> + <source>Removing directory failed: +%1</source> + <translation>Fallou a eliminación do cartafol: +%1</translation> + </message> + <message> + <source>Connection closed</source> + <translation>A conexión pechouse</translation> + </message> + <message> + <source>Host %1 found</source> + <translation>Atopouse o servidor %1</translation> + </message> + <message> + <source>Connection to %1 closed</source> + <translation>Pechouse a conexión con %1</translation> + </message> + <message> + <source>Host found</source> + <translation>Atopouse un servidor</translation> + </message> + <message> + <source>Connected to host</source> + <translation>Conectado co servidor</translation> + </message> +</context> +<context> + <name>QHostInfo</name> + <message> + <source>No host name given</source> + <translation>Non se indicou o nome do servidor</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> +</context> +<context> + <name>QHostInfoAgent</name> + <message> + <source>No host name given</source> + <translation>Non se indicou o nome do servidor</translation> + </message> + <message> + <source>Invalid hostname</source> + <translation>O nome do servidor non é válido</translation> + </message> + <message> + <source>Unknown address type</source> + <translation>Tipo de enderezo descoñecido</translation> + </message> + <message> + <source>Host not found</source> + <translation>Non se atopou o servidor</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> +</context> +<context> + <name>QHttpSocketEngine</name> + <message> + <source>Did not receive HTTP response from proxy</source> + <translation>Non se recibiu a resposta HTTP do proxy</translation> + </message> + <message> + <source>Error parsing authentication request from proxy</source> + <translation>Aconteceu un erro ao procesar o pedido de autenticación do proxy</translation> + </message> + <message> + <source>Authentication required</source> + <translation>Requírese de autenticación</translation> + </message> + <message> + <source>Proxy denied connection</source> + <translation>O proxy negou a conexión</translation> + </message> + <message> + <source>Error communicating with HTTP proxy</source> + <translation>Aconteceu un erro ao comunicar co proxy HTTP</translation> + </message> + <message> + <source>Proxy server not found</source> + <translation>Non se atopou o servidor proxy</translation> + </message> + <message> + <source>Proxy connection refused</source> + <translation>Rexeitouse a conexión co proxy</translation> + </message> + <message> + <source>Proxy server connection timed out</source> + <translation>A conexión co servidor proxy esgotou o tempo-límite</translation> + </message> + <message> + <source>Proxy connection closed prematurely</source> + <translation>A conexión co proxy pechouse antes de tempo</translation> + </message> +</context> +<context> + <name>QIBaseDriver</name> + <message> + <source>Error opening database</source> + <translation>Aconteceu un erro ao abrir a base de datos</translation> + </message> + <message> + <source>Could not start transaction</source> + <translation>Non foi posíbel comezar a transacción</translation> + </message> + <message> + <source>Unable to commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Unable to rollback transaction</source> + <translation>Non foi posíbel anular a transacción</translation> + </message> +</context> +<context> + <name>QIBaseResult</name> + <message> + <source>Unable to create BLOB</source> + <translation>Non foi posíbel crear o BLOB</translation> + </message> + <message> + <source>Unable to write BLOB</source> + <translation>Non foi posíbel escribir o BLOB</translation> + </message> + <message> + <source>Unable to open BLOB</source> + <translation>Non foi posíbel abrir o BLOB</translation> + </message> + <message> + <source>Unable to read BLOB</source> + <translation>Non foi posíbel ler o BLOB</translation> + </message> + <message> + <source>Could not find array</source> + <translation>Non foi posíbel atopar o array</translation> + </message> + <message> + <source>Could not get array data</source> + <translation>Non foi posíbel obter o array de datos</translation> + </message> + <message> + <source>Could not get query info</source> + <translation>Non foi posíbel obter a información da consulta</translation> + </message> + <message> + <source>Could not start transaction</source> + <translation>Non foi posíbel comezar a transacción</translation> + </message> + <message> + <source>Unable to commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Could not allocate statement</source> + <translation>Non foi posíbel asignar memoria á sentenza</translation> + </message> + <message> + <source>Could not prepare statement</source> + <translation>Non foi posíbel preparar a sentenza</translation> + </message> + <message> + <source>Could not describe input statement</source> + <translation>Non foi posíbel describir a sentenza de entrada</translation> + </message> + <message> + <source>Could not describe statement</source> + <translation>Non foi posíbel describir a sentenza</translation> + </message> + <message> + <source>Unable to close statement</source> + <translation>Non foi posíbel pechar a sentenza</translation> + </message> + <message> + <source>Unable to execute query</source> + <translation>Non foi posíbel executar a consulta</translation> + </message> + <message> + <source>Could not fetch next item</source> + <translation>Non foi posíbel acadar o seguinte elemento</translation> + </message> + <message> + <source>Could not get statement info</source> + <translation>Non foi posíbel obter información da sentenza</translation> + </message> +</context> +<context> + <name>QIODevice</name> + <message> + <source>Permission denied</source> + <translation>Permiso negado</translation> + </message> + <message> + <source>Too many open files</source> + <translation>Demasiados ficheiros abertos</translation> + </message> + <message> + <source>No such file or directory</source> + <translation>Non existe ese ficheiro nin cartafol</translation> + </message> + <message> + <source>No space left on device</source> + <translation>Non queda espazo no dispositivo</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> +</context> +<context> + <name>QInputContext</name> + <message> + <source>XIM</source> + <translation>XIM</translation> + </message> + <message> + <source>FEP</source> + <translation>FEP</translation> + </message> + <message> + <source>XIM input method</source> + <translation>Método de entrada XIM</translation> + </message> + <message> + <source>Windows input method</source> + <translation>Método de entrada de Windows</translation> + </message> + <message> + <source>Mac OS X input method</source> + <translation>Método de entrada de Mac OS X</translation> + </message> + <message> + <source>S60 FEP input method</source> + <translation>Método de entrada FEP de S60</translation> + </message> +</context> +<context> + <name>QInputDialog</name> + <message> + <source>Enter a value:</source> + <translation>Introduza un valor:</translation> + </message> +</context> +<context> + <name>QLibrary</name> + <message> + <source>Could not mmap '%1': %2</source> + <translation>Non foi posíbel mmap «%1»: %2</translation> + </message> + <message> + <source>Plugin verification data mismatch in '%1'</source> + <translation>Erro de concordancia na verificación dos datos da extensión en «%1»</translation> + </message> + <message> + <source>Could not unmap '%1': %2</source> + <translation>Non foi posíbel unmap «%1»: %2</translation> + </message> + <message> + <source>The shared library was not found.</source> + <translation>Non se atopou a biblioteca compartida.</translation> + </message> + <message> + <source>The file '%1' is not a valid Qt plugin.</source> + <translation>O ficheiro «%1» non é unha extensión válida de Qt.</translation> + </message> + <message> + <source>The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5]</source> + <translation>A extensión «%1» utiliza unha biblioteca Qt non compatíbel. (%2.%3.%4) [%5]</translation> + </message> + <message> + <source>The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3"</source> + <translation>A extensión «%1» utiliza unha biblioteca Qt non compatíbel. Agardábase a +chave de compilación «%2», obtívose a «%3»</translation> + </message> + <message> + <source>The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.)</source> + <translation>A extensión «%1» utiliza unha biblioteca Qt non compatíbel (Non é posíbel +misturar as bibliotecas de depuración coas publicadas).</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> + <message> + <source>Cannot load library %1: %2</source> + <translation>Non foi posíbel cargar a biblioteca %1: %2</translation> + </message> + <message> + <source>Cannot unload library %1: %2</source> + <translation>Non foi posíbel descargar a biblioteca %1: %2</translation> + </message> + <message> + <source>Cannot resolve symbol "%1" in %2: %3</source> + <translation>Non é posíbel resolver o símbolo «%1» en %2: %3</translation> + </message> +</context> +<context> + <name>QLineEdit</name> + <message> + <source>&Undo</source> + <translation>&Desfacer</translation> + </message> + <message> + <source>&Redo</source> + <translation>&Refacer</translation> + </message> + <message> + <source>Cu&t</source> + <translation>Cor&tar</translation> + </message> + <message> + <source>&Copy</source> + <translation>&Copiar</translation> + </message> + <message> + <source>&Paste</source> + <translation>A&pegar</translation> + </message> + <message> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <source>Select All</source> + <translation>Escoller todo</translation> + </message> +</context> +<context> + <name>QLocalServer</name> + <message> + <source>%1: Name error</source> + <translation>%1: Erro de nome</translation> + </message> + <message> + <source>%1: Permission denied</source> + <translation>%1: Permiso negado</translation> + </message> + <message> + <source>%1: Address in use</source> + <translation>%1: O enderezo xa está a ser empregado</translation> + </message> + <message> + <source>%1: Unknown error %2</source> + <translation>%1: Erro descoñecido %2</translation> + </message> +</context> +<context> + <name>QLocalSocket</name> + <message> + <source>%1: Connection refused</source> + <translation>%1: Rexeitouse a conexión</translation> + </message> + <message> + <source>%1: Remote closed</source> + <translation>%1: Pechouse de xeito remoto</translation> + </message> + <message> + <source>%1: Invalid name</source> + <translation>%1: Nome non válido</translation> + </message> + <message> + <source>%1: Socket access error</source> + <translation>%1: Erro de acceso ao socket</translation> + </message> + <message> + <source>%1: Socket resource error</source> + <translation>%1: Erro do recurso do socket</translation> + </message> + <message> + <source>%1: Socket operation timed out</source> + <translation>%1: A operación do socket esgotou o tempo-límite</translation> + </message> + <message> + <source>%1: Datagram too large</source> + <translation>%1: Datagrama grande de máis</translation> + </message> + <message> + <source>%1: Connection error</source> + <translation>%1: Erro na conexión</translation> + </message> + <message> + <source>%1: The socket operation is not supported</source> + <translation>%1: A operación do socket non está soportada</translation> + </message> + <message> + <source>%1: Unknown error</source> + <translation>%1: Erro descoñecido</translation> + </message> + <message> + <source>%1: Unknown error %2</source> + <translation>%1: Erro descoñecido %2</translation> + </message> +</context> +<context> + <name>QMYSQLDriver</name> + <message> + <source>Unable to open database '</source> + <translation>Non foi posíbel abrir a base de datos «</translation> + </message> + <message> + <source>Unable to connect</source> + <translation>Non foi posíbel conectar</translation> + </message> + <message> + <source>Unable to begin transaction</source> + <translation>Non foi posíbel comezar a transacción</translation> + </message> + <message> + <source>Unable to commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Unable to rollback transaction</source> + <translation>Non foi posíbel anular a transacción</translation> + </message> +</context> +<context> + <name>QMYSQLResult</name> + <message> + <source>Unable to fetch data</source> + <translation>Non foi posíbel acadar os datos</translation> + </message> + <message> + <source>Unable to execute query</source> + <translation>Non foi posíbel executar a consulta</translation> + </message> + <message> + <source>Unable to store result</source> + <translation>Non foi posíbel gardar os resultados</translation> + </message> + <message> + <source>Unable to execute next query</source> + <translation>Non foi posíbel executar a seguinte consulta</translation> + </message> + <message> + <source>Unable to store next result</source> + <translation>Non foi posíbel gardar o seguinte resultado</translation> + </message> + <message> + <source>Unable to prepare statement</source> + <translation>Non foi posíbel preparar a sentenza</translation> + </message> + <message> + <source>Unable to reset statement</source> + <translation>Non foi posíbel reiniciar a sentenza</translation> + </message> + <message> + <source>Unable to bind value</source> + <translation>Non foi posíbel asociar o valor</translation> + </message> + <message> + <source>Unable to execute statement</source> + <translation>Non foi posíbel executar a sentenza</translation> + </message> + <message> + <source>Unable to bind outvalues</source> + <translation>Non foi posíbel asociar os outvalues</translation> + </message> + <message> + <source>Unable to store statement results</source> + <translation>Non foi posíbel gardar os resultados da sentenza</translation> + </message> +</context> +<context> + <name>QMdiArea</name> + <message> + <source>(Untitled)</source> + <translation>(Sen título)</translation> + </message> +</context> +<context> + <name>QMdiSubWindow</name> + <message> + <source>- [%1]</source> + <translation>- [%1]</translation> + </message> + <message> + <source>%1 - [%2]</source> + <translation>%1 - [%2]</translation> + </message> + <message> + <source>Minimize</source> + <translation>Minimizar</translation> + </message> + <message> + <source>Maximize</source> + <translation>Maximizar</translation> + </message> + <message> + <source>Unshade</source> + <translation>Despregar</translation> + </message> + <message> + <source>Shade</source> + <translation>Pregar</translation> + </message> + <message> + <source>Restore Down</source> + <translation>Restaurar para abaixo</translation> + </message> + <message> + <source>Restore</source> + <translation>Restaurar</translation> + </message> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Help</source> + <translation>Axuda</translation> + </message> + <message> + <source>Menu</source> + <translation>Menú</translation> + </message> + <message> + <source>&Restore</source> + <translation>&Restaurar</translation> + </message> + <message> + <source>&Move</source> + <translation>&Mover</translation> + </message> + <message> + <source>&Size</source> + <translation>&Tamaño</translation> + </message> + <message> + <source>Mi&nimize</source> + <translation>Mi&nimizar</translation> + </message> + <message> + <source>Ma&ximize</source> + <translation>Ma&ximizar</translation> + </message> + <message> + <source>Stay on &Top</source> + <translation>Manter &enriba</translation> + </message> + <message> + <source>&Close</source> + <translation>&Pechar</translation> + </message> +</context> +<context> + <name>QMenu</name> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Open</source> + <translation>Abrir</translation> + </message> + <message> + <source>Execute</source> + <translation>Executar</translation> + </message> +</context> +<context> + <name>QMenuBar</name> + <message> + <source>Actions</source> + <translation>Accións</translation> + </message> +</context> +<context> + <name>QMultiInputContext</name> + <message> + <source>Select IM</source> + <translation>Escolla o método de entrada</translation> + </message> +</context> +<context> + <name>QMultiInputContextPlugin</name> + <message> + <source>Multiple input method switcher</source> + <translation>Selector de múltiplos métodos de entrada</translation> + </message> + <message> + <source>Multiple input method switcher that uses the context menu of the text widgets</source> + <translation>Selector entre métodos de entrada que usa o menú contextual dos widgets de +texto</translation> + </message> +</context> +<context> + <name>QNativeSocketEngine</name> + <message> + <source>Unable to initialize non-blocking socket</source> + <translation>Non foi posíbel inicializar o socket non bloqueante</translation> + </message> + <message> + <source>Unable to initialize broadcast socket</source> + <translation>Non foi posíbel inicializar o socket de broadcast</translation> + </message> + <message> + <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source> + <translation>Tentouse usar soporte de socket IPv6 nunha plataforma en soporte de IPv6</translation> + </message> + <message> + <source>The remote host closed the connection</source> + <translation>O servidor remoto pechou a conexión</translation> + </message> + <message> + <source>Network operation timed out</source> + <translation>A operación de rede esgotou o tempo-límite</translation> + </message> + <message> + <source>Out of resources</source> + <translation>Esgotáronse os recursos</translation> + </message> + <message> + <source>Unsupported socket operation</source> + <translation>Operación de socket non soportada</translation> + </message> + <message> + <source>Protocol type not supported</source> + <translation>Tipo de protocolo non soportado</translation> + </message> + <message> + <source>Invalid socket descriptor</source> + <translation>Descritor de socket non válido</translation> + </message> + <message> + <source>Host unreachable</source> + <translation>Non foi posíbel acadar o servidor</translation> + </message> + <message> + <source>Network unreachable</source> + <translation>Non foi posíbel acadar a rede</translation> + </message> + <message> + <source>Permission denied</source> + <translation>Permiso negado</translation> + </message> + <message> + <source>Connection timed out</source> + <translation>A conexión esgotou o tempo-límite</translation> + </message> + <message> + <source>Connection refused</source> + <translation>A conexión foi rexeitada</translation> + </message> + <message> + <source>The bound address is already in use</source> + <translation>O enderezo de conexión xa está en uso</translation> + </message> + <message> + <source>The address is not available</source> + <translation>O enderezo non está dispoñíbel</translation> + </message> + <message> + <source>The address is protected</source> + <translation>O enderezo está protexido</translation> + </message> + <message> + <source>Datagram was too large to send</source> + <translation>O datagrama é grande de máis para envialo</translation> + </message> + <message> + <source>Unable to send a message</source> + <translation>Non foi posíbel enviar unha mensaxe</translation> + </message> + <message> + <source>Unable to receive a message</source> + <translation>Non foi posíbel recibir unha mensaxe</translation> + </message> + <message> + <source>Unable to write</source> + <translation>Non foi posíbel escribir</translation> + </message> + <message> + <source>Network error</source> + <translation>Erro de rede</translation> + </message> + <message> + <source>Another socket is already listening on the same port</source> + <translation>Xa hai outro socket a escoitar o mesmo porto</translation> + </message> + <message> + <source>Operation on non-socket</source> + <translation>Operación nun non socket</translation> + </message> + <message> + <source>The proxy type is invalid for this operation</source> + <translation>O tipo de proxy non é válido para esta operación</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> +</context> +<context> + <name>QNetworkAccessCacheBackend</name> + <message> + <source>Error opening %1</source> + <translation>Aconteceu un erro ao abrir %1</translation> + </message> +</context> +<context> + <name>QNetworkAccessDataBackend</name> + <message> + <source>Operation not supported on %1</source> + <translation>Operación non soportada en %1</translation> + </message> + <message> + <source>Invalid URI: %1</source> + <translation>URI non válida: %1</translation> + </message> +</context> +<context> + <name>QNetworkAccessDebugPipeBackend</name> + <message> + <source>Write error writing to %1: %2</source> + <translation>Aconteceu un erro de escrita ao escribir en %1: %2</translation> + </message> + <message> + <source>Socket error on %1: %2</source> + <translation>Aconteceu un erro de socket en %1: %2</translation> + </message> + <message> + <source>Remote host closed the connection prematurely on %1</source> + <translation>O servidor remoto pechou prematuramente a conexión en %1</translation> + </message> +</context> +<context> + <name>QNetworkAccessFileBackend</name> + <message> + <source>Request for opening non-local file %1</source> + <translation>Pedido de abertura do ficheiro non local %1</translation> + </message> + <message> + <source>Cannot open %1: Path is a directory</source> + <translation>Non é posíbel abrir %1: A rota é un directorio</translation> + </message> + <message> + <source>Error opening %1: %2</source> + <translation>Aconteceu un erro ao abrir %1: %2</translation> + </message> + <message> + <source>Write error writing to %1: %2</source> + <translation>Aconteceu un erro de escrita ao escribir en %1: %2</translation> + </message> + <message> + <source>Read error reading from %1: %2</source> + <translation>Aconteceu un erro ao ler en %1: %2</translation> + </message> +</context> +<context> + <name>QNetworkAccessFtpBackend</name> + <message> + <source>No suitable proxy found</source> + <translation>Non se atopou ningún proxy axeitado</translation> + </message> + <message> + <source>Cannot open %1: is a directory</source> + <translation>Non é posíbel abrir %1: é un directorio</translation> + </message> + <message> + <source>Logging in to %1 failed: authentication required</source> + <translation>Fallou o acceso a %1: debe autenticarse</translation> + </message> + <message> + <source>Error while downloading %1: %2</source> + <translation>Aconteceu un erro ao obter %1: %2</translation> + </message> + <message> + <source>Error while uploading %1: %2</source> + <translation>Aconteceu un erro ao enviar %1: %2</translation> + </message> +</context> +<context> + <name>QNetworkAccessHttpBackend</name> + <message> + <source>No suitable proxy found</source> + <translation>Non se atopou ningún proxy axeitado</translation> + </message> +</context> +<context> + <name>QNetworkReply</name> + <message> + <source>Error downloading %1 - server replied: %2</source> + <translation>Aconteceu un erro ao obter %1, o servidor respondeu: %2</translation> + </message> + <message> + <source>Protocol "%1" is unknown</source> + <translation>Non se coñece o protocolo «%1»</translation> + </message> + <message> + <source>Network session error.</source> + <translation>Erro da sesión de rede.</translation> + </message> + <message> + <source>Temporary network failure.</source> + <translation>Fallo temporal da rede.</translation> + </message> +</context> +<context> + <name>QNetworkAccessManager</name> + <message> + <source>Network access is disabled.</source> + <translation>O acceso á rede está desactivado.</translation> + </message> +</context> +<context> + <name>QNetworkReplyImpl</name> + <message> + <source>Operation canceled</source> + <translation>Cancelouse a operación</translation> + </message> +</context> +<context> + <name>QNetworkSession</name> + <message> + <source>Invalid configuration.</source> + <translation>A configuración non é válida.</translation> + </message> +</context> +<context> + <name>QNetworkSessionPrivateImpl</name> + <message> + <source>Roaming error</source> + <translation>Erro da itinerancia</translation> + </message> + <message> + <source>Session aborted by user or system</source> + <translation>A sesión abortouse polo usuario ou polo sistema</translation> + </message> + <message> + <source>Unidentified Error</source> + <translation>Erro non identificado</translation> + </message> + <message> + <source>Unknown session error.</source> + <translation>Erro descoñecido da sesión.</translation> + </message> + <message> + <source>The session was aborted by the user or system.</source> + <translation>A sesión abortouse polo usuario ou polo sistema.</translation> + </message> + <message> + <source>The requested operation is not supported by the system.</source> + <translation>A operación pedida non está soportada polo sistema.</translation> + </message> + <message> + <source>The specified configuration cannot be used.</source> + <translation>A configuración especificada non se pode empregar.</translation> + </message> + <message> + <source>Roaming was aborted or is not possible.</source> + <translation>A itinerancia abortouse ou non é posíbel.</translation> + </message> +</context> +<context> + <name>QOCIDriver</name> + <message> + <source>Unable to initialize</source> + <comment>QOCIDriver</comment> + <translation>Non foi posíbel inicializar</translation> + </message> + <message> + <source>Unable to logon</source> + <translation>Non foi posíbel identificarse</translation> + </message> + <message> + <source>Unable to begin transaction</source> + <translation>Non foi posíbel comezar a transacción</translation> + </message> + <message> + <source>Unable to commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Unable to rollback transaction</source> + <translation>Non foi posíbel anular a transacción</translation> + </message> +</context> +<context> + <name>QOCIResult</name> + <message> + <source>Unable to bind column for batch execute</source> + <translation>Non foi posíbel asociar a columna para executar o lote</translation> + </message> + <message> + <source>Unable to execute batch statement</source> + <translation>Non foi posíbel executar a sentenza en lote</translation> + </message> + <message> + <source>Unable to goto next</source> + <translation>Non foi posíbel ir para o seguinte</translation> + </message> + <message> + <source>Unable to alloc statement</source> + <translation>Non foi posíbel reservar memoria para a sentenza</translation> + </message> + <message> + <source>Unable to prepare statement</source> + <translation>Non foi posíbel preparar a sentenza</translation> + </message> + <message> + <source>Unable to get statement type</source> + <translation>Non foi posíbel obter o tipo da sentenza</translation> + </message> + <message> + <source>Unable to bind value</source> + <translation>Non foi posíbel asociar o valor</translation> + </message> + <message> + <source>Unable to execute statement</source> + <translation>Non foi posíbel executar a sentenza</translation> + </message> +</context> +<context> + <name>QODBCDriver</name> + <message> + <source>Unable to connect</source> + <translation>Non foi posíbel conectar</translation> + </message> + <message> + <source>Unable to connect - Driver doesn't support all functionality required</source> + <translation>Non foi posíbel conectar xa que o controlador non soporta todas as funcionalidades requiridas</translation> + </message> + <message> + <source>Unable to disable autocommit</source> + <translation>Non foi posíbel desactivar a entrega automática</translation> + </message> + <message> + <source>Unable to commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Unable to rollback transaction</source> + <translation>Non foi posíbel anular a transacción</translation> + </message> + <message> + <source>Unable to enable autocommit</source> + <translation>Non foi posíbel activar a entrega automática</translation> + </message> +</context> +<context> + <name>QPPDOptionsModel</name> + <message> + <source>Name</source> + <translation>Nome</translation> + </message> + <message> + <source>Value</source> + <translation>Valor</translation> + </message> +</context> +<context> + <name>QPrintDialog</name> + <message> + <source>&Options >></source> + <translation>&Opcións >></translation> + </message> + <message> + <source>&Print</source> + <translation>&Imprimir</translation> + </message> + <message> + <source>&Options <<</source> + <translation>&Opcións <<</translation> + </message> + <message> + <source>Print to File (PDF)</source> + <translation>Imprimir nun ficheiro (PDF)</translation> + </message> + <message> + <source>Print to File (Postscript)</source> + <translation>Imprimir nun ficheiro (Postscript)</translation> + </message> + <message> + <source>Local file</source> + <translation>Ficheiro local</translation> + </message> + <message> + <source>Write %1 file</source> + <translation>Escribir no ficheiro %1</translation> + </message> + <message> + <source>Print To File ...</source> + <translation>Imprimir nun ficheiro...</translation> + </message> + <message> + <source>%1 is a directory. +Please choose a different file name.</source> + <translation>%1 é un cartafol. +Escolla outro nome para o ficheiro.</translation> + </message> + <message> + <source>File %1 is not writable. +Please choose a different file name.</source> + <translation>Non se pode escribir no ficheiro %1. +Escolla outro nome de ficheiro.</translation> + </message> + <message> + <source>%1 already exists. +Do you want to overwrite it?</source> + <translation>%1 xa existe. +Desexa sobrescribilo?</translation> + </message> + <message> + <source>A0</source> + <translation>A0</translation> + </message> + <message> + <source>A1</source> + <translation>A1</translation> + </message> + <message> + <source>A2</source> + <translation>A2</translation> + </message> + <message> + <source>A3</source> + <translation>A3</translation> + </message> + <message> + <source>A4</source> + <translation>A4</translation> + </message> + <message> + <source>A5</source> + <translation>A5</translation> + </message> + <message> + <source>A6</source> + <translation>A6</translation> + </message> + <message> + <source>A7</source> + <translation>A7</translation> + </message> + <message> + <source>A8</source> + <translation>A8</translation> + </message> + <message> + <source>A9</source> + <translation>A9</translation> + </message> + <message> + <source>B0</source> + <translation>B0</translation> + </message> + <message> + <source>B1</source> + <translation>B1</translation> + </message> + <message> + <source>B2</source> + <translation>B2</translation> + </message> + <message> + <source>B3</source> + <translation>B3</translation> + </message> + <message> + <source>B4</source> + <translation>B4</translation> + </message> + <message> + <source>B5</source> + <translation>B5</translation> + </message> + <message> + <source>B6</source> + <translation>B6</translation> + </message> + <message> + <source>B7</source> + <translation>B7</translation> + </message> + <message> + <source>B8</source> + <translation>B8</translation> + </message> + <message> + <source>B9</source> + <translation>B9</translation> + </message> + <message> + <source>B10</source> + <translation>B10</translation> + </message> + <message> + <source>C5E</source> + <translation>C5E</translation> + </message> + <message> + <source>DLE</source> + <translation>DLE</translation> + </message> + <message> + <source>Executive</source> + <translation>Executive</translation> + </message> + <message> + <source>Folio</source> + <translation>Folio</translation> + </message> + <message> + <source>Ledger</source> + <translation>Ledger</translation> + </message> + <message> + <source>Legal</source> + <translation>Legal</translation> + </message> + <message> + <source>Letter</source> + <translation>Carta</translation> + </message> + <message> + <source>Tabloid</source> + <translation>Tabloid</translation> + </message> + <message> + <source>US Common #10 Envelope</source> + <translation>Sobre US Common núm. 10</translation> + </message> + <message> + <source>Custom</source> + <translation>Personalizado</translation> + </message> + <message> + <source>Print</source> + <translation>Imprimir</translation> + </message> + <message> + <source>File exists</source> + <translation>O ficheiro xa existe</translation> + </message> + <message> + <source><qt>Do you want to overwrite it?</qt></source> + <translation><qt>Desexa sobrescribilo?</qt></translation> + </message> + <message> + <source>A0 (841 x 1189 mm)</source> + <translation>A0 (841 x 1189 mm)</translation> + </message> + <message> + <source>A1 (594 x 841 mm)</source> + <translation>A1 (594 x 841 mm)</translation> + </message> + <message> + <source>A2 (420 x 594 mm)</source> + <translation>A2 (420 x 594 mm)</translation> + </message> + <message> + <source>A3 (297 x 420 mm)</source> + <translation>A3 (297 x 420 mm)</translation> + </message> + <message> + <source>A4 (210 x 297 mm, 8.26 x 11.7 inches)</source> + <translation>A4 (210 x 297 mm, 8,26 x 11,7 polgadas)</translation> + </message> + <message> + <source>A5 (148 x 210 mm)</source> + <translation>A5 (148 x 210 mm)</translation> + </message> + <message> + <source>A6 (105 x 148 mm)</source> + <translation>A6 (105 x 148 mm)</translation> + </message> + <message> + <source>A7 (74 x 105 mm)</source> + <translation>A7 (74 x 105 mm)</translation> + </message> + <message> + <source>A8 (52 x 74 mm)</source> + <translation>A8 (52 x 74 mm)</translation> + </message> + <message> + <source>A9 (37 x 52 mm)</source> + <translation>A9 (37 x 52 mm)</translation> + </message> + <message> + <source>B0 (1000 x 1414 mm)</source> + <translation>B0 (1000 x 1414 mm)</translation> + </message> + <message> + <source>B1 (707 x 1000 mm)</source> + <translation>B1 (707 x 1000 mm)</translation> + </message> + <message> + <source>B2 (500 x 707 mm)</source> + <translation>B2 (500 x 707 mm)</translation> + </message> + <message> + <source>B3 (353 x 500 mm)</source> + <translation>B3 (353 x 500 mm)</translation> + </message> + <message> + <source>B4 (250 x 353 mm)</source> + <translation>B4 (250 x 353 mm)</translation> + </message> + <message> + <source>B5 (176 x 250 mm, 6.93 x 9.84 inches)</source> + <translation>B5 (176 x 250 mm, 6,93 x 9,84 polgadas)</translation> + </message> + <message> + <source>B6 (125 x 176 mm)</source> + <translation>B6 (125 x 176 mm)</translation> + </message> + <message> + <source>B7 (88 x 125 mm)</source> + <translation>B7 (88 x 125 mm)</translation> + </message> + <message> + <source>B8 (62 x 88 mm)</source> + <translation>B8 (62 x 88 mm)</translation> + </message> + <message> + <source>B9 (44 x 62 mm)</source> + <translation>B9 (44 x 62 mm)</translation> + </message> + <message> + <source>B10 (31 x 44 mm)</source> + <translation>B10 (31 x 44 mm)</translation> + </message> + <message> + <source>C5E (163 x 229 mm)</source> + <translation>C5E (163 x 229 mm)</translation> + </message> + <message> + <source>DLE (110 x 220 mm)</source> + <translation>DLE (110 x 220 mm)</translation> + </message> + <message> + <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source> + <translation>Executive (7,5 x 10 polgadas, 191 x 254 mm)</translation> + </message> + <message> + <source>Folio (210 x 330 mm)</source> + <translation>Folio (210 x 330 mm)</translation> + </message> + <message> + <source>Ledger (432 x 279 mm)</source> + <translation>Ledger (432 x 279 mm)</translation> + </message> + <message> + <source>Legal (8.5 x 14 inches, 216 x 356 mm)</source> + <translation>Legal (8,5 x 14 polgadas, 216 x 356 mm)</translation> + </message> + <message> + <source>Letter (8.5 x 11 inches, 216 x 279 mm)</source> + <translation>Carta (8,5 x 11 polgadas, 216 x 279 mm)</translation> + </message> + <message> + <source>Tabloid (279 x 432 mm)</source> + <translation>Tabloide (279 x 432 mm)</translation> + </message> + <message> + <source>US Common #10 Envelope (105 x 241 mm)</source> + <translation>Sobre US Common #10 (105 x 241 mm)</translation> + </message> + <message> + <source>Print all</source> + <translation>Imprimir todas</translation> + </message> + <message> + <source>Print selection</source> + <translation>Imprimir a selección</translation> + </message> + <message> + <source>Print range</source> + <translation>Intervalo de impresión</translation> + </message> + <message> + <source>Print current page</source> + <translation>Imprimir a páxina actual</translation> + </message> + <message> + <source>The 'From' value cannot be greater than the 'To' value.</source> + <translation>O valor «de» non pode ser maior do que o valor «até».</translation> + </message> + <message> + <source>OK</source> + <translation>Aceptar</translation> + </message> + <message> + <source>locally connected</source> + <translation>conectado localmente</translation> + </message> + <message> + <source>Aliases: %1</source> + <translation>Alcumes: %1</translation> + </message> + <message> + <source>unknown</source> + <translation>descoñecido</translation> + </message> +</context> +<context> + <name>QPSQLDriver</name> + <message> + <source>Unable to connect</source> + <translation>Non foi posíbel conectar</translation> + </message> + <message> + <source>Could not begin transaction</source> + <translation>Non foi posíbel comezar a transacción</translation> + </message> + <message> + <source>Could not commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Could not rollback transaction</source> + <translation>Non foi posíbel anular a transacción</translation> + </message> + <message> + <source>Unable to subscribe</source> + <translation>Non foi posíbel subscribirse</translation> + </message> + <message> + <source>Unable to unsubscribe</source> + <translation>Non foi posíbel anular a subscrición</translation> + </message> +</context> +<context> + <name>QPSQLResult</name> + <message> + <source>Unable to create query</source> + <translation>Non foi posíbel crear a consulta</translation> + </message> + <message> + <source>Unable to prepare statement</source> + <translation>Non foi posíbel preparar a sentenza</translation> + </message> +</context> +<context> + <name>QPageSetupWidget</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <source>Paper</source> + <translation>Papel</translation> + </message> + <message> + <source>Page size:</source> + <translation>Tamaño da páxina:</translation> + </message> + <message> + <source>Width:</source> + <translation>Largura:</translation> + </message> + <message> + <source>Height:</source> + <translation>Altura:</translation> + </message> + <message> + <source>Paper source:</source> + <translation>Fonte do papel:</translation> + </message> + <message> + <source>Orientation</source> + <translation>Orientación</translation> + </message> + <message> + <source>Portrait</source> + <translation>Retrato</translation> + </message> + <message> + <source>Landscape</source> + <translation>Apaisado</translation> + </message> + <message> + <source>Reverse landscape</source> + <translation>Apaisado invertido</translation> + </message> + <message> + <source>Reverse portrait</source> + <translation>Retrato invertido</translation> + </message> + <message> + <source>Margins</source> + <translation>Marxes</translation> + </message> + <message> + <source>top margin</source> + <translation>marxe superior</translation> + </message> + <message> + <source>left margin</source> + <translation>marxe esquerda</translation> + </message> + <message> + <source>right margin</source> + <translation>marxe dereita</translation> + </message> + <message> + <source>bottom margin</source> + <translation>marxe inferior</translation> + </message> + <message> + <source>Centimeters (cm)</source> + <translation>Centímetros (cm)</translation> + </message> + <message> + <source>Millimeters (mm)</source> + <translation>Milímetros (mm)</translation> + </message> + <message> + <source>Inches (in)</source> + <translation>Polgadas (pol)</translation> + </message> + <message> + <source>Points (pt)</source> + <translation>Puntos (pt)</translation> + </message> +</context> +<context> + <name>QPluginLoader</name> + <message> + <source>The plugin was not loaded.</source> + <translation>A extensión non se cargou.</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> +</context> +<context> + <name>QPrintPreviewDialog</name> + <message> + <source>Page Setup</source> + <translation>Configuración da páxina</translation> + </message> + <message> + <source>%1%</source> + <translation>%1%</translation> + </message> + <message> + <source>Print Preview</source> + <translation>Vista previa do impreso</translation> + </message> + <message> + <source>Next page</source> + <translation>Seguinte páxina</translation> + </message> + <message> + <source>Previous page</source> + <translation>Páxina anterior</translation> + </message> + <message> + <source>First page</source> + <translation>Primeira páxina</translation> + </message> + <message> + <source>Last page</source> + <translation>Última páxina</translation> + </message> + <message> + <source>Fit width</source> + <translation>Axustar á largura</translation> + </message> + <message> + <source>Fit page</source> + <translation>Axustar á páxina</translation> + </message> + <message> + <source>Zoom in</source> + <translation>Ampliar</translation> + </message> + <message> + <source>Zoom out</source> + <translation>Reducir</translation> + </message> + <message> + <source>Portrait</source> + <translation>Retrato</translation> + </message> + <message> + <source>Landscape</source> + <translation>Apaisado</translation> + </message> + <message> + <source>Show single page</source> + <translation>Mostrar unha só páxina</translation> + </message> + <message> + <source>Show facing pages</source> + <translation>Mostrar as páxinas opostas</translation> + </message> + <message> + <source>Show overview of all pages</source> + <translation>Mostrar un resumo de todas as páxinas</translation> + </message> + <message> + <source>Print</source> + <translation>Imprimir</translation> + </message> + <message> + <source>Page setup</source> + <translation>Configuración da páxina</translation> + </message> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Export to PDF</source> + <translation>Exportar a PDF</translation> + </message> + <message> + <source>Export to PostScript</source> + <translation>Exportar a PostScript</translation> + </message> +</context> +<context> + <name>QPrintPropertiesWidget</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <source>Page</source> + <translation>Páxina</translation> + </message> + <message> + <source>Advanced</source> + <translation>Avanzado</translation> + </message> +</context> +<context> + <name>QPrintSettingsOutput</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <source>Copies</source> + <translation>Copias</translation> + </message> + <message> + <source>Print range</source> + <translation>Intervalo de impresión</translation> + </message> + <message> + <source>Print all</source> + <translation>Imprimir todas</translation> + </message> + <message> + <source>Pages from</source> + <translation>As páxinas da</translation> + </message> + <message> + <source>to</source> + <translation>até a</translation> + </message> + <message> + <source>Current Page</source> + <translation>Páxina actual</translation> + </message> + <message> + <source>Selection</source> + <translation>Selección</translation> + </message> + <message> + <source>Output Settings</source> + <translation>Configuración da saída</translation> + </message> + <message> + <source>Copies:</source> + <translation>Copias:</translation> + </message> + <message> + <source>Collate</source> + <translation>Xuntar</translation> + </message> + <message> + <source>Reverse</source> + <translation>Inverter</translation> + </message> + <message> + <source>Options</source> + <translation>Opcións</translation> + </message> + <message> + <source>Color Mode</source> + <translation>Modo de cor</translation> + </message> + <message> + <source>Color</source> + <translation>Cor</translation> + </message> + <message> + <source>Grayscale</source> + <translation>Escala de grises</translation> + </message> + <message> + <source>Duplex Printing</source> + <translation>Impresión polas dúas caras</translation> + </message> + <message> + <source>None</source> + <translation>non empregar</translation> + </message> + <message> + <source>Long side</source> + <translation>Lado longo</translation> + </message> + <message> + <source>Short side</source> + <translation>Lado curto</translation> + </message> +</context> +<context> + <name>QPrintWidget</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <source>Printer</source> + <translation>Impresora</translation> + </message> + <message> + <source>&Name:</source> + <translation>&Nome:</translation> + </message> + <message> + <source>P&roperties</source> + <translation>P&ropriedades</translation> + </message> + <message> + <source>Location:</source> + <translation>Localización:</translation> + </message> + <message> + <source>Preview</source> + <translation>Vista previa</translation> + </message> + <message> + <source>Type:</source> + <translation>Tipo:</translation> + </message> + <message> + <source>Output &file:</source> + <translation>Ficheiro de &saída:</translation> + </message> + <message> + <source>...</source> + <translation>...</translation> + </message> +</context> +<context> + <name>QProcess</name> + <message> + <source>Error reading from process</source> + <translation>Aconteceu un erro ao ler do proceso</translation> + </message> + <message> + <source>Error writing to process</source> + <translation>Aconteceu un erro ao escribir no proceso</translation> + </message> + <message> + <source>Process crashed</source> + <translation>O proceso pechouse inesperadamente</translation> + </message> + <message> + <source>No program defined</source> + <translation>Non definiu programa ningún</translation> + </message> + <message> + <source>Could not open input redirection for reading</source> + <translation>Non foi posíbel abrir a redirección da entrada para lectura</translation> + </message> + <message> + <source>Could not open output redirection for writing</source> + <translation>Non foi posíbel abrir a redirección da entrada para escribir</translation> + </message> + <message> + <source>Resource error (fork failure): %1</source> + <translation>Erro do recurso (fallou o fork): %1</translation> + </message> + <message> + <source>Process operation timed out</source> + <translation>A operación de procesamento esgotou o tempo-límite</translation> + </message> + <message> + <source>Process failed to start: %1</source> + <translation>Fallou a carga do proceso: %1</translation> + </message> +</context> +<context> + <name>QProgressDialog</name> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> +</context> +<context> + <name>QRegExp</name> + <message> + <source>no error occurred</source> + <translation>non aconteceu ningún erro</translation> + </message> + <message> + <source>disabled feature used</source> + <translation>úsase unha funcionalidade desactivada</translation> + </message> + <message> + <source>bad char class syntax</source> + <translation>sintaxe incorrecta para a clase char</translation> + </message> + <message> + <source>bad lookahead syntax</source> + <translation>sintaxe incorrecta para a procura cara diante</translation> + </message> + <message> + <source>bad repetition syntax</source> + <translation>sintaxe incorrecta para a repetición</translation> + </message> + <message> + <source>invalid octal value</source> + <translation>valor octal non válido</translation> + </message> + <message> + <source>missing left delim</source> + <translation>falta o delimitador esquerdo</translation> + </message> + <message> + <source>unexpected end</source> + <translation>final inesperado</translation> + </message> + <message> + <source>met internal limit</source> + <translation>acadouse un límite interno</translation> + </message> + <message> + <source>invalid interval</source> + <translation>intervalo non válido</translation> + </message> + <message> + <source>invalid category</source> + <translation>categoría non válida</translation> + </message> +</context> +<context> + <name>QSQLite2Driver</name> + <message> + <source>Error opening database</source> + <translation>Aconteceu un erro ao abrir a base de datos</translation> + </message> + <message> + <source>Unable to begin transaction</source> + <translation>Non foi posíbel comezar a transacción</translation> + </message> + <message> + <source>Unable to commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Unable to rollback transaction</source> + <translation>Non foi posíbel anular a transacción</translation> + </message> +</context> +<context> + <name>QSQLite2Result</name> + <message> + <source>Unable to fetch results</source> + <translation>Non foi posíbel acadar os resultados</translation> + </message> + <message> + <source>Unable to execute statement</source> + <translation>Non foi posíbel executar a sentenza</translation> + </message> +</context> +<context> + <name>QSQLiteDriver</name> + <message> + <source>Error opening database</source> + <translation>Aconteceu un erro ao abrir a base de datos</translation> + </message> + <message> + <source>Error closing database</source> + <translation>Aconteceu un erro ao pechar a base de datos</translation> + </message> + <message> + <source>Unable to begin transaction</source> + <translation>Non foi posíbel comezar a transacción</translation> + </message> + <message> + <source>Unable to commit transaction</source> + <translation>Non foi posíbel entregar a transacción</translation> + </message> + <message> + <source>Unable to rollback transaction</source> + <translation>Non foi posíbel anular a transacción</translation> + </message> +</context> +<context> + <name>QSQLiteResult</name> + <message> + <source>Unable to fetch row</source> + <translation>Non foi posíbel acadar a fila</translation> + </message> + <message> + <source>No query</source> + <translation>Non hai consulta</translation> + </message> + <message> + <source>Unable to execute statement</source> + <translation>Non foi posíbel executar a sentenza</translation> + </message> + <message> + <source>Unable to reset statement</source> + <translation>Non foi posíbel reiniciar a sentenza</translation> + </message> + <message> + <source>Unable to bind parameters</source> + <translation>Non foi posíbel asociar os parámetros</translation> + </message> + <message> + <source>Parameter count mismatch</source> + <translation>O número de parámetros non coincide</translation> + </message> +</context> +<context> + <name>QScriptBreakpointsModel</name> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Location</source> + <translation>Lugar</translation> + </message> + <message> + <source>Condition</source> + <translation>Condición</translation> + </message> + <message> + <source>Ignore-count</source> + <translation>Ignorar a cantidade</translation> + </message> + <message> + <source>Single-shot</source> + <translation>Acción única</translation> + </message> + <message> + <source>Hit-count</source> + <translation>Cantidade de alcances</translation> + </message> +</context> +<context> + <name>QScriptBreakpointsWidget</name> + <message> + <source>New</source> + <translation>Novo</translation> + </message> + <message> + <source>Delete</source> + <translation>Borrar</translation> + </message> +</context> +<context> + <name>QScriptNewBreakpointWidget</name> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> +</context> +<context> + <name>QScriptDebugger</name> + <message> + <source>Go to Line</source> + <translation>Ir para a liña</translation> + </message> + <message> + <source>Line:</source> + <translation>Liña:</translation> + </message> + <message> + <source>Interrupt</source> + <translation>Interromper</translation> + </message> + <message> + <source>Shift+F5</source> + <translation>Maiús.+F5</translation> + </message> + <message> + <source>Continue</source> + <translation>Continuar</translation> + </message> + <message> + <source>F5</source> + <translation>F5</translation> + </message> + <message> + <source>Step Into</source> + <translation>Entrar</translation> + </message> + <message> + <source>F11</source> + <translation>F11</translation> + </message> + <message> + <source>Step Over</source> + <translation>Pasar por riba</translation> + </message> + <message> + <source>F10</source> + <translation>F10</translation> + </message> + <message> + <source>Step Out</source> + <translation>Saír</translation> + </message> + <message> + <source>Shift+F11</source> + <translation>Maiús.+F11</translation> + </message> + <message> + <source>Run to Cursor</source> + <translation>Executar até o cursor</translation> + </message> + <message> + <source>Ctrl+F10</source> + <translation>Ctrl+F10</translation> + </message> + <message> + <source>Run to New Script</source> + <translation>Executar até o novo script</translation> + </message> + <message> + <source>Toggle Breakpoint</source> + <translation>Conmutar o punto de parada</translation> + </message> + <message> + <source>F9</source> + <translation>F9</translation> + </message> + <message> + <source>Clear Debug Output</source> + <translation>Limpar a saída de depuración</translation> + </message> + <message> + <source>Clear Error Log</source> + <translation>Limpar a saída de erros</translation> + </message> + <message> + <source>Clear Console</source> + <translation>Limpar a consola</translation> + </message> + <message> + <source>&Find in Script...</source> + <translation>Procurar no &script...</translation> + </message> + <message> + <source>Ctrl+F</source> + <translation>Ctrl+F</translation> + </message> + <message> + <source>Find &Next</source> + <translation>Procurar o &seguinte</translation> + </message> + <message> + <source>F3</source> + <translation>F3</translation> + </message> + <message> + <source>Find &Previous</source> + <translation>Procurar o &anterior</translation> + </message> + <message> + <source>Shift+F3</source> + <translation>Maiúsc.+F3</translation> + </message> + <message> + <source>Ctrl+G</source> + <translation>Ctrl+G</translation> + </message> + <message> + <source>Debug</source> + <translation>Depurar</translation> + </message> +</context> +<context> + <name>QScriptDebuggerCodeFinderWidget</name> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Previous</source> + <translation>Anterior</translation> + </message> + <message> + <source>Next</source> + <translation>Seguinte</translation> + </message> + <message> + <source>Case Sensitive</source> + <translation>Distinguir as maiúsculas</translation> + </message> + <message> + <source>Whole words</source> + <translation>Palabras completas</translation> + </message> + <message> + <source><img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped</source> + <translation><img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;A procura retornou</translation> + </message> +</context> +<context> + <name>QScriptDebuggerLocalsModel</name> + <message> + <source>Name</source> + <translation>Nome</translation> + </message> + <message> + <source>Value</source> + <translation>Valor</translation> + </message> +</context> +<context> + <name>QScriptDebuggerStackModel</name> + <message> + <source>Level</source> + <translation>Nivel</translation> + </message> + <message> + <source>Name</source> + <translation>Nome</translation> + </message> + <message> + <source>Location</source> + <translation>Lugar</translation> + </message> +</context> +<context> + <name>QScriptEdit</name> + <message> + <source>Toggle Breakpoint</source> + <translation>Conmutar o punto de parada</translation> + </message> + <message> + <source>Disable Breakpoint</source> + <translation>Desactivar o punto de parada</translation> + </message> + <message> + <source>Enable Breakpoint</source> + <translation>Activar o punto de parada</translation> + </message> + <message> + <source>Breakpoint Condition:</source> + <translation>Condición do punto de parada:</translation> + </message> +</context> +<context> + <name>QScriptEngineDebugger</name> + <message> + <source>Loaded Scripts</source> + <translation>Scripts cargados</translation> + </message> + <message> + <source>Breakpoints</source> + <translation>Puntos de parada</translation> + </message> + <message> + <source>Stack</source> + <translation>Pila</translation> + </message> + <message> + <source>Locals</source> + <translation>Locais</translation> + </message> + <message> + <source>Console</source> + <translation>Consola</translation> + </message> + <message> + <source>Debug Output</source> + <translation>Saída de depuración</translation> + </message> + <message> + <source>Error Log</source> + <translation>Rexisto de erros</translation> + </message> + <message> + <source>Search</source> + <translation>Procurar</translation> + </message> + <message> + <source>View</source> + <translation>Vista</translation> + </message> + <message> + <source>Qt Script Debugger</source> + <translation>Depurador de Qt Script</translation> + </message> +</context> +<context> + <name>QSharedMemory</name> + <message> + <source>%1: unable to set key on lock</source> + <translation>%1: non foi posíbel modificar a tecla por bloqueo</translation> + </message> + <message> + <source>%1: create size is less then 0</source> + <translation>%1: o tamaño a crear é menor que 0</translation> + </message> + <message> + <source>%1: unable to lock</source> + <translation>%1: non foi posíbel bloquear</translation> + </message> + <message> + <source>%1: unable to unlock</source> + <translation>%1: non foi posíbel desbloquear</translation> + </message> + <message> + <source>%1: already exists</source> + <translation>%1: xa existe</translation> + </message> + <message> + <source>%1: doesn't exists</source> + <translation>%1: non existe</translation> + </message> + <message> + <source>%1: invalid size</source> + <translation>%1: tamaño non válido</translation> + </message> + <message> + <source>%1: out of resources</source> + <translation>%1: esgotou os recursos</translation> + </message> + <message> + <source>%1: permission denied</source> + <translation>%1: negouse o permiso</translation> + </message> + <message> + <source>%1: unknown error %2</source> + <translation>%1: erro descoñecido %2</translation> + </message> + <message> + <source>%1: key error</source> + <translation>%1: erro de chave</translation> + </message> + <message> + <source>%1: unable to make key</source> + <translation>%1: non foi posíbel crear a chave</translation> + </message> + <message> + <source>%1: doesn't exist</source> + <translation>%1: non existe</translation> + </message> + <message> + <source>%1: key is empty</source> + <translation>%1: a chave está baleira</translation> + </message> + <message> + <source>%1: UNIX key file doesn't exist</source> + <translation>%1: non existe o ficheiro de chave de UNIX</translation> + </message> + <message> + <source>%1: ftok failed</source> + <translation>%1: fallou ftok</translation> + </message> + <message> + <source>%1: system-imposed size restrictions</source> + <translation>%1: restricións de tamaño impostas polo sistema</translation> + </message> + <message> + <source>%1: not attached</source> + <translation>%1: non adxuntado</translation> + </message> + <message> + <source>%1: size query failed</source> + <translation>%1: fallou o tamaño da consulta</translation> + </message> +</context> +<context> + <name>QShortcut</name> + <message> + <source>Space</source> + <extracomment>This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used.</extracomment> + <translation>Espazo</translation> + </message> + <message> + <source>Esc</source> + <translation>Esc</translation> + </message> + <message> + <source>Tab</source> + <translation>Tab</translation> + </message> + <message> + <source>Backtab</source> + <translation>Tab atrás</translation> + </message> + <message> + <source>Backspace</source> + <translation>Borrar</translation> + </message> + <message> + <source>Return</source> + <translation>Intro</translation> + </message> + <message> + <source>Enter</source> + <translation>Intro</translation> + </message> + <message> + <source>Ins</source> + <translation>Ins</translation> + </message> + <message> + <source>Del</source> + <translation>Supr</translation> + </message> + <message> + <source>Pause</source> + <translation>Pausa</translation> + </message> + <message> + <source>Print</source> + <translation>Imprimir</translation> + </message> + <message> + <source>SysReq</source> + <translation>Pet.Sis</translation> + </message> + <message> + <source>Home</source> + <translation>Inicio</translation> + </message> + <message> + <source>End</source> + <translation>Fin</translation> + </message> + <message> + <source>Left</source> + <translation>Esquerda</translation> + </message> + <message> + <source>Up</source> + <translation>Subir</translation> + </message> + <message> + <source>Right</source> + <translation>Dereita</translation> + </message> + <message> + <source>Down</source> + <translation>Baixar</translation> + </message> + <message> + <source>PgUp</source> + <translation>RePáx</translation> + </message> + <message> + <source>PgDown</source> + <translation>AvPáx</translation> + </message> + <message> + <source>CapsLock</source> + <translation>Bloq Maiús</translation> + </message> + <message> + <source>NumLock</source> + <translation>Bloq. Num</translation> + </message> + <message> + <source>ScrollLock</source> + <translation>Bloq Despr</translation> + </message> + <message> + <source>Menu</source> + <translation>Menú</translation> + </message> + <message> + <source>Help</source> + <translation>Axuda</translation> + </message> + <message> + <source>Back</source> + <translation>Atrás</translation> + </message> + <message> + <source>Forward</source> + <translation>Adiante</translation> + </message> + <message> + <source>Stop</source> + <translation>Deter</translation> + </message> + <message> + <source>Refresh</source> + <translation>Anovar</translation> + </message> + <message> + <source>Volume Down</source> + <translation>Baixar o volume</translation> + </message> + <message> + <source>Volume Mute</source> + <translation>Silenciar</translation> + </message> + <message> + <source>Volume Up</source> + <translation>Subir o volume</translation> + </message> + <message> + <source>Bass Boost</source> + <translation>Potenciador de graves</translation> + </message> + <message> + <source>Bass Up</source> + <translation>Subir os graves</translation> + </message> + <message> + <source>Bass Down</source> + <translation>Baixar os graves</translation> + </message> + <message> + <source>Treble Up</source> + <translation>Treble Subir</translation> + </message> + <message> + <source>Treble Down</source> + <translation>Treble Baixar</translation> + </message> + <message> + <source>Media Play</source> + <translation>Multimedia Reproducir</translation> + </message> + <message> + <source>Media Stop</source> + <translation>Multimedia Parar</translation> + </message> + <message> + <source>Media Previous</source> + <translation>Multimedia Anterior</translation> + </message> + <message> + <source>Media Next</source> + <translation>Multimedia Seguinte</translation> + </message> + <message> + <source>Media Record</source> + <translation>Multimedia Gravar</translation> + </message> + <message> + <source>Media Pause</source> + <extracomment>Media player pause button</extracomment> + <translation>Multimedia Pausa</translation> + </message> + <message> + <source>Toggle Media Play/Pause</source> + <extracomment>Media player button to toggle between playing and paused</extracomment> + <translation>Multimedia Reproducir/Pausar</translation> + </message> + <message> + <source>Home Page</source> + <translation>Páxina de inicio</translation> + </message> + <message> + <source>Favorites</source> + <translation>Favoritos</translation> + </message> + <message> + <source>Search</source> + <translation>Procurar</translation> + </message> + <message> + <source>Standby</source> + <translation>Espera</translation> + </message> + <message> + <source>Open URL</source> + <translation>Abrir un URL</translation> + </message> + <message> + <source>Launch Mail</source> + <translation>Abrir o correo</translation> + </message> + <message> + <source>Launch Media</source> + <translation>Lanzar Multimedia</translation> + </message> + <message> + <source>Launch (0)</source> + <translation>Lanzar (0)</translation> + </message> + <message> + <source>Launch (1)</source> + <translation>Lanzar (1)</translation> + </message> + <message> + <source>Launch (2)</source> + <translation>Lanzar (2)</translation> + </message> + <message> + <source>Launch (3)</source> + <translation>Lanzar (3)</translation> + </message> + <message> + <source>Launch (4)</source> + <translation>Lanzar (4)</translation> + </message> + <message> + <source>Launch (5)</source> + <translation>Lanzar (5)</translation> + </message> + <message> + <source>Launch (6)</source> + <translation>Lanzar (6)</translation> + </message> + <message> + <source>Launch (7)</source> + <translation>Lanzar (7)</translation> + </message> + <message> + <source>Launch (8)</source> + <translation>Lanzar (8)</translation> + </message> + <message> + <source>Launch (9)</source> + <translation>Lanzar (9)</translation> + </message> + <message> + <source>Launch (A)</source> + <translation>Lanzar (A)</translation> + </message> + <message> + <source>Launch (B)</source> + <translation>Lanzar (B)</translation> + </message> + <message> + <source>Launch (C)</source> + <translation>Lanzar (C)</translation> + </message> + <message> + <source>Launch (D)</source> + <translation>Lanzar (D)</translation> + </message> + <message> + <source>Launch (E)</source> + <translation>Lanzar (E)</translation> + </message> + <message> + <source>Launch (F)</source> + <translation>Lanzar (F)</translation> + </message> + <message> + <source>Monitor Brightness Up</source> + <translation>Subir o brillo do monitor</translation> + </message> + <message> + <source>Monitor Brightness Down</source> + <translation>Baixar o brillo do monitor</translation> + </message> + <message> + <source>Keyboard Light On/Off</source> + <translation>Acender/Apagar a luz do teclado</translation> + </message> + <message> + <source>Keyboard Brightness Up</source> + <translation>Subir o brillo do teclado</translation> + </message> + <message> + <source>Keyboard Brightness Down</source> + <translation>Baixar o brillo do teclado</translation> + </message> + <message> + <source>Power Off</source> + <translation>Apagar</translation> + </message> + <message> + <source>Wake Up</source> + <translation>Espertar</translation> + </message> + <message> + <source>Eject</source> + <translation>Expulsar</translation> + </message> + <message> + <source>Screensaver</source> + <translation>Protector de pantalla</translation> + </message> + <message> + <source>WWW</source> + <translation>WWW</translation> + </message> + <message> + <source>Sleep</source> + <translation>Durmir</translation> + </message> + <message> + <source>LightBulb</source> + <translation>Punto de luz</translation> + </message> + <message> + <source>Shop</source> + <translation>Mercar</translation> + </message> + <message> + <source>History</source> + <translation>Historial</translation> + </message> + <message> + <source>Add Favorite</source> + <translation>Engadir aos favoritos</translation> + </message> + <message> + <source>Hot Links</source> + <translation>Ligazóns quentes</translation> + </message> + <message> + <source>Adjust Brightness</source> + <translation>Axustar o brillo</translation> + </message> + <message> + <source>Finance</source> + <translation>Finanzas</translation> + </message> + <message> + <source>Community</source> + <translation>Comunidade</translation> + </message> + <message> + <source>Audio Rewind</source> + <translation>Rebobinar o son</translation> + </message> + <message> + <source>Back Forward</source> + <translation>Voltar atrás</translation> + </message> + <message> + <source>Application Left</source> + <translation>Programa da esquerda</translation> + </message> + <message> + <source>Application Right</source> + <translation>Programa da dereita</translation> + </message> + <message> + <source>Book</source> + <translation>Libro</translation> + </message> + <message> + <source>CD</source> + <translation>CD</translation> + </message> + <message> + <source>Calculator</source> + <translation>Calculadora</translation> + </message> + <message> + <source>Clear</source> + <translation>Limpar</translation> + </message> + <message> + <source>Clear Grab</source> + <translation>Limpar o collido</translation> + </message> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <source>Cut</source> + <translation>Cortar</translation> + </message> + <message> + <source>Display</source> + <translation>Pantalla</translation> + </message> + <message> + <source>DOS</source> + <translation>DOS</translation> + </message> + <message> + <source>Documents</source> + <translation>Documentos</translation> + </message> + <message> + <source>Spreadsheet</source> + <translation>Folla de cálculo</translation> + </message> + <message> + <source>Browser</source> + <translation>Navegador</translation> + </message> + <message> + <source>Game</source> + <translation>Xogo</translation> + </message> + <message> + <source>Go</source> + <translation>Ir para</translation> + </message> + <message> + <source>iTouch</source> + <translation>iTouch</translation> + </message> + <message> + <source>Logoff</source> + <translation>Saír</translation> + </message> + <message> + <source>Market</source> + <translation>Tenda</translation> + </message> + <message> + <source>Meeting</source> + <translation>Reunión</translation> + </message> + <message> + <source>Keyboard Menu</source> + <translation>Menú do teclado</translation> + </message> + <message> + <source>Menu PB</source> + <translation>Menú PB</translation> + </message> + <message> + <source>My Sites</source> + <translation>Os meus sitios</translation> + </message> + <message> + <source>News</source> + <translation>Novas</translation> + </message> + <message> + <source>Home Office</source> + <translation>Casa oficina</translation> + </message> + <message> + <source>Option</source> + <translation>Opción</translation> + </message> + <message> + <source>Paste</source> + <translation>Apegar</translation> + </message> + <message> + <source>Phone</source> + <translation>Teléfono</translation> + </message> + <message> + <source>Reply</source> + <translation>Responder</translation> + </message> + <message> + <source>Reload</source> + <translation>Cargar de novo</translation> + </message> + <message> + <source>Rotate Windows</source> + <translation>Xirar as fiestras</translation> + </message> + <message> + <source>Rotation PB</source> + <translation>Xiro PB</translation> + </message> + <message> + <source>Rotation KB</source> + <translation>Xiro KB</translation> + </message> + <message> + <source>Save</source> + <translation>Gardar</translation> + </message> + <message> + <source>Send</source> + <translation>Enviar</translation> + </message> + <message> + <source>Spellchecker</source> + <translation>Corrector ortográfico</translation> + </message> + <message> + <source>Split Screen</source> + <translation>Dividir a pantalla</translation> + </message> + <message> + <source>Support</source> + <translation>Axuda</translation> + </message> + <message> + <source>Task Panel</source> + <translation>Panel de tarefas</translation> + </message> + <message> + <source>Terminal</source> + <translation>Terminal</translation> + </message> + <message> + <source>Tools</source> + <translation>Utensilios</translation> + </message> + <message> + <source>Travel</source> + <translation>Viaxes</translation> + </message> + <message> + <source>Video</source> + <translation>Vídeo</translation> + </message> + <message> + <source>Word Processor</source> + <translation>Procesador de textos</translation> + </message> + <message> + <source>XFer</source> + <translation>XFer</translation> + </message> + <message> + <source>Zoom In</source> + <translation>Ampliar</translation> + </message> + <message> + <source>Zoom Out</source> + <translation>Reducir</translation> + </message> + <message> + <source>Away</source> + <translation>Ausente</translation> + </message> + <message> + <source>Messenger</source> + <translation>Mensaxería</translation> + </message> + <message> + <source>WebCam</source> + <translation>Cámara web</translation> + </message> + <message> + <source>Mail Forward</source> + <translation>Reenvío de correo</translation> + </message> + <message> + <source>Pictures</source> + <translation>Imaxes</translation> + </message> + <message> + <source>Music</source> + <translation>Música</translation> + </message> + <message> + <source>Battery</source> + <translation>Batería</translation> + </message> + <message> + <source>Bluetooth</source> + <translation>Bluetooth</translation> + </message> + <message> + <source>Wireless</source> + <translation>Sen fíos</translation> + </message> + <message> + <source>Ultra Wide Band</source> + <translation>Banda moi larga</translation> + </message> + <message> + <source>Audio Forward</source> + <translation>Avanzar o son</translation> + </message> + <message> + <source>Audio Repeat</source> + <translation>Repetir o son</translation> + </message> + <message> + <source>Audio Random Play</source> + <translation>Reprodución aleatoria de son</translation> + </message> + <message> + <source>Subtitle</source> + <translation>Subtítulo</translation> + </message> + <message> + <source>Audio Cycle Track</source> + <translation>Repetir as pistas de son</translation> + </message> + <message> + <source>Time</source> + <translation>Tempo</translation> + </message> + <message> + <source>Select</source> + <translation>Escoller</translation> + </message> + <message> + <source>View</source> + <translation>Vista</translation> + </message> + <message> + <source>Top Menu</source> + <translation>Menú na parte de riba</translation> + </message> + <message> + <source>Suspend</source> + <translation>Suspender</translation> + </message> + <message> + <source>Hibernate</source> + <translation>Hibernar</translation> + </message> + <message> + <source>Print Screen</source> + <translation>Impr Pant</translation> + </message> + <message> + <source>Page Up</source> + <translation>Páxina Arriba</translation> + </message> + <message> + <source>Page Down</source> + <translation>Página Abaixo</translation> + </message> + <message> + <source>Caps Lock</source> + <translation>Bloq Maius</translation> + </message> + <message> + <source>Num Lock</source> + <translation>Bloq Num</translation> + </message> + <message> + <source>Number Lock</source> + <translation>Bloqueo numérico</translation> + </message> + <message> + <source>Scroll Lock</source> + <translation>Bloqueo de desprazamento</translation> + </message> + <message> + <source>Insert</source> + <translation>Inserir</translation> + </message> + <message> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <source>Escape</source> + <translation>Escape</translation> + </message> + <message> + <source>System Request</source> + <translation>Pedido ao sistema</translation> + </message> + <message> + <source>Yes</source> + <translation>Si</translation> + </message> + <message> + <source>No</source> + <translation>Non</translation> + </message> + <message> + <source>Context1</source> + <translation>Contexto1</translation> + </message> + <message> + <source>Context2</source> + <translation>Contexto2</translation> + </message> + <message> + <source>Context3</source> + <translation>Contexto3</translation> + </message> + <message> + <source>Context4</source> + <translation>Contexto4</translation> + </message> + <message> + <source>Call</source> + <extracomment>Button to start a call (note: a separate button is used to end the call)</extracomment> + <translation>Chamar</translation> + </message> + <message> + <source>Hangup</source> + <extracomment>Button to end a call (note: a separate button is used to start the call)</extracomment> + <translation>Colgar</translation> + </message> + <message> + <source>Toggle Call/Hangup</source> + <extracomment>Button that will hang up if we're in call, or make a call if we're not.</extracomment> + <translation>Comutar chamar/colgar</translation> + </message> + <message> + <source>Flip</source> + <translation>Inverter</translation> + </message> + <message> + <source>Voice Dial</source> + <extracomment>Button to trigger voice dialling</extracomment> + <translation>Chamar mediante voz</translation> + </message> + <message> + <source>Last Number Redial</source> + <extracomment>Button to redial the last number called</extracomment> + <translation>Rechamar</translation> + </message> + <message> + <source>Camera Shutter</source> + <extracomment>Button to trigger the camera shutter (take a picture)</extracomment> + <translation>Disparador da cámara</translation> + </message> + <message> + <source>Camera Focus</source> + <extracomment>Button to focus the camera</extracomment> + <translation>Focalizador da cámara</translation> + </message> + <message> + <source>Kanji</source> + <translation>Kanji</translation> + </message> + <message> + <source>Muhenkan</source> + <translation>Muhenkan</translation> + </message> + <message> + <source>Henkan</source> + <translation>Henkan</translation> + </message> + <message> + <source>Romaji</source> + <translation>Romaji</translation> + </message> + <message> + <source>Hiragana</source> + <translation>Hiragana</translation> + </message> + <message> + <source>Katakana</source> + <translation>Katakana</translation> + </message> + <message> + <source>Hiragana Katakana</source> + <translation>Hirgana Katakana</translation> + </message> + <message> + <source>Zenkaku</source> + <translation>Zenkaku</translation> + </message> + <message> + <source>Hankaku</source> + <translation>Hankaku</translation> + </message> + <message> + <source>Zenkaku Hankaku</source> + <translation>Zenkaku Hankaku</translation> + </message> + <message> + <source>Touroku</source> + <translation>Touroku</translation> + </message> + <message> + <source>Massyo</source> + <translation>Massyo</translation> + </message> + <message> + <source>Kana Lock</source> + <translation>Bloquear os Kana</translation> + </message> + <message> + <source>Kana Shift</source> + <translation>Cambiar a Kana</translation> + </message> + <message> + <source>Eisu Shift</source> + <translation>Cambiar a Eisu</translation> + </message> + <message> + <source>Eisu toggle</source> + <translation>Conmutar Eisu</translation> + </message> + <message> + <source>Code input</source> + <translation>Entrada de código</translation> + </message> + <message> + <source>Multiple Candidate</source> + <translation>Candidatos múltiplos</translation> + </message> + <message> + <source>Previous Candidate</source> + <translation>Candidato anterior</translation> + </message> + <message> + <source>Hangul</source> + <translation>Hangul</translation> + </message> + <message> + <source>Hangul Start</source> + <translation>Hangul inicio</translation> + </message> + <message> + <source>Hangul End</source> + <translation>Hangul fin</translation> + </message> + <message> + <source>Hangul Hanja</source> + <translation>Hangul Hanja</translation> + </message> + <message> + <source>Hangul Jamo</source> + <translation>Hangul Jamo</translation> + </message> + <message> + <source>Hangul Romaja</source> + <translation>Hangul Romaja</translation> + </message> + <message> + <source>Hangul Jeonja</source> + <translation>Hanjul Jeonja</translation> + </message> + <message> + <source>Hangul Banja</source> + <translation>Hangul Banja</translation> + </message> + <message> + <source>Hangul PreHanja</source> + <translation>Hangul PreHanja</translation> + </message> + <message> + <source>Hangul PostHanja</source> + <translation>Halgul PostHanja</translation> + </message> + <message> + <source>Hangul Special</source> + <translation>Hangul especial</translation> + </message> + <message> + <source>Ctrl</source> + <translation>Ctrl</translation> + </message> + <message> + <source>Shift</source> + <translation>Maiúsc</translation> + </message> + <message> + <source>Alt</source> + <translation>Alt</translation> + </message> + <message> + <source>Meta</source> + <translation>Meta</translation> + </message> + <message> + <source>+</source> + <translation>+</translation> + </message> + <message> + <source>F%1</source> + <translation>F%1</translation> + </message> +</context> +<context> + <name>QSoftKeyManager</name> + <message> + <source>Ok</source> + <translation>Aceptar</translation> + </message> + <message> + <source>Select</source> + <translation>Escoller</translation> + </message> + <message> + <source>Done</source> + <translation>Feito</translation> + </message> + <message> + <source>Options</source> + <translation>Opcións</translation> + </message> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <source>Exit</source> + <translation>Saír</translation> + </message> +</context> +<context> + <name>QSql</name> + <message> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <source>Delete this record?</source> + <translation>Desexa borrar este rexistro?</translation> + </message> + <message> + <source>Yes</source> + <translation>Si</translation> + </message> + <message> + <source>No</source> + <translation>Non</translation> + </message> + <message> + <source>Insert</source> + <translation>Inserir</translation> + </message> + <message> + <source>Update</source> + <translation>Actualizar</translation> + </message> + <message> + <source>Save edits?</source> + <translation>Desexa gardar as modificacións?</translation> + </message> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <source>Confirm</source> + <translation>Confirmar</translation> + </message> + <message> + <source>Cancel your edits?</source> + <translation>Desexa cancelar as súas modificacións?</translation> + </message> +</context> +<context> + <name>QSslSocket</name> + <message> + <source>No error</source> + <translation>Sen erros</translation> + </message> + <message> + <source>The issuer certificate could not be found</source> + <translation>Non se atopou o certificado do expendedor</translation> + </message> + <message> + <source>The certificate signature could not be decrypted</source> + <translation>Non foi posíbel descifrar a sinatura do certificado</translation> + </message> + <message> + <source>The public key in the certificate could not be read</source> + <translation>Non foi posíbel ler a chave pública no certificado</translation> + </message> + <message> + <source>The signature of the certificate is invalid</source> + <translation>A sinatura do certificado non é válida</translation> + </message> + <message> + <source>The certificate is not yet valid</source> + <translation>O certificado aínda non é válido</translation> + </message> + <message> + <source>The certificate has expired</source> + <translation>O certificado caducou</translation> + </message> + <message> + <source>The certificate's notBefore field contains an invalid time</source> + <translation>O campo notBefore do certificado contén unha data non válida</translation> + </message> + <message> + <source>The certificate's notAfter field contains an invalid time</source> + <translation>O campo notAfter do certificado contén unha data non válida</translation> + </message> + <message> + <source>The certificate is self-signed, and untrusted</source> + <translation>O certificado está auto-asinado e non é fiábel</translation> + </message> + <message> + <source>The root certificate of the certificate chain is self-signed, and untrusted</source> + <translation>O certificado raíz da cadea de certificados está auto-asinado e non é fiábel</translation> + </message> + <message> + <source>The issuer certificate of a locally looked up certificate could not be found</source> + <translation>Non foi posíbel atopar o certificado emisor dun certificado que se procurou localmente</translation> + </message> + <message> + <source>No certificates could be verified</source> + <translation>Non foi posíbel verificar ningún certificado</translation> + </message> + <message> + <source>One of the CA certificates is invalid</source> + <translation>Un dos certificados da CA non é válido</translation> + </message> + <message> + <source>The basicConstraints path length parameter has been exceeded</source> + <translation>Superouse a lonxitude da rota do parámetro basicConstraints</translation> + </message> + <message> + <source>The supplied certificate is unsuitable for this purpose</source> + <translation>O certificado fornecido non é apropriada para este propósito</translation> + </message> + <message> + <source>The root CA certificate is not trusted for this purpose</source> + <translation>A autoridade de certificación raíz do certificado non é de confianza para este propósito</translation> + </message> + <message> + <source>The root CA certificate is marked to reject the specified purpose</source> + <translation>A autoridade de certificación raíz do certificado está instruída para rexeitar o propósito especificado</translation> + </message> + <message> + <source>The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate</source> + <translation>O certificado emisor do candidado actual rexeitouse porque o nome do asunto non coincide co do emisor do certificado actual</translation> + </message> + <message> + <source>The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate</source> + <translation>O certificado emisor do candidado actual rexeitouse porque o nome do emisor e o número de serie están presentes pero non coinciden co identificador da autoridade da chave do certificado actual</translation> + </message> + <message> + <source>The peer did not present any certificate</source> + <translation>O parceiro non presentou certificado ningún</translation> + </message> + <message> + <source>The host name did not match any of the valid hosts for this certificate</source> + <translation>O nome do servidor non coincide con ningún dos válidos para este certificado</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> + <message> + <source>Error creating SSL context (%1)</source> + <translation>Aconteceu un erro ao crear o contexto SSL (%1)</translation> + </message> + <message> + <source>Invalid or empty cipher list (%1)</source> + <translation>A lista de cifras ou non é válida ou está baleira (%1)</translation> + </message> + <message> + <source>Cannot provide a certificate with no key, %1</source> + <translation>Non é posíbel fornecer un certificado sen chave, %1</translation> + </message> + <message> + <source>Error loading local certificate, %1</source> + <translation>Aconteceu un erro ao cargar o certificado local, %1</translation> + </message> + <message> + <source>Error loading private key, %1</source> + <translation>Aconteceu un erro ao cargar a chave privada, %1</translation> + </message> + <message> + <source>Private key does not certify public key, %1</source> + <translation>A chave privada non certifica a chave pública, %1</translation> + </message> + <message> + <source>Error creating SSL session, %1</source> + <translation>Aconteceu un erro ao crear a sesión SSL, %1</translation> + </message> + <message> + <source>Error creating SSL session: %1</source> + <translation>Aconteceu un erro ao crear a sesión SSL: %1</translation> + </message> + <message> + <source>Unable to write data: %1</source> + <translation>Non foi posíbel escribir os datos: %1</translation> + </message> + <message> + <source>Unable to decrypt data: %1</source> + <translation>Non foi posíbel descifrar os datos: %1</translation> + </message> + <message> + <source>Error while reading: %1</source> + <translation>Aconteceu un erro ao ler: %1</translation> + </message> + <message> + <source>Error during SSL handshake: %1</source> + <translation>Aconteceu un erro durante a negociación SSL: %1</translation> + </message> +</context> +<context> + <name>QStateMachine</name> + <message> + <source>Missing initial state in compound state '%1'</source> + <translation>Falta o estado inicial no estado composto «%1»</translation> + </message> + <message> + <source>Missing default state in history state '%1'</source> + <translation>Falta o estado predeterminado no estado histórico «%1»</translation> + </message> + <message> + <source>No common ancestor for targets and source of transition from state '%1'</source> + <translation>Non hai antecesor común para o destino e orixe da transición desde o estado «%1»</translation> + </message> + <message> + <source>Unknown error</source> + <translation>Erro descoñecido</translation> + </message> +</context> +<context> + <name>QTDSDriver</name> + <message> + <source>Unable to open connection</source> + <translation>Non foi posíbel abrir a conexión</translation> + </message> + <message> + <source>Unable to use database</source> + <translation>Non foi posíbel empregar a base de datos</translation> + </message> +</context> +<context> + <name>QTcpServer</name> + <message> + <source>Operation on socket is not supported</source> + <translation>A operación no socket non está soportada</translation> + </message> +</context> +<context> + <name>QTextControl</name> + <message> + <source>&Undo</source> + <translation>&Desfacer</translation> + </message> + <message> + <source>&Redo</source> + <translation>&Refacer</translation> + </message> + <message> + <source>Cu&t</source> + <translation>Cor&tar</translation> + </message> + <message> + <source>&Copy</source> + <translation>&Copiar</translation> + </message> + <message> + <source>Copy &Link Location</source> + <translation>Copiar o &enderezo da ligazón</translation> + </message> + <message> + <source>&Paste</source> + <translation>A&pegar</translation> + </message> + <message> + <source>Delete</source> + <translation>Borrar</translation> + </message> + <message> + <source>Select All</source> + <translation>Escoller todo</translation> + </message> +</context> +<context> + <name>QUnicodeControlCharacterMenu</name> + <message> + <source>LRM Left-to-right mark</source> + <translation>LRM Marca de esquerda cara á dereita</translation> + </message> + <message> + <source>RLM Right-to-left mark</source> + <translation>RLM Marca de dereita cara á esquerda</translation> + </message> + <message> + <source>ZWJ Zero width joiner</source> + <translation>ZWJ Nexo de ancho nulo</translation> + </message> + <message> + <source>ZWNJ Zero width non-joiner</source> + <translation>ZWNJ Non-nexo de ancho nulo</translation> + </message> + <message> + <source>ZWSP Zero width space</source> + <translation>ZWSP Espazo de ancho nulo</translation> + </message> + <message> + <source>LRE Start of left-to-right embedding</source> + <translation>LRE Inicio de incrustación da esquerda cara á dereita</translation> + </message> + <message> + <source>RLE Start of right-to-left embedding</source> + <translation>RLE Inicio de incrustación da dereita cara á esquerda</translation> + </message> + <message> + <source>LRO Start of left-to-right override</source> + <translation>LRO Inicio de excepción de esquerda cara á dereita</translation> + </message> + <message> + <source>RLO Start of right-to-left override</source> + <translation>RLO Inicio de excepción de dereita cara á esquerda</translation> + </message> + <message> + <source>PDF Pop directional formatting</source> + <translation>PDF Sacar a formatación direccional</translation> + </message> + <message> + <source>Insert Unicode control character</source> + <translation>Inserir un carácter de control Unicode</translation> + </message> +</context> +<context> + <name>QUdpSocket</name> + <message> + <source>This platform does not support IPv6</source> + <translation>Esta plataforma non admite IPv6</translation> + </message> +</context> +<context> + <name>QUndoGroup</name> + <message> + <source>Undo</source> + <translation>Desfacer</translation> + </message> + <message> + <source>Redo</source> + <translation>Facer de novo</translation> + </message> +</context> +<context> + <name>QUndoModel</name> + <message> + <source><empty></source> + <translation><baleiro></translation> + </message> +</context> +<context> + <name>QUndoStack</name> + <message> + <source>Undo</source> + <translation>Desfacer</translation> + </message> + <message> + <source>Redo</source> + <translation>Facer de novo</translation> + </message> +</context> +<context> + <name>QWebFrame</name> + <message> + <source>Request cancelled</source> + <translation>Pedido cancelado</translation> + </message> + <message> + <source>Request blocked</source> + <translation>Pedido bloqueado</translation> + </message> + <message> + <source>Cannot show URL</source> + <translation>Non se pode mostrar o URL</translation> + </message> + <message> + <source>Frame load interrupted by policy change</source> + <translation>Interrompeuse a carga do marco por mor do troco de político</translation> + </message> + <message> + <source>Cannot show mimetype</source> + <translation>Non se pode mostrar o tipo mime</translation> + </message> + <message> + <source>File does not exist</source> + <translation>O ficheiro non existe</translation> + </message> +</context> +<context> + <name>QWebPage</name> + <message> + <source>Redirection limit reached</source> + <translation>Acadouse o límite de redireccións</translation> + </message> + <message> + <source>Bad HTTP request</source> + <translation>Pedido HTTP incorrecto</translation> + </message> + <message numerus="yes"> + <source>%n file(s)</source> + <comment>number of chosen file</comment> + <translation> + <numerusform>%n ficheiro</numerusform> + <numerusform>%n ficheiros</numerusform> + </translation> + </message> + <message> + <source>Submit</source> + <comment>default label for Submit buttons in forms on web pages</comment> + <translation>Enviar</translation> + </message> + <message> + <source>Submit</source> + <comment>Submit (input element) alt text for <input> elements with no alt, title, or value</comment> + <translation>Enviar</translation> + </message> + <message> + <source>Reset</source> + <comment>default label for Reset buttons in forms on web pages</comment> + <translation>Reiniciar</translation> + </message> + <message> + <source>This is a searchable index. Enter search keywords: </source> + <comment>text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index'</comment> + <translation>Este é un índice con capacidade de procura. Introduza as palabras chave da procura: </translation> + </message> + <message> + <source>Choose File</source> + <comment>title for file button used in HTML forms</comment> + <translation>Escoller un ficheiro</translation> + </message> + <message> + <source>No file selected</source> + <comment>text to display in file button used in HTML forms when no file is selected</comment> + <translation>Non escolleu ningún ficheiro</translation> + </message> + <message> + <source>Open in New Window</source> + <comment>Open in New Window context menu item</comment> + <translation>Abrir nunha fiestra nova</translation> + </message> + <message> + <source>Save Link...</source> + <comment>Download Linked File context menu item</comment> + <translation>Gardar o ligado...</translation> + </message> + <message> + <source>Copy Link</source> + <comment>Copy Link context menu item</comment> + <translation>Copiar a ligazón</translation> + </message> + <message> + <source>Open Image</source> + <comment>Open Image in New Window context menu item</comment> + <translation>Abrir a imaxe</translation> + </message> + <message> + <source>Save Image</source> + <comment>Download Image context menu item</comment> + <translation>Gardar a imaxe</translation> + </message> + <message> + <source>Copy Image</source> + <comment>Copy Link context menu item</comment> + <translation>Copiar a imaxe</translation> + </message> + <message> + <source>Open Frame</source> + <comment>Open Frame in New Window context menu item</comment> + <translation>Abrir o marco</translation> + </message> + <message> + <source>Copy</source> + <comment>Copy context menu item</comment> + <translation>Copiar</translation> + </message> + <message> + <source>Go Back</source> + <comment>Back context menu item</comment> + <translation>Atrás</translation> + </message> + <message> + <source>Go Forward</source> + <comment>Forward context menu item</comment> + <translation>Adiante</translation> + </message> + <message> + <source>Stop</source> + <comment>Stop context menu item</comment> + <translation>Deter</translation> + </message> + <message> + <source>Reload</source> + <comment>Reload context menu item</comment> + <translation>Cargar de novo</translation> + </message> + <message> + <source>Cut</source> + <comment>Cut context menu item</comment> + <translation>Cortar</translation> + </message> + <message> + <source>Paste</source> + <comment>Paste context menu item</comment> + <translation>Apegar</translation> + </message> + <message> + <source>No Guesses Found</source> + <comment>No Guesses Found context menu item</comment> + <translation>Non se acharon conxecturas</translation> + </message> + <message> + <source>Ignore</source> + <comment>Ignore Spelling context menu item</comment> + <translation>Ignorar</translation> + </message> + <message> + <source>Add To Dictionary</source> + <comment>Learn Spelling context menu item</comment> + <translation>Engadir ao dicionario</translation> + </message> + <message> + <source>Search The Web</source> + <comment>Search The Web context menu item</comment> + <translation>Procurar na web</translation> + </message> + <message> + <source>Look Up In Dictionary</source> + <comment>Look Up in Dictionary context menu item</comment> + <translation>Procurar no dicionario</translation> + </message> + <message> + <source>Open Link</source> + <comment>Open Link context menu item</comment> + <translation>Abrir a ligazón</translation> + </message> + <message> + <source>Ignore</source> + <comment>Ignore Grammar context menu item</comment> + <translation>Ignorar</translation> + </message> + <message> + <source>Spelling</source> + <comment>Spelling and Grammar context sub-menu item</comment> + <translation>Ortografía</translation> + </message> + <message> + <source>Show Spelling and Grammar</source> + <comment>menu item title</comment> + <translation>Mostrar a ortografía e a gramática</translation> + </message> + <message> + <source>Hide Spelling and Grammar</source> + <comment>menu item title</comment> + <translation>Acochar a ortografía e a gramática</translation> + </message> + <message> + <source>Check Spelling</source> + <comment>Check spelling context menu item</comment> + <translation>Verificar a ortografía</translation> + </message> + <message> + <source>Check Spelling While Typing</source> + <comment>Check spelling while typing context menu item</comment> + <translation>Verificar a ortografía mentres se escribe</translation> + </message> + <message> + <source>Check Grammar With Spelling</source> + <comment>Check grammar with spelling context menu item</comment> + <translation>Verificar a gramática mentres se escribe</translation> + </message> + <message> + <source>Fonts</source> + <comment>Font context sub-menu item</comment> + <translation>Tipos de letra</translation> + </message> + <message> + <source>Bold</source> + <comment>Bold context menu item</comment> + <translation>Negriña</translation> + </message> + <message> + <source>Italic</source> + <comment>Italic context menu item</comment> + <translation>Cursiva</translation> + </message> + <message> + <source>Underline</source> + <comment>Underline context menu item</comment> + <translation>Subliñado</translation> + </message> + <message> + <source>Outline</source> + <comment>Outline context menu item</comment> + <translation>Contorno</translation> + </message> + <message> + <source>Direction</source> + <comment>Writing direction context sub-menu item</comment> + <translation>Dirección</translation> + </message> + <message> + <source>Text Direction</source> + <comment>Text direction context sub-menu item</comment> + <translation>Dirección do texto</translation> + </message> + <message> + <source>Default</source> + <comment>Default writing direction context menu item</comment> + <translation>Predeterminada</translation> + </message> + <message> + <source>Left to Right</source> + <comment>Left to Right context menu item</comment> + <translation>Da esquerda á dereita</translation> + </message> + <message> + <source>Right to Left</source> + <comment>Right to Left context menu item</comment> + <translation>Da dereita á esquerda</translation> + </message> + <message> + <source>Inspect</source> + <comment>Inspect Element context menu item</comment> + <translation>Inspeccionar</translation> + </message> + <message> + <source>No recent searches</source> + <comment>Label for only item in menu that appears when clicking on the search field image, when no searches have been performed</comment> + <translation>Non se procurou nada</translation> + </message> + <message> + <source>Recent searches</source> + <comment>label for first item in the menu that appears when clicking on the search field image, used as embedded menu title</comment> + <translation>Procuras recentes</translation> + </message> + <message> + <source>Clear recent searches</source> + <comment>menu item in Recent Searches menu that empties menu's contents</comment> + <translation>Limpar as procuras recentes</translation> + </message> + <message> + <source>Missing Plug-in</source> + <comment>Label text to be used when a plug-in is missing</comment> + <translation>Falta a extensión</translation> + </message> + <message> + <source>Unknown</source> + <comment>Unknown filesize FTP directory listing item</comment> + <translation>Descoñecido</translation> + </message> + <message> + <source>%1 (%2x%3 pixels)</source> + <comment>Title string for images</comment> + <translation>%1 (%2x%3 píxeles)</translation> + </message> + <message> + <source>Loading...</source> + <comment>Media controller status message when the media is loading</comment> + <translation>Estase a cargar...</translation> + </message> + <message> + <source>Live Broadcast</source> + <comment>Media controller status message when watching a live broadcast</comment> + <translation>Retransmisión ao vivo</translation> + </message> + <message> + <source>Audio Element</source> + <comment>Media controller element</comment> + <translation>Elemento de son</translation> + </message> + <message> + <source>Video Element</source> + <comment>Media controller element</comment> + <translation>Elemento de video</translation> + </message> + <message> + <source>Mute Button</source> + <comment>Media controller element</comment> + <translation>Botón de silenciar</translation> + </message> + <message> + <source>Unmute Button</source> + <comment>Media controller element</comment> + <translation>Botón de quitar o silencio</translation> + </message> + <message> + <source>Play Button</source> + <comment>Media controller element</comment> + <translation>Botón de reproducir</translation> + </message> + <message> + <source>Pause Button</source> + <comment>Media controller element</comment> + <translation>Botón de pausar</translation> + </message> + <message> + <source>Slider</source> + <comment>Media controller element</comment> + <translation>Barra deslizante</translation> + </message> + <message> + <source>Slider Thumb</source> + <comment>Media controller element</comment> + <translation>Barra deslizante con miniaturas</translation> + </message> + <message> + <source>Rewind Button</source> + <comment>Media controller element</comment> + <translation>Botón de rebobinar</translation> + </message> + <message> + <source>Return to Real-time Button</source> + <comment>Media controller element</comment> + <translation>Botón de voltar ao tempo-real</translation> + </message> + <message> + <source>Elapsed Time</source> + <comment>Media controller element</comment> + <translation>Tempo transcorrido</translation> + </message> + <message> + <source>Remaining Time</source> + <comment>Media controller element</comment> + <translation>Tempo a faltar</translation> + </message> + <message> + <source>Status Display</source> + <comment>Media controller element</comment> + <translation>Visor do estado</translation> + </message> + <message> + <source>Fullscreen Button</source> + <comment>Media controller element</comment> + <translation>Botón de pantalla completa</translation> + </message> + <message> + <source>Seek Forward Button</source> + <comment>Media controller element</comment> + <translation>Botón de procura cara diante</translation> + </message> + <message> + <source>Seek Back Button</source> + <comment>Media controller element</comment> + <translation>Botón de procura cara atrás</translation> + </message> + <message> + <source>Audio element playback controls and status display</source> + <comment>Media controller element</comment> + <translation>Visor dos controles da reprodución do elemento de son e do estado</translation> + </message> + <message> + <source>Video element playback controls and status display</source> + <comment>Media controller element</comment> + <translation>Visor dos controles da reprodución do elemento de imaxe e do estado</translation> + </message> + <message> + <source>Mute audio tracks</source> + <comment>Media controller element</comment> + <translation>Silenciar as pistas de son</translation> + </message> + <message> + <source>Unmute audio tracks</source> + <comment>Media controller element</comment> + <translation>Desilenciar as pistas de son</translation> + </message> + <message> + <source>Begin playback</source> + <comment>Media controller element</comment> + <translation>Comeza a reprodución</translation> + </message> + <message> + <source>Pause playback</source> + <comment>Media controller element</comment> + <translation>Pór a reprodución en pausa</translation> + </message> + <message> + <source>Movie time scrubber</source> + <comment>Media controller element</comment> + <translation>Cursor do filme</translation> + </message> + <message> + <source>Movie time scrubber thumb</source> + <comment>Media controller element</comment> + <translation>Minuatura do cursor de posición do filme</translation> + </message> + <message> + <source>Rewind movie</source> + <comment>Media controller element</comment> + <translation>Rebobinar o filme</translation> + </message> + <message> + <source>Return streaming movie to real-time</source> + <comment>Media controller element</comment> + <translation>Voltar a tempo-real o filme en retransmisión</translation> + </message> + <message> + <source>Current movie time</source> + <comment>Media controller element</comment> + <translation>Momento actual do filme</translation> + </message> + <message> + <source>Remaining movie time</source> + <comment>Media controller element</comment> + <translation>Tempo a faltar do filme</translation> + </message> + <message> + <source>Current movie status</source> + <comment>Media controller element</comment> + <translation>Estado actual do filme</translation> + </message> + <message> + <source>Play movie in full-screen mode</source> + <comment>Media controller element</comment> + <translation>Reproducir o filme no modo a pantalla completa</translation> + </message> + <message> + <source>Seek quickly back</source> + <comment>Media controller element</comment> + <translation>Procurar cara atrás rapidamente</translation> + </message> + <message> + <source>Seek quickly forward</source> + <comment>Media controller element</comment> + <translation>Procurar cara diante rapidamente</translation> + </message> + <message> + <source>Indefinite time</source> + <comment>Media time description</comment> + <translation>Duración indefinida</translation> + </message> + <message> + <source>%1 days %2 hours %3 minutes %4 seconds</source> + <comment>Media time description</comment> + <translation>%1 días %2 horas %3 minutos %4 segundos</translation> + </message> + <message> + <source>%1 hours %2 minutes %3 seconds</source> + <comment>Media time description</comment> + <translation>%1 horas %2 minutos %3 segundos</translation> + </message> + <message> + <source>%1 minutes %2 seconds</source> + <comment>Media time description</comment> + <translation>%1 minutos %2 segundos</translation> + </message> + <message> + <source>%1 seconds</source> + <comment>Media time description</comment> + <translation>%1 segundos</translation> + </message> + <message> + <source>Scroll here</source> + <translation>Desprazar cara aquí</translation> + </message> + <message> + <source>Left edge</source> + <translation>Borde esquerdo</translation> + </message> + <message> + <source>Top</source> + <translation>Cume</translation> + </message> + <message> + <source>Right edge</source> + <translation>Borde dereito</translation> + </message> + <message> + <source>Bottom</source> + <translation>Fondo</translation> + </message> + <message> + <source>Page left</source> + <translation>Páxina á esquerda</translation> + </message> + <message> + <source>Page up</source> + <translation>Páxina en riba</translation> + </message> + <message> + <source>Page right</source> + <translation>Páxina á dereita</translation> + </message> + <message> + <source>Page down</source> + <translation>Páxina en baixo</translation> + </message> + <message> + <source>Scroll left</source> + <translation>Desprazar cara á esquerda</translation> + </message> + <message> + <source>Scroll up</source> + <translation>Desprazar cara arriba</translation> + </message> + <message> + <source>Scroll right</source> + <translation>Desprazar cara á dereita</translation> + </message> + <message> + <source>Scroll down</source> + <translation>Desprazar cara abaixo</translation> + </message> + <message> + <source>JavaScript Alert - %1</source> + <translation>Alerta de JavaScript: %1</translation> + </message> + <message> + <source>JavaScript Confirm - %1</source> + <translation>Confirmación de JavaScript: %1</translation> + </message> + <message> + <source>JavaScript Prompt - %1</source> + <translation>Pregunta de JavaScript: %1</translation> + </message> + <message> + <source>JavaScript Problem - %1</source> + <translation>Problema de JavaScript: %1</translation> + </message> + <message> + <source>The script on this page appears to have a problem. Do you want to stop the script?</source> + <translation>Parece que o script nesta páxina ten problemas. Desexa detelo?</translation> + </message> + <message> + <source>Move the cursor to the next character</source> + <translation>Mover o cursor ao seguinte carácter</translation> + </message> + <message> + <source>Move the cursor to the previous character</source> + <translation>Mover o cursor ao anterior carácter</translation> + </message> + <message> + <source>Move the cursor to the next word</source> + <translation>Mover o cursor á seguinte palabra</translation> + </message> + <message> + <source>Move the cursor to the previous word</source> + <translation>Mover o cursor á palabra anterior</translation> + </message> + <message> + <source>Move the cursor to the next line</source> + <translation>Mover o cursor á seguinte liña</translation> + </message> + <message> + <source>Move the cursor to the previous line</source> + <translation>Mover o cursor á liña anterior</translation> + </message> + <message> + <source>Move the cursor to the start of the line</source> + <translation>Mover o cursor ao comezo da liña</translation> + </message> + <message> + <source>Move the cursor to the end of the line</source> + <translation>Mover o cursor ao final da liña</translation> + </message> + <message> + <source>Move the cursor to the start of the block</source> + <translation>Mover o cursor ao comezo do bloque</translation> + </message> + <message> + <source>Move the cursor to the end of the block</source> + <translation>Mover o cursor ao final do bloque</translation> + </message> + <message> + <source>Move the cursor to the start of the document</source> + <translation>Mover o cursor ao comezo do documento</translation> + </message> + <message> + <source>Move the cursor to the end of the document</source> + <translation>Mover o cursor ao final do documento</translation> + </message> + <message> + <source>Select all</source> + <translation>Escoller todo</translation> + </message> + <message> + <source>Select to the next character</source> + <translation>Escoller até o seguinte carácter</translation> + </message> + <message> + <source>Select to the previous character</source> + <translation>Escoller até o anterior carácter</translation> + </message> + <message> + <source>Select to the next word</source> + <translation>Escoller até a seguinte palabra</translation> + </message> + <message> + <source>Select to the previous word</source> + <translation>Escoller até a anterior palabra</translation> + </message> + <message> + <source>Select to the next line</source> + <translation>Escoller até a seguinte liña</translation> + </message> + <message> + <source>Select to the previous line</source> + <translation>Escoller até a liña anterior</translation> + </message> + <message> + <source>Select to the start of the line</source> + <translation>Escoller até o comezo da liña</translation> + </message> + <message> + <source>Select to the end of the line</source> + <translation>Escoller até o final da liña</translation> + </message> + <message> + <source>Select to the start of the block</source> + <translation>Escoller até o comezo do bloque</translation> + </message> + <message> + <source>Select to the end of the block</source> + <translation>Escoller até o final do bloque</translation> + </message> + <message> + <source>Select to the start of the document</source> + <translation>Escoller até o comezo do documento</translation> + </message> + <message> + <source>Select to the end of the document</source> + <translation>Escoller até o final do documento</translation> + </message> + <message> + <source>Delete to the start of the word</source> + <translation>Escoller até o comezo da palabra</translation> + </message> + <message> + <source>Delete to the end of the word</source> + <translation>Borrar até o final da palabra</translation> + </message> + <message> + <source>Insert a new paragraph</source> + <translation>Inserir un parágrafo novo</translation> + </message> + <message> + <source>Insert a new line</source> + <translation>Inserir unha liña nova</translation> + </message> + <message> + <source>Paste and Match Style</source> + <translation>Estilo de apegar e casar</translation> + </message> + <message> + <source>Remove formatting</source> + <translation>Eliminar o formatado</translation> + </message> + <message> + <source>Strikethrough</source> + <translation>Riscada</translation> + </message> + <message> + <source>Subscript</source> + <translation>Subíndice</translation> + </message> + <message> + <source>Superscript</source> + <translation>Superíndice</translation> + </message> + <message> + <source>Insert Bulleted List</source> + <translation>Inserir unha lista con viñetas</translation> + </message> + <message> + <source>Insert Numbered List</source> + <translation>Inserir unha lista numerada</translation> + </message> + <message> + <source>Indent</source> + <translation>Sangrar</translation> + </message> + <message> + <source>Outdent</source> + <translation>Quitar sangría</translation> + </message> + <message> + <source>Center</source> + <translation>Centro</translation> + </message> + <message> + <source>Justify</source> + <translation>Xustificado</translation> + </message> + <message> + <source>Align Left</source> + <translation>Aliñar á esquerda</translation> + </message> + <message> + <source>Align Right</source> + <translation>Aliñar á dereita</translation> + </message> + <message> + <source>Web Inspector - %2</source> + <translation>Inspector de webs: %2</translation> + </message> +</context> +<context> + <name>QWhatsThisAction</name> + <message> + <source>What's This?</source> + <translation>Que é isto?</translation> + </message> +</context> +<context> + <name>QWidget</name> + <message> + <source>*</source> + <translation>*</translation> + </message> +</context> +<context> + <name>QWizard</name> + <message> + <source>Go Back</source> + <translation>Atrás</translation> + </message> + <message> + <source>< &Back</source> + <translation>< &Anterior</translation> + </message> + <message> + <source>Continue</source> + <translation>Continuar</translation> + </message> + <message> + <source>&Next</source> + <translation>&Seguinte</translation> + </message> + <message> + <source>&Next ></source> + <translation>&Seguinte ></translation> + </message> + <message> + <source>Commit</source> + <translation>Entregar</translation> + </message> + <message> + <source>Done</source> + <translation>Feito</translation> + </message> + <message> + <source>&Finish</source> + <translation>&Finalizar</translation> + </message> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <source>Help</source> + <translation>Axuda</translation> + </message> + <message> + <source>&Help</source> + <translation>&Axuda</translation> + </message> +</context> +<context> + <name>QWorkspace</name> + <message> + <source>Close</source> + <translation>Pechar</translation> + </message> + <message> + <source>Minimize</source> + <translation>Minimizar</translation> + </message> + <message> + <source>Restore Down</source> + <translation>Restaurar para abaixo</translation> + </message> + <message> + <source>&Restore</source> + <translation>&Restaurar</translation> + </message> + <message> + <source>&Move</source> + <translation>&Mover</translation> + </message> + <message> + <source>&Size</source> + <translation>&Tamaño</translation> + </message> + <message> + <source>Mi&nimize</source> + <translation>Mi&nimizar</translation> + </message> + <message> + <source>Ma&ximize</source> + <translation>Ma&ximizar</translation> + </message> + <message> + <source>&Close</source> + <translation>&Pechar</translation> + </message> + <message> + <source>Stay on &Top</source> + <translation>Manter &enriba</translation> + </message> + <message> + <source>Sh&ade</source> + <translation>&Repregar</translation> + </message> + <message> + <source>%1 - [%2]</source> + <translation>%1 - [%2]</translation> + </message> + <message> + <source>&Unshade</source> + <translation>&Despregar</translation> + </message> +</context> +<context> + <name>QXml</name> + <message> + <source>no error occurred</source> + <translation>non aconteceu ningún erro</translation> + </message> + <message> + <source>error triggered by consumer</source> + <translation>erro lanzado polo consumidor</translation> + </message> + <message> + <source>unexpected end of file</source> + <translation>fin inesperada do ficheiro</translation> + </message> + <message> + <source>more than one document type definition</source> + <translation>máis dunha definición do tipo de documento</translation> + </message> + <message> + <source>error occurred while parsing element</source> + <translation>aconteceu un erro ao interpretar o elemento</translation> + </message> + <message> + <source>tag mismatch</source> + <translation>desemparellamento de etiqueta</translation> + </message> + <message> + <source>error occurred while parsing content</source> + <translation>aconteceu un erro ao interpretar o contido</translation> + </message> + <message> + <source>unexpected character</source> + <translation>carácter inesperado</translation> + </message> + <message> + <source>invalid name for processing instruction</source> + <translation>nome non válido para procesar a instrución</translation> + </message> + <message> + <source>version expected while reading the XML declaration</source> + <translation>agardábase unha versión ao ler a declaración XML</translation> + </message> + <message> + <source>wrong value for standalone declaration</source> + <translation>valor incorrecto da declaración senlleira</translation> + </message> + <message> + <source>encoding declaration or standalone declaration expected while reading the XML declaration</source> + <translation>agardábase unha declaración de codificación ou unha declaración autónoma ao ler a declaración XML</translation> + </message> + <message> + <source>standalone declaration expected while reading the XML declaration</source> + <translation>agardábase unha declaración autónoma ao ler a declaración XML</translation> + </message> + <message> + <source>error occurred while parsing document type definition</source> + <translation>aconteceu un erro mentres se interpretaba a definición do tipo de documento</translation> + </message> + <message> + <source>letter is expected</source> + <translation>agárdase unha letra</translation> + </message> + <message> + <source>error occurred while parsing comment</source> + <translation>aconteceu erro mentres se interpretaba o comentario</translation> + </message> + <message> + <source>error occurred while parsing reference</source> + <translation>aconteceu un erro mentres se interpretaba a referencia</translation> + </message> + <message> + <source>internal general entity reference not allowed in DTD</source> + <translation>non se permiten referencias á entidade xeral interna no DTD</translation> + </message> + <message> + <source>external parsed general entity reference not allowed in attribute value</source> + <translation>non se permiten referencias a unha entidade xeral externa procesada no valor do atributo</translation> + </message> + <message> + <source>external parsed general entity reference not allowed in DTD</source> + <translation>non se permiten referencias a unha entidade xeral externa procesada no DTD</translation> + </message> + <message> + <source>unparsed entity reference in wrong context</source> + <translation>aparece un referencia a unha entidade non procesada no contexto errado</translation> + </message> + <message> + <source>recursive entities</source> + <translation>entidades recursivas</translation> + </message> + <message> + <source>error in the text declaration of an external entity</source> + <translation>erro na declaración de texto dunha entidade externa</translation> + </message> +</context> +<context> + <name>QXmlPatternistCLI</name> + <message> + <source>Warning in %1, at line %2, column %3: %4</source> + <translation>Aviso en %1, na liña %2 e columna %3: %4</translation> + </message> + <message> + <source>Warning in %1: %2</source> + <translation>Aviso en %1: %2</translation> + </message> + <message> + <source>Unknown location</source> + <translation>Lugar descoñecido</translation> + </message> + <message> + <source>Error %1 in %2, at line %3, column %4: %5</source> + <translation>Erro %1 en %2, na liña %3 e columna %4: %5</translation> + </message> + <message> + <source>Error %1 in %2: %3</source> + <translation>Aconteceu %1 en %2: %3</translation> + </message> +</context> +<context> + <name>QXmlStream</name> + <message> + <source>Extra content at end of document.</source> + <translation>Contido adicional na fin do documento.</translation> + </message> + <message> + <source>Invalid entity value.</source> + <translation>O valor da entidade non é válido.</translation> + </message> + <message> + <source>Invalid XML character.</source> + <translation>O carácter XML non é válido.</translation> + </message> + <message> + <source>Sequence ']]>' not allowed in content.</source> + <translation>Non se permite a secuencia «]]>» no contido.</translation> + </message> + <message> + <source>Encountered incorrectly encoded content.</source> + <translation>Atopouse contido codificado incorrectamente.</translation> + </message> + <message> + <source>Namespace prefix '%1' not declared</source> + <translation>Prefixo de espazo de nomes «%1» non declarado</translation> + </message> + <message> + <source>Illegal namespace declaration.</source> + <translation>Declaración ilegal de espazo de nomes.</translation> + </message> + <message> + <source>Attribute redefined.</source> + <translation>Atributo definido de novo.</translation> + </message> + <message> + <source>Unexpected character '%1' in public id literal.</source> + <translation>Carácter «%1» inesperado no texto público de identidade.</translation> + </message> + <message> + <source>Invalid XML version string.</source> + <translation>Cadea de versión do XML non válida.</translation> + </message> + <message> + <source>Unsupported XML version.</source> + <translation>Versión de XML non soportada.</translation> + </message> + <message> + <source>The standalone pseudo attribute must appear after the encoding.</source> + <translation>O pseudo atributo de autonomía debe aparecer após a codificación.</translation> + </message> + <message> + <source>%1 is an invalid encoding name.</source> + <translation>%1 non é un nome de codificación válido.</translation> + </message> + <message> + <source>Encoding %1 is unsupported</source> + <translation>A codificación %1 non está soportada</translation> + </message> + <message> + <source>Standalone accepts only yes or no.</source> + <translation>O atributo de autonomía só acepta «yes» ou «no».</translation> + </message> + <message> + <source>Invalid attribute in XML declaration.</source> + <translation>Atributo non válido na declaración XML.</translation> + </message> + <message> + <source>Premature end of document.</source> + <translation>Fin prematuro do documento.</translation> + </message> + <message> + <source>Invalid document.</source> + <translation>Documento non válido.</translation> + </message> + <message> + <source>Expected </source> + <translation>Agardábase</translation> + </message> + <message> + <source>, but got '</source> + <translation>, pero obtívose «</translation> + </message> + <message> + <source>Unexpected '</source> + <translation>Non se agardaba « </translation> + </message> + <message> + <source>Expected character data.</source> + <translation>Agardábanse datos de carácter.</translation> + </message> + <message> + <source>Recursive entity detected.</source> + <translation>Detectouse unha entidade recursiva.</translation> + </message> + <message> + <source>Start tag expected.</source> + <translation>Agardábase unha etiquera de inicio.</translation> + </message> + <message> + <source>NDATA in parameter entity declaration.</source> + <translation>NDATA na declaración da entidade parámetro.</translation> + </message> + <message> + <source>XML declaration not at start of document.</source> + <translation>Declaración XML non no inicio do documento.</translation> + </message> + <message> + <source>%1 is an invalid processing instruction name.</source> + <translation>%1 é un nome non válido de intrucción de procesamento.</translation> + </message> + <message> + <source>Invalid processing instruction name.</source> + <translation>Nome non válido de instrución de procesamento.</translation> + </message> + <message> + <source>%1 is an invalid PUBLIC identifier.</source> + <translation>%1 é un identificador PUBLICO non válido.</translation> + </message> + <message> + <source>Invalid XML name.</source> + <translation>Nome XML non válido.</translation> + </message> + <message> + <source>Opening and ending tag mismatch.</source> + <translation>As etiquetas de apertura e peche está desemparelladas.</translation> + </message> + <message> + <source>Entity '%1' not declared.</source> + <translation>A entidade «%1» non está declarada.</translation> + </message> + <message> + <source>Reference to unparsed entity '%1'.</source> + <translation>Referencia a unha entidade «%1» non procesada.</translation> + </message> + <message> + <source>Reference to external entity '%1' in attribute value.</source> + <translation>Referencia a unha entidade externa «%1» no valor do atributo.</translation> + </message> + <message> + <source>Invalid character reference.</source> + <translation>Referencia a un caracter non válido.</translation> + </message> +</context> +<context> + <name>QtXmlPatterns</name> + <message> + <source>%1 is an unsupported encoding.</source> + <translation>A codificación %1 non está soportada.</translation> + </message> + <message> + <source>%1 contains octets which are disallowed in the requested encoding %2.</source> + <translation>%1 contén octetos que non están permitidos na codificación pedida, %2.</translation> + </message> + <message> + <source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source> + <translation>O código %1, que aparece en %2 coa codificación %3 non é un carácter XML válido.</translation> + </message> + <message> + <source>Network timeout.</source> + <translation>A rede esgotou o tempo-límite.</translation> + </message> + <message> + <source>Element %1 can't be serialized because it appears outside the document element.</source> + <translation>O elemento %1 non pode ser serializado porque aparece fora do elemento documento.</translation> + </message> + <message> + <source>Attribute %1 can't be serialized because it appears at the top level.</source> + <translation>O atributo %1 non pode ser serializado porque aparece no nivel máximo.</translation> + </message> + <message> + <source>Year %1 is invalid because it begins with %2.</source> + <translation>O ano %1 non é válido porque comeza con %2.</translation> + </message> + <message> + <source>Day %1 is outside the range %2..%3.</source> + <translation>O día %1 está fora do rango %2..%3.</translation> + </message> + <message> + <source>Month %1 is outside the range %2..%3.</source> + <translation>O mes %1 está fora do rango %2..%3.</translation> + </message> + <message> + <source>Overflow: Can't represent date %1.</source> + <translation>Desbordamento: Non é posíbel representar a data %1.</translation> + </message> + <message> + <source>Day %1 is invalid for month %2.</source> + <translation>O día %1 non é válido para o mes %2.</translation> + </message> + <message> + <source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source> + <translation>A hora 24:%1:%2.%3 non é válida. A hora é 24, pero os minutos, segundos e milisegundos non son todos 0; </translation> + </message> + <message> + <source>Time %1:%2:%3.%4 is invalid.</source> + <translation>A hora %1:%2:%3.%4 non é válida.</translation> + </message> + <message> + <source>Overflow: Date can't be represented.</source> + <translation>Desbordamento: Non se pode representar a data.</translation> + </message> + <message> + <source>At least one component must be present.</source> + <translation>Debe estar presente polo menos unha compoñente.</translation> + </message> + <message> + <source>At least one time component must appear after the %1-delimiter.</source> + <translation>Debe aparecer cando menos unha compoñente de tempo tras o delimitador %1.</translation> + </message> + <message> + <source>%1 is not a valid value of type %2.</source> + <translation>%1 non é un valor válido do tipo %2.</translation> + </message> + <message> + <source>When casting to %1 from %2, the source value cannot be %3.</source> + <translation>Cando se converte de %1 para %2 o valor de orixe non pode ser %3.</translation> + </message> + <message> + <source>Integer division (%1) by zero (%2) is undefined.</source> + <translation>A división de enteiros (%1) por cero (%2) non está definida.</translation> + </message> + <message> + <source>Division (%1) by zero (%2) is undefined.</source> + <translation>A división (%1) por cero (%2) non está definida.</translation> + </message> + <message> + <source>Modulus division (%1) by zero (%2) is undefined.</source> + <translation>A división modular (%1) por cero (%2) non está definida.</translation> + </message> + <message> + <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source> + <translation>Non se permite dividir un valor do tipo %1 por %2 (non número).</translation> + </message> + <message> + <source>Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.</source> + <translation>Non se permite dividir un valor do tipo %1 por %2 nin por %3 (máis ou menos cero).</translation> + </message> + <message> + <source>Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.</source> + <translation>Non se permite multiplicar un valor do tipo %1 por %2 nin por %3 (máis ou menos infinito).</translation> + </message> + <message> + <source>A value of type %1 cannot have an Effective Boolean Value.</source> + <translation>Un valor do tipo %1 non pode ter un Valor Booleano Efectivo.</translation> + </message> + <message> + <source>Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.</source> + <translation>Non pode calcularse o Valor Booleano Efectivo dunha secuencia que contén dous ou máis valores atómicos.</translation> + </message> + <message> + <source>Value %1 of type %2 exceeds maximum (%3).</source> + <translation>O valor %1 do tipo %2 supera o máximo (%3).</translation> + </message> + <message> + <source>Value %1 of type %2 is below minimum (%3).</source> + <translation>O valor %1 do tipo %2 é menor que o mínimo (%3).</translation> + </message> + <message> + <source>A value of type %1 must contain an even number of digits. The value %2 does not.</source> + <translation>Un valor do tipo %1 debe conter un número par de díxitos. O valor %2 non o ten.</translation> + </message> + <message> + <source>%1 is not valid as a value of type %2.</source> + <translation>%1 non é valido como valor do tipo %2.</translation> + </message> + <message> + <source>Ambiguous rule match.</source> + <translation>Coincidencia de regra ambigua.</translation> + </message> + <message> + <source>Operator %1 cannot be used on type %2.</source> + <translation>O operador %1 non pode ser usado co tipo %2.</translation> + </message> + <message> + <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source> + <translation>O operador %1 non pode ser usado en valores atómicos dos tipos %2 nin %3.</translation> + </message> + <message> + <source>The namespace URI in the name for a computed attribute cannot be %1.</source> + <translation>A URI dun espazo de nomes no nome dun atributo calculado non pode ser %1.</translation> + </message> + <message> + <source>The name for a computed attribute cannot have the namespace URI %1 with the local name %2.</source> + <translation>O nome dun atributo calculado non pode ter a URI %1 de espazo de nomes co nome local %2.</translation> + </message> + <message> + <source>Type error in cast, expected %1, received %2.</source> + <translation>Aconteceu un erro de tipo na conversión, agardábase %1, recibiuse %2.</translation> + </message> + <message> + <source>When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.</source> + <translation>Cando se convertía a %1 ou a un tipo derivado deste, o valor de orixe debe ser do mesmo tipo, ou debe ser unha cadea de texto. Non se permite o tipo %2.</translation> + </message> + <message> + <source>A comment cannot contain %1</source> + <translation>Un comentario non pode conter %1</translation> + </message> + <message> + <source>A comment cannot end with a %1.</source> + <translation>Un comentario non pode rematar cun %1.</translation> + </message> + <message> + <source>In a namespace constructor, the value for a namespace cannot be an empty string.</source> + <translation>O valor do espazo de nomes nun construtor de espazos de nome non pode ser unha cadea en branco.</translation> + </message> + <message> + <source>The prefix must be a valid %1, which %2 is not.</source> + <translation>O prefixo debe ser un %1 válido por valor, e %2 non o é.</translation> + </message> + <message> + <source>The prefix %1 cannot be bound.</source> + <translation>Non foi posíbel vincular o prefixo %1.</translation> + </message> + <message> + <source>Only the prefix %1 can be bound to %2 and vice versa.</source> + <translation>O prefixo %1 só pode estar vinculado a %2 e viceversa.</translation> + </message> + <message> + <source>An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.</source> + <translation>Un nodo atributo non pode ser un fillo dun nodo documento. Polo tanto, o atributo %1 está fora de sitio.</translation> + </message> + <message> + <source>A library module cannot be evaluated directly. It must be imported from a main module.</source> + <translation>Non pode avaliarse directamente un módulo de biblioteca. Debe ser importada desde un módulo principal.</translation> + </message> + <message> + <source>No template by name %1 exists.</source> + <translation>Non hai ningún modelo chamado %1.</translation> + </message> + <message> + <source>A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.</source> + <translation>Os valores do tipo %1 non poden ser predicados. Un predicado debe ter ou tipo numérico ou Valor Booleano Efectivo.</translation> + </message> + <message> + <source>A positional predicate must evaluate to a single numeric value.</source> + <translation>Un predicado posicional debe avaliarse a un único valor numérico.</translation> + </message> + <message> + <source>The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.</source> + <translation>O último paso nunha rota debe conter ou nodos ou valores atómicos. Non pode ser unha mistura dos dous.</translation> + </message> + <message> + <source>The data of a processing instruction cannot contain the string %1</source> + <translation>Os datos dunha instrución de procesamento non poden conter a cadea %1</translation> + </message> + <message> + <source>No namespace binding exists for the prefix %1</source> + <translation>Non existe ningunha asociación cun espazo de nomes para o prefixo %1</translation> + </message> + <message> + <source>No namespace binding exists for the prefix %1 in %2</source> + <translation>Non existe ningunha asociación cun espazo de nomes para o prefixo %1 en %2</translation> + </message> + <message> + <source>%1 is an invalid %2</source> + <translation>%1 non é un %2 válido</translation> + </message> + <message> + <source>The parameter %1 is passed, but no corresponding %2 exists.</source> + <translation>Pasouse o parámetro %1, pero non existe o %2 correspondente.</translation> + </message> + <message> + <source>The parameter %1 is required, but no corresponding %2 is supplied.</source> + <translation>Requírese o parámetro %1, pero non se forneceu o %2 que lle corresponde.</translation> + </message> + <message numerus="yes"> + <source>%1 takes at most %n argument(s). %2 is therefore invalid.</source> + <translation> + <numerusform>%1 leva como moito %n argumento, polo que %2 non é válido.</numerusform> + <numerusform>%1 leva como moito %n argumentos, polo que %2 non é válido.</numerusform> + </translation> + </message> + <message numerus="yes"> + <source>%1 requires at least %n argument(s). %2 is therefore invalid.</source> + <translation> + <numerusform>%1 require polo menos %n argumento, polo que %2 non é valido.</numerusform> + <numerusform>%1 require polo menos %n argumentos, polo que %2 non é válido.</numerusform> + </translation> + </message> + <message> + <source>The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.</source> + <translation>O primeiro argumento de %1 non pode ser do tipo %2. Debe ser un tipo numérico, xs:yearMonthDuration ou xs:dayTimeDuration.</translation> + </message> + <message> + <source>The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source> + <translation>O primeiro argumento de %1 non pode ser do tipo %2. Debe ser de tipo %3, %4 ou %5.</translation> + </message> + <message> + <source>The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source> + <translation>O segundo argumento de %1 non pode ser do tipo %2. Debe ser de tipo %3, %4 ou %5.</translation> + </message> + <message> + <source>%1 is not a valid XML 1.0 character.</source> + <translation>%1 non é un carácter válido de XML 1.0.</translation> + </message> + <message> + <source>The root node of the second argument to function %1 must be a document node. %2 is not a document node.</source> + <translation>O nodo raíz do segundo argumento da función %1 debe ser un nodo documento. %2 non é un nodo documento.</translation> + </message> + <message> + <source>If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.</source> + <translation>Se ambos os dous valores teñen desprazamentos de zona, deben ter o mesmo. %1 e %2 non son iguais.</translation> + </message> + <message> + <source>%1 was called.</source> + <translation>Chamouse a %1.</translation> + </message> + <message> + <source>%1 must be followed by %2 or %3, not at the end of the replacement string.</source> + <translation type="unfinished">%1 debe estar seguido por %2 ou %3, non na fin da cadea substituta.</translation> + </message> + <message> + <source>In the replacement string, %1 must be followed by at least one digit when not escaped.</source> + <translation type="unfinished">Na cadea substituta, %1 debe ir seguido de cando menos un díxito cando non +estea escapada.</translation> + </message> + <message> + <source>In the replacement string, %1 can only be used to escape itself or %2, not %3</source> + <translation type="unfinished">Na cadea substituta, %1 só pode ser usado para escaparse a si mesmo ou %2, +non %3.</translation> + </message> + <message> + <source>%1 matches newline characters</source> + <translation type="unfinished">%1 casa con caracteres de nova liña</translation> + </message> + <message> + <source>%1 and %2 match the start and end of a line.</source> + <translation type="unfinished">%1 e %2 casan con comezo e fin de liña</translation> + </message> + <message> + <source>Matches are case insensitive</source> + <translation type="unfinished">As concordancias non son sensíbeis á capitalización</translation> + </message> + <message> + <source>Whitespace characters are removed, except when they appear in character classes</source> + <translation type="unfinished">Os espazos en branco son eliminados, excepto se aparecen en clases de +caracteres</translation> + </message> + <message> + <source>%1 is an invalid regular expression pattern: %2</source> + <translation type="unfinished">%1 é un padrón non válido de expresión regular: %2</translation> + </message> + <message> + <source>%1 is an invalid flag for regular expressions. Valid flags are:</source> + <translation type="unfinished">%1 é unha bandeira non válida de expresión regular. As valedoiras son:</translation> + </message> + <message> + <source>If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.</source> + <translation type="unfinished">Se o primeiro argumento é a secuencia baleira ou unha cadea de lonxitude +cero (sen espazo de nomes), non se pode especificar un prefixo. +Especificouse o prefixo %1.</translation> + </message> + <message> + <source>It will not be possible to retrieve %1.</source> + <translation type="unfinished">Non será posíbel acadar %1.</translation> + </message> + <message> + <source>The default collection is undefined</source> + <translation type="unfinished">Non se definiu a colección predeterminada.</translation> + </message> + <message> + <source>%1 cannot be retrieved</source> + <translation type="unfinished">Non é posíbel acadar %1</translation> + </message> + <message> + <source>The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).</source> + <translation type="unfinished">A forma de normalización %1 non está soportada. As formas soportadas son %2, +%3, %4, %5 e ningunha, i.e. a cadea en branco (sen normalización).</translation> + </message> + <message> + <source>A zone offset must be in the range %1..%2 inclusive. %3 is out of range.</source> + <translation type="unfinished">O desprazamento de zona debe estar no intervalo %1..%2 inclusive. %3 está +fora de intervalo.</translation> + </message> + <message> + <source>%1 is not a whole number of minutes.</source> + <translation type="unfinished">%1 non é un número absoluto de minutos.</translation> + </message> + <message> + <source>The URI cannot have a fragment</source> + <translation type="unfinished">A URI non pode ter un anaco</translation> + </message> + <message> + <source>Required cardinality is %1; got cardinality %2.</source> + <translation type="unfinished">A cardinalidade requirida é %1; obtívose a cardinalidade %2.</translation> + </message> + <message> + <source>The item %1 did not match the required type %2.</source> + <translation type="unfinished">O ítem %1 non é do tipo requirido %2.</translation> + </message> + <message> + <source>The variable %1 is unused</source> + <translation type="unfinished">A variábel %1 non é usada</translation> + </message> + <message> + <source>W3C XML Schema identity constraint selector</source> + <translation type="unfinished">Selector de restrición de identidade do esquema XML do W3C</translation> + </message> + <message> + <source>W3C XML Schema identity constraint field</source> + <translation type="unfinished">Campo de restrición de identidade do esquema XML do W3C</translation> + </message> + <message> + <source>A construct was encountered which is disallowed in the current language(%1).</source> + <translation type="unfinished">Atopouse unha construción que non está permitida na linguaxe actual (%1).</translation> + </message> + <message> + <source>%1 is an unknown schema type.</source> + <translation type="unfinished">%1 é un tipo de esquema descoñecido.</translation> + </message> + <message> + <source>A template with name %1 has already been declared.</source> + <translation type="unfinished">Xa se declarou un modelo co nome %1.</translation> + </message> + <message> + <source>%1 is not a valid numeric literal.</source> + <translation type="unfinished">%1 non é un texto numérico válido.</translation> + </message> + <message> + <source>Only one %1 declaration can occur in the query prolog.</source> + <translation type="unfinished">Só pode haber unha declaración de %1 no prólogo da procura.</translation> + </message> + <message> + <source>The initialization of variable %1 depends on itself</source> + <translation type="unfinished">A inicialización da variábel %1 depende de si mesma</translation> + </message> + <message> + <source>No variable with name %1 exists</source> + <translation type="unfinished">Non hai ningunha variábel chamada %1</translation> + </message> + <message> + <source>Version %1 is not supported. The supported XQuery version is 1.0.</source> + <translation type="unfinished">Non está soportada a versión %1. A versión soportada de XQuery é a 1.0.</translation> + </message> + <message> + <source>The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.</source> + <translation type="unfinished">A codificación %1 non é válida. Só debe conter caracteres Latinos, non pode +conter espazos, e debe casar coa expresión regular %2.</translation> + </message> + <message> + <source>No function with signature %1 is available</source> + <translation type="unfinished">Non está dispoñíbel ningunha función coa sinatura %1</translation> + </message> + <message> + <source>A default namespace declaration must occur before function, variable, and option declarations.</source> + <translation type="unfinished">Debe haber unha declaración dun espazo de nomes predeterminado antes das +declaracións de funcións, variábeis e opcións.</translation> + </message> + <message> + <source>Namespace declarations must occur before function, variable, and option declarations.</source> + <translation type="unfinished">Debe haber declaracións dun espazo de nomes antes das declaracións de +funcións, variábeis e opcións.</translation> + </message> + <message> + <source>Module imports must occur before function, variable, and option declarations.</source> + <translation type="unfinished">As importacións de módulos deben estar antes das declaracións de funcións, +variábeis e opcións.</translation> + </message> + <message> + <source>The keyword %1 cannot occur with any other mode name.</source> + <translation type="unfinished">A palabra-chave %1 só pode aparecer con calquera outro nome de modo.</translation> + </message> + <message> + <source>The value of attribute %1 must be of type %2, which %3 isn't.</source> + <translation type="unfinished">O valor do atributo %1 debe ser do tipo %2 e %3 non o é.</translation> + </message> + <message> + <source>It is not possible to redeclare prefix %1.</source> + <translation type="unfinished">Non é posíbel declarar de novo o prefixo %1.</translation> + </message> + <message> + <source>The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.</source> + <translation type="unfinished">Non foi posíbel atopar o prefixo %1. Por omisión, xa está vinculado co +espazo de nomes %2.</translation> + </message> + <message> + <source>Prefix %1 is already declared in the prolog.</source> + <translation type="unfinished">O prefixo %1 xa está declarado no prólogo.</translation> + </message> + <message> + <source>The name of an option must have a prefix. There is no default namespace for options.</source> + <translation type="unfinished">O nome dunha opción debe ter un prefixo. Non hai un espazo de nomes +predeterminado para as opcións.</translation> + </message> + <message> + <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source> + <translation type="unfinished">A funcionalidade de Importación de Esquema non está soportada, polo tanto +non pode haber declaracións %1.</translation> + </message> + <message> + <source>The target namespace of a %1 cannot be empty.</source> + <translation type="unfinished">O espazo de nomes de destino dun %1 non pode estar en branco.</translation> + </message> + <message> + <source>The module import feature is not supported</source> + <translation type="unfinished">A funcionalidade de importación de módulos non está soportada</translation> + </message> + <message> + <source>A variable with name %1 has already been declared.</source> + <translation type="unfinished">Xa foi declarada unha variábel co nome %1.</translation> + </message> + <message> + <source>No value is available for the external variable with name %1.</source> + <translation type="unfinished">Non se dispón de ningún valor para a variábel externa chamada %1.</translation> + </message> + <message> + <source>A stylesheet function must have a prefixed name.</source> + <translation type="unfinished">As funcións de folla de estilo deben ter un nome con prefixo.</translation> + </message> + <message> + <source>The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)</source> + <translation type="unfinished">O espazo de nomes das funcións definidas polo usuario non pode estar en +branco (probe co prefixo predefinido %1, que está para casos como este)</translation> + </message> + <message> + <source>The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.</source> + <translation type="unfinished">O espazo de nomes %1 está reservado; polo tanto as funcións definidas polo +usuario non poden usalo. Ténteo co prefixo predefinido %2, que está para +casos como este.</translation> + </message> + <message> + <source>The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2</source> + <translation type="unfinished">O espazo de nomes dunha función definida polo usuario nun módulo de +biblioteca debe ser equivalente ao espazo de nomes do módulo. Con outras +verbas: debe ser %1 no canto de %2</translation> + </message> + <message> + <source>A function already exists with the signature %1.</source> + <translation type="unfinished">Xa existe unha función coa sinatura %1.</translation> + </message> + <message> + <source>No external functions are supported. All supported functions can be used directly, without first declaring them as external</source> + <translation type="unfinished">Non se soportan as funcións externas. Todas as funcións soportadas poden ser +usadas directamente, non fai falla declaralas como externas</translation> + </message> + <message> + <source>An argument with name %1 has already been declared. Every argument name must be unique.</source> + <translation type="unfinished">Xa foi declarado un argumento co nome %1. O nome de cada argumento debe ser +único.</translation> + </message> + <message> + <source>When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.</source> + <translation type="unfinished">Cando se emprega unha función %1 para procurar nun patrón, o argumento debe +ser unha referencia variábel ou unha cadea literal.</translation> + </message> + <message> + <source>In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.</source> + <translation type="unfinished">Nun patrón XSL-T, o primeiro argumento da función %1 cando sexa empregada +para facer procuras debe ser unha cadea de texto.</translation> + </message> + <message> + <source>In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching.</source> + <translation type="unfinished">Nun patrón XSL-T, o primeiro argumento da función %1 cando sexa empregada +para facer procuras debe ser unha cadea de texto ou unha referencia variábel.</translation> + </message> + <message> + <source>In an XSL-T pattern, function %1 cannot have a third argument.</source> + <translation type="unfinished">Nun patrón XSL-T, a función %1 non pode ter un terceiro argumento.</translation> + </message> + <message> + <source>In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.</source> + <translation type="unfinished">Nun patrón XSL-T, só pode empregar para procuras as funcións %1 e %2, non a % +3.</translation> + </message> + <message> + <source>In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.</source> + <translation type="unfinished">Nun patrón XSL-T non pode empregarse o eixo %1, só os %2 e %3.</translation> + </message> + <message> + <source>%1 is an invalid template mode name.</source> + <translation type="unfinished">%1 non é un nome de modo válido do modelo.</translation> + </message> + <message> + <source>The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.</source> + <translation type="unfinished">O nome dunha variábel asociada a unha expresión for debe ser diferente da +variábel posicional. Por isto, as dúas variábeis chamadas %1 chocan.</translation> + </message> + <message> + <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source> + <translation type="unfinished">Non está soportada a funcionalidade de Validación do Esquema. Polo tanto, as +expresións %1 non poden ser usadas.</translation> + </message> + <message> + <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source> + <translation type="unfinished">Non está soportada ningunha das expresións pragma. Polo tanto, debe haber +presente unha expresión de reserva</translation> + </message> + <message> + <source>Each name of a template parameter must be unique; %1 is duplicated.</source> + <translation type="unfinished">Os nomes dos parámetros do modelo deben ser únicos, %1 está duplicado.</translation> + </message> + <message> + <source>The %1-axis is unsupported in XQuery</source> + <translation type="unfinished">Non está soportado o eixo %1 en XQuery</translation> + </message> + <message> + <source>No function with name %1 is available.</source> + <translation type="unfinished">Non hai ningunha función chamada %1.</translation> + </message> + <message> + <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source> + <translation type="unfinished">A URI do espazo de nomes non pode ser unha cadea valeira cando se estexa a +asociar cun prefixo, %1.</translation> + </message> + <message> + <source>%1 is an invalid namespace URI.</source> + <translation type="unfinished">%1 non é unha URI válida de espazo de nomes.</translation> + </message> + <message> + <source>It is not possible to bind to the prefix %1</source> + <translation type="unfinished">Non é posíbel asociar co prefixo %1</translation> + </message> + <message> + <source>Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).</source> + <translation type="unfinished">O espazo de nomes %1 só pode estar vinculado a %2 (e está, en calquera caso, +predeclarado).</translation> + </message> + <message> + <source>Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).</source> + <translation type="unfinished">O prefixo %1 só pode estar vinculado a %2 (e está, en calquera caso, +predeclarado).</translation> + </message> + <message> + <source>Two namespace declaration attributes have the same name: %1.</source> + <translation type="unfinished">Dous atributos na declaración dun espazo de nomes teñen o mesmo nome: %1.</translation> + </message> + <message> + <source>The namespace URI must be a constant and cannot use enclosed expressions.</source> + <translation type="unfinished">A URI do espazo de nomes debe ser constante e non pode conter expresións.</translation> + </message> + <message> + <source>An attribute with name %1 has already appeared on this element.</source> + <translation type="unfinished">Xa apareceu un atributo co nome %1 neste elemento.</translation> + </message> + <message> + <source>A direct element constructor is not well-formed. %1 is ended with %2.</source> + <translation type="unfinished">Hai un construtor directo dun elemento que non está ben formado. %1 remata +con %2.</translation> + </message> + <message> + <source>The name %1 does not refer to any schema type.</source> + <translation type="unfinished">O nome %1 non se refire a ningún tipo de esquema.</translation> + </message> + <message> + <source>%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.</source> + <translation type="unfinished">%1 é un tipo complexo. Non é posíbel converter a tipos complexos. Porén, si +que pode converter a tipos atómicos como %2.</translation> + </message> + <message> + <source>%1 is not an atomic type. Casting is only possible to atomic types.</source> + <translation type="unfinished">%1 non é un tipo atómico. Só é posíbel converter a tipos atómicos.</translation> + </message> + <message> + <source>%1 is not a valid name for a processing-instruction.</source> + <translation type="unfinished">%1 non é un nome válido para unha instrución de procesamento.</translation> + </message> + <message> + <source>%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.</source> + <translation type="unfinished">%1 non está nas declaracións de atributos ao alcance. Lembre que non está +soportada a funcionalidade de importación de esquemas.</translation> + </message> + <message> + <source>The name of an extension expression must be in a namespace.</source> + <translation type="unfinished">O nome dunha expresión de extensión debe estar nun espazo de nomes.</translation> + </message> + <message> + <source>Element %1 is not allowed at this location.</source> + <translation type="unfinished">Neste lugar non se permite o elemento %1.</translation> + </message> + <message> + <source>Text nodes are not allowed at this location.</source> + <translation type="unfinished">Neste lugar non se permiten nodos de texto.</translation> + </message> + <message> + <source>Parse error: %1</source> + <translation type="unfinished">Erro de procesamento: %1</translation> + </message> + <message> + <source>The value of the XSL-T version attribute must be a value of type %1, which %2 isn't.</source> + <translation type="unfinished">O valor do atributo da versión de XSL-T debe ser un valor do tipo %1, e %2 +non o é.</translation> + </message> + <message> + <source>Running an XSL-T 1.0 stylesheet with a 2.0 processor.</source> + <translation type="unfinished">A executar unha folla de estilos XSL-T 1.0 cun procesador 2.0.</translation> + </message> + <message> + <source>Unknown XSL-T attribute %1.</source> + <translation type="unfinished">Non se coñece o atributo XSL-T %1.</translation> + </message> + <message> + <source>Attribute %1 and %2 are mutually exclusive.</source> + <translation type="unfinished">Os atributos %1 e %2 exclúense mutuamente.</translation> + </message> + <message> + <source>In a simplified stylesheet module, attribute %1 must be present.</source> + <translation type="unfinished">Nun módulo de folla de estilos simplificada debe estar presente o atributo % +1.</translation> + </message> + <message> + <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source> + <translation type="unfinished">Se o elemento %1 non ten o atributo %2 non pode ter os atributos %3 nin %4.</translation> + </message> + <message> + <source>Element %1 must have at least one of the attributes %2 or %3.</source> + <translation type="unfinished">O elemento %1 debe ter polo menos un dos atributos %2 ou %3.</translation> + </message> + <message> + <source>At least one mode must be specified in the %1-attribute on element %2.</source> + <translation type="unfinished">Debe especificarse polo menos un modo no atributo %1 do elemento %2.</translation> + </message> + <message> + <source>Element %1 must come last.</source> + <translation type="unfinished">O elemento %1 debe ir o último.</translation> + </message> + <message> + <source>At least one %1-element must occur before %2.</source> + <translation type="unfinished">Debe estar presente polo menos un elemento %1 antes de %2.</translation> + </message> + <message> + <source>Only one %1-element can appear.</source> + <translation type="unfinished">Só pode aparecer un elemento %1.</translation> + </message> + <message> + <source>At least one %1-element must occur inside %2.</source> + <translation type="unfinished">Debe estar presente polo menos un elemento %1 dentro de %2.</translation> + </message> + <message> + <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source> + <translation type="unfinished">Non se pode empregar un construtor de secuencia cando o atributo %1 está +presente en %2.</translation> + </message> + <message> + <source>Element %1 must have either a %2-attribute or a sequence constructor.</source> + <translation type="unfinished">O elemento %1 debe ter ou un atributo %2 ou un construtor de secuencia.</translation> + </message> + <message> + <source>When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.</source> + <translation type="unfinished">Non se pode subministrar un valor predeterminado mediante un atributo %1 nin +un construtor de secuencia cando se require un parámetro.</translation> + </message> + <message> + <source>Element %1 cannot have children.</source> + <translation type="unfinished">O elemento %1 non pode ter fillos.</translation> + </message> + <message> + <source>Element %1 cannot have a sequence constructor.</source> + <translation type="unfinished">O elemento %1 non pode ter un construtor de secuencia.</translation> + </message> + <message> + <source>The attribute %1 cannot appear on %2, when it is a child of %3.</source> + <translation type="unfinished">O atributo %1 non pode aparecer en %2 cando é filla de %3.</translation> + </message> + <message> + <source>A parameter in a function cannot be declared to be a tunnel.</source> + <translation type="unfinished">Non se pode declarar como túnel un parámetro nunha función.</translation> + </message> + <message> + <source>This processor is not Schema-aware and therefore %1 cannot be used.</source> + <translation type="unfinished">Este procesador non é coñecedor do Schema e polo tanto %1 non pode +empregarse.</translation> + </message> + <message> + <source>Top level stylesheet elements must be in a non-null namespace, which %1 isn't.</source> + <translation type="unfinished">Os elementos da folla de estilo de máximo nivel debe estar nun espazo de +nomes non nulo, e %1 non o é.</translation> + </message> + <message> + <source>The value for attribute %1 on element %2 must either be %3 or %4, not %5.</source> + <translation type="unfinished">O valor do atributo %1 no elemento %2 debe ser %3 ou %4, non %5.</translation> + </message> + <message> + <source>Attribute %1 cannot have the value %2.</source> + <translation type="unfinished">O atributo %1 non pode ter o valor %2.</translation> + </message> + <message> + <source>The attribute %1 can only appear on the first %2 element.</source> + <translation type="unfinished">O atributo %1 só pode aparecer no primeiro elemento %2.</translation> + </message> + <message> + <source>At least one %1 element must appear as child of %2.</source> + <translation type="unfinished">Debe aparecer cando menos un elemento %1 como fillo de %2.</translation> + </message> + <message> + <source>Empty particle cannot be derived from non-empty particle.</source> + <translation type="unfinished">Unha partícula baleira non pode derivarse dunha non baleira.</translation> + </message> + <message> + <source>Derived particle is missing element %1.</source> + <translation type="unfinished">Na partícula derivada falta o elemento %1.</translation> + </message> + <message> + <source>Derived element %1 is missing value constraint as defined in base particle.</source> + <translation type="unfinished">No elemento derivado %1 falta a restrición aos valores definida na partícula +de base.</translation> + </message> + <message> + <source>Derived element %1 has weaker value constraint than base particle.</source> + <translation type="unfinished">O elemento derivado %1 ten unha restrición aos valores máis feble do que a +da súa partícula de base.</translation> + </message> + <message> + <source>Fixed value constraint of element %1 differs from value constraint in base particle.</source> + <translation type="unfinished">A restrición de valor fixo do elemento %1 é diferente da de valor da +partícula base.</translation> + </message> + <message> + <source>Derived element %1 cannot be nillable as base element is not nillable.</source> + <translation type="unfinished">O elemento derivado %1 non se pode anular porque o elemento de base non se +pode anular.</translation> + </message> + <message> + <source>Block constraints of derived element %1 must not be more weaker than in the base element.</source> + <translation type="unfinished">O bloque de restricións do elemento derivado %1 non pode ser máis feble do +que son as do elemento de base.</translation> + </message> + <message> + <source>Simple type of derived element %1 cannot be validly derived from base element.</source> + <translation type="unfinished">O tipo simple do elemento derivado %1 non se pode derivar con validez a +partir do elemento de base.</translation> + </message> + <message> + <source>Complex type of derived element %1 cannot be validly derived from base element.</source> + <translation type="unfinished">O tipo complexo do elemento derivado %1 non se pode derivar con validez a +partir do elemento de base.</translation> + </message> + <message> + <source>Element %1 is missing in derived particle.</source> + <translation type="unfinished">Falta o elemento %1 na partícula derivada.</translation> + </message> + <message> + <source>Element %1 does not match namespace constraint of wildcard in base particle.</source> + <translation type="unfinished">O elemento %1 non casa coa restrición do espazo de nomes de comodín na +partícula de base.</translation> + </message> + <message> + <source>Wildcard in derived particle is not a valid subset of wildcard in base particle.</source> + <translation type="unfinished">O comodín da partícula derivada non é un subconxunto válido do da partícula +de base.</translation> + </message> + <message> + <source>processContent of wildcard in derived particle is weaker than wildcard in base particle.</source> + <translation type="unfinished">O processContent do comodín na partícula derivada é máis feble que o do +comodín na partícula de base.</translation> + </message> + <message> + <source>Derived particle allows content that is not allowed in the base particle.</source> + <translation type="unfinished">A partícula derivada permite contido non permitido na partícula de base.</translation> + </message> + <message> + <source>%1 has inheritance loop in its base type %2.</source> + <translation type="unfinished">%1 ten un bucle de herdanza no seu tipo base %2.</translation> + </message> + <message> + <source>Circular inheritance of base type %1.</source> + <translation type="unfinished">Herdanza circular do tipo de base %1.</translation> + </message> + <message> + <source>Circular inheritance of union %1.</source> + <translation type="unfinished">Herdanza circular da unión %1.</translation> + </message> + <message> + <source>%1 is not allowed to derive from %2 by restriction as the latter defines it as final.</source> + <translation type="unfinished">Non se permite que %1 derive de %2 debido a unha restrición xa que o este +defíneo como final.</translation> + </message> + <message> + <source>%1 is not allowed to derive from %2 by extension as the latter defines it as final.</source> + <translation type="unfinished">Non se permite que %1 derive de %2 por extensión debido a unha restrición xa +que o este defíneo como final.</translation> + </message> + <message> + <source>Base type of simple type %1 cannot be complex type %2.</source> + <translation type="unfinished">O tipo base do tipo simple %1 non pode ser do tipo complexo %2.</translation> + </message> + <message> + <source>Simple type %1 cannot have direct base type %2.</source> + <translation type="unfinished">O tipo simple %1 non pode ter unha base directa do tipo %2.</translation> + </message> + <message> + <source>Simple type %1 is not allowed to have base type %2.</source> + <translation type="unfinished">Ao tipo simple %1 non se lle permite ter unha base do tipo %2.</translation> + </message> + <message> + <source>Simple type %1 can only have simple atomic type as base type.</source> + <translation type="unfinished">O tipo simple %1 só pode ter un tipo atómico simple como tipo de base.</translation> + </message> + <message> + <source>Simple type %1 cannot derive from %2 as the latter defines restriction as final.</source> + <translation type="unfinished">O tipo simple %1 non pode derivar do %2 xa que este define a restrición como +final.</translation> + </message> + <message> + <source>Variety of item type of %1 must be either atomic or union.</source> + <translation type="unfinished">A variedade do tipo de elemento de %1 debe ser ou ou atómico ou unión.</translation> + </message> + <message> + <source>Variety of member types of %1 must be atomic.</source> + <translation type="unfinished">A variedade dos tipos membro de %1 debe sen atómica.</translation> + </message> + <message> + <source>%1 is not allowed to derive from %2 by list as the latter defines it as final.</source> + <translation type="unfinished">Non se permite que %1 derive de %2 por lista xa que esta defínea como final.</translation> + </message> + <message> + <source>Simple type %1 is only allowed to have %2 facet.</source> + <translation type="unfinished">Só se permite que o tipo simple %1 teña a faceta %2.</translation> + </message> + <message> + <source>Base type of simple type %1 must have variety of type list.</source> + <translation type="unfinished">O tipo base do tipo simple %1 debe ser variedade do tipo lista.</translation> + </message> + <message> + <source>Base type of simple type %1 has defined derivation by restriction as final.</source> + <translation type="unfinished">O tipo base do tipo simple %1 definiu a derivación por restrición como final.</translation> + </message> + <message> + <source>Item type of base type does not match item type of %1.</source> + <translation type="unfinished">O tipo de elemento do tipo de base non casa co tipo de elemento de %1.</translation> + </message> + <message> + <source>Simple type %1 contains not allowed facet type %2.</source> + <translation type="unfinished">O tipo simple %1 contén unha faceta non permitida do tipo %2.</translation> + </message> + <message> + <source>%1 is not allowed to derive from %2 by union as the latter defines it as final.</source> + <translation type="unfinished">Non se permite que %1 derive de %2 por unión xa que este defínea como final.</translation> + </message> + <message> + <source>%1 is not allowed to have any facets.</source> + <translation type="unfinished">%1 non pode ter ningunha faceta.</translation> + </message> + <message> + <source>Base type %1 of simple type %2 must have variety of union.</source> + <translation type="unfinished">O tipo de base %1 do tipo simple %2 debe ser unha variedade de unión.</translation> + </message> + <message> + <source>Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.</source> + <translation type="unfinished">Non se permite que o tipo base %1 do tipo simple %2 teña restrición no +atributo %3.</translation> + </message> + <message> + <source>Member type %1 cannot be derived from member type %2 of %3's base type %4.</source> + <translation type="unfinished">O tipo membro %1 non se pode derivar do tipo membro %2 do tipo base %4 de %3.</translation> + </message> + <message> + <source>Derivation method of %1 must be extension because the base type %2 is a simple type.</source> + <translation type="unfinished">O método de derivación de %1 debe ser por extensión porque o tipo base %2 é +un tipo simple.</translation> + </message> + <message> + <source>Complex type %1 has duplicated element %2 in its content model.</source> + <translation type="unfinished">O tipo complexo %1 contén por duplicado o elemento %2 no seu modelo de +contido.</translation> + </message> + <message> + <source>Complex type %1 has non-deterministic content.</source> + <translation type="unfinished">O tipo complexo %1 ten contido non determinista.</translation> + </message> + <message> + <source>Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.</source> + <translation type="unfinished">Os atributos do tipo complexo %1 non son unha extensión válida dos atributos +do tipo base %2: %3.</translation> + </message> + <message> + <source>Content model of complex type %1 is not a valid extension of content model of %2.</source> + <translation type="unfinished">O modelo de contido do tipo complexo %1 non é unha extensión válida do +modelo de contido de %2.</translation> + </message> + <message> + <source>Complex type %1 must have simple content.</source> + <translation type="unfinished">O tipo complexo %1 debe ter contido simple.</translation> + </message> + <message> + <source>Complex type %1 must have the same simple type as its base class %2.</source> + <translation type="unfinished">O tipo complexo %1 debe ter o mesmo tipo simple que a súa clase de base %2.</translation> + </message> + <message> + <source>Complex type %1 cannot be derived from base type %2%3.</source> + <translation type="unfinished">O tipo complexo %1 non pode derivarse do tipo de base %2%3.</translation> + </message> + <message> + <source>Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.</source> + <translation type="unfinished">Os atributos do tipo complexo %1 non son unha restrición válida baseada nos +atributos do tipo base %2: %3.</translation> + </message> + <message> + <source>Complex type %1 with simple content cannot be derived from complex base type %2.</source> + <translation type="unfinished">O tipo complexo %1 con contido simple non se pode derivar do tipo de base +complexo %2.</translation> + </message> + <message> + <source>Item type of simple type %1 cannot be a complex type.</source> + <translation type="unfinished">O tipo de elemento do tipo simple %1 non pode ser un tipo complexo.</translation> + </message> + <message> + <source>Member type of simple type %1 cannot be a complex type.</source> + <translation type="unfinished">O tipo membro do tipo simple %1 non pode ser un tipo complexo.</translation> + </message> + <message> + <source>%1 is not allowed to have a member type with the same name as itself.</source> + <translation type="unfinished">Non se permite que %1 teña un tipo membro co mesmo nome ca el.</translation> + </message> + <message> + <source>%1 facet collides with %2 facet.</source> + <translation type="unfinished">A faceta %1 entra en conflito doa %2.</translation> + </message> + <message> + <source>%1 facet must have the same value as %2 facet of base type.</source> + <translation type="unfinished">A faceta %1 debe ter o mesmo valor que a %2 do tipo de base.</translation> + </message> + <message> + <source>%1 facet must be equal or greater than %2 facet of base type.</source> + <translation type="unfinished">A faceta %1 debe ser maior ou igual que a %2 do tipo de base.</translation> + </message> + <message> + <source>%1 facet must be less than or equal to %2 facet of base type.</source> + <translation type="unfinished">A faceta %1 debe ser menor que ou igual que a %2 do tipo de base.</translation> + </message> + <message> + <source>%1 facet contains invalid regular expression</source> + <translation type="unfinished">A faceta %1 contén unha expresión regular non válida</translation> + </message> + <message> + <source>Unknown notation %1 used in %2 facet.</source> + <translation type="unfinished">Empregouse a notación non válida %1 na faceta %2.</translation> + </message> + <message> + <source>%1 facet contains invalid value %2: %3.</source> + <translation type="unfinished">A faceta %1 contén o valor non válido %2: %3.</translation> + </message> + <message> + <source>%1 facet cannot be %2 or %3 if %4 facet of base type is %5.</source> + <translation type="unfinished">A faceta %1 non pode ser %2 nin %3 se a faceta %4 do tipo de base é %5.</translation> + </message> + <message> + <source>%1 facet cannot be %2 if %3 facet of base type is %4.</source> + <translation type="unfinished">A faceta %1 non pode ser %2 se a faceta %3 do tipo de base é %4.</translation> + </message> + <message> + <source>%1 facet must be less than or equal to %2 facet.</source> + <translation type="unfinished">A faceta %1 debe ser menor que ou igual que a %2.</translation> + </message> + <message> + <source>%1 facet must be less than %2 facet of base type.</source> + <translation type="unfinished">A faceta %1 debe ser menor que a faceta %2 do tipo de base.</translation> + </message> + <message> + <source>%1 facet and %2 facet cannot appear together.</source> + <translation type="unfinished">As facetas %1 e %2 non poden aparecer xuntas.</translation> + </message> + <message> + <source>%1 facet must be greater than %2 facet of base type.</source> + <translation type="unfinished">A faceta %1 debe ser maior que a faceta %2 do tipo de base.</translation> + </message> + <message> + <source>%1 facet must be less than %2 facet.</source> + <translation type="unfinished">A faceta %1 debe ser menor que a %2.</translation> + </message> + <message> + <source>%1 facet must be greater than or equal to %2 facet of base type.</source> + <translation type="unfinished">A faceta %1 deber ser maior ou igual que a faceta %2 do tipo de base.</translation> + </message> + <message> + <source>Simple type contains not allowed facet %1.</source> + <translation type="unfinished">O tipo simple contén a faceta non permitida %1.</translation> + </message> + <message> + <source>%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.</source> + <translation type="unfinished">As facetas %1, %2, %3, %4, %5 e %6 non están permitidas cando se deriva por +lista.</translation> + </message> + <message> + <source>Only %1 and %2 facets are allowed when derived by union.</source> + <translation type="unfinished">Só se permiten as facetas %1 e %2 cando se deriva por unión.</translation> + </message> + <message> + <source>%1 contains %2 facet with invalid data: %3.</source> + <translation type="unfinished">%1 contén a faceta %2 con datos non válidos: %3.</translation> + </message> + <message> + <source>Attribute group %1 contains attribute %2 twice.</source> + <translation type="unfinished">O grupo de atributos %1 contén o atributo %2 dúas veces.</translation> + </message> + <message> + <source>Attribute group %1 contains two different attributes that both have types derived from %2.</source> + <translation type="unfinished">O grupo de atributos %1 contén dous atributos diferentes con tipos derivados +de %2</translation> + </message> + <message> + <source>Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.</source> + <translation type="unfinished">O grupo de atributos %1 contén o atributo %2, que ten restrición de valores +pero un tipo que herda de %3.</translation> + </message> + <message> + <source>Complex type %1 contains attribute %2 twice.</source> + <translation type="unfinished">O tipo complexo %1 contén o atributo %2 dúas veces.</translation> + </message> + <message> + <source>Complex type %1 contains two different attributes that both have types derived from %2.</source> + <translation type="unfinished">O tipo complexo %1 contén dous atributos diferentes con tipos derivados de %2.</translation> + </message> + <message> + <source>Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.</source> + <translation type="unfinished">O tipo complexo %1 contén o atributo %2, que ten restrición de valores pero +un tipo que herda de %3.</translation> + </message> + <message> + <source>Element %1 is not allowed to have a value constraint if its base type is complex.</source> + <translation type="unfinished">O elemento %1 non se lle permite ter unha restrición de valores se o seu tipo +de base +é complexo.</translation> + </message> + <message> + <source>Element %1 is not allowed to have a value constraint if its type is derived from %2.</source> + <translation type="unfinished">O elemento %1 non se lle permite ter unha restrición de valores se o seu tipo +deriva de %2.</translation> + </message> + <message> + <source>Value constraint of element %1 is not of elements type: %2.</source> + <translation type="unfinished">A restrición aos valores do elemento %1 non é do tipo elementos: %2.</translation> + </message> + <message> + <source>Element %1 is not allowed to have substitution group affiliation as it is no global element.</source> + <translation type="unfinished">Non se permite que o elemento %1 teña afiliación a grupo de substitución xa +que +non é un elemento global.</translation> + </message> + <message> + <source>Type of element %1 cannot be derived from type of substitution group affiliation.</source> + <translation type="unfinished">O tipo do elemento %1 non pode derivarse do tipo de afiliación ao grupo de +substitución.</translation> + </message> + <message> + <source>Value constraint of attribute %1 is not of attributes type: %2.</source> + <translation type="unfinished">A restrición aos valores do atributo %1 non é ao tipo do atributo: %2.</translation> + </message> + <message> + <source>Attribute %1 has value constraint but has type derived from %2.</source> + <translation type="unfinished">O atributo %1 ten restrición de valores pero ten tipo derivado de %2.</translation> + </message> + <message> + <source>%1 attribute in derived complex type must be %2 like in base type.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute %1 in derived complex type must have %2 value constraint like in base type.</source> + <translation type="unfinished">O atributo %1 do tipo complexo derivado debe ter unha restrición de valores +%2 +como no tipo de base.</translation> + </message> + <message> + <source>Attribute %1 in derived complex type must have the same %2 value constraint like in base type.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute %1 in derived complex type must have %2 value constraint.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>processContent of base wildcard must be weaker than derived wildcard.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 exists twice with different types.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Particle contains non-deterministic wildcards.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Base attribute %1 is required but derived attribute is not.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Type of derived attribute %1 cannot be validly derived from type of base attribute.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Value constraint of derived attribute %1 does not match value constraint of base attribute.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Derived attribute %1 does not exist in the base definition.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Derived attribute %1 does not match the wildcard in the base definition.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Base attribute %1 is required but missing in derived definition.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Derived definition contains an %1 element that does not exists in the base definition</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Derived wildcard is not a subset of the base wildcard.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 of derived wildcard is not a valid restriction of %2 of base wildcard</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute %1 from base type is missing in derived type.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Type of derived attribute %1 differs from type of base attribute.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Base definition contains an %1 element that is missing in the derived definition</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Can not process unknown element %1, expected elements are: %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 is not allowed in this scope, possible elements are: %2.</source> + <translation type="unfinished">Non se permite o elemento %1 neste ámbito, os elementos posíbeis son: %2.</translation> + </message> + <message> + <source>Child element is missing in that scope, possible child elements are: %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Document is not a XML schema.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 attribute of %2 element contains invalid content: {%3}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element is not allowed to have the same %2 attribute value as the target namespace %3.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element without %2 attribute is not allowed inside schema without target namespace.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element is not allowed inside %2 element if %3 attribute is present.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element has neither %2 attribute nor %3 child element.</source> + <translation type="unfinished">O elemento %1 non ten nin o atributo %2 nin o elemento fillo %3.</translation> + </message> + <message> + <source>%1 element with %2 child element must not have a %3 attribute.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 attribute of %2 element must be %3 or %4.</source> + <translation type="unfinished">O atributo %1 do elemento %2 debe ser %3 ou %4.</translation> + </message> + <message> + <source>%1 attribute of %2 element must have a value of %3.</source> + <translation type="unfinished">O atributo %1 do elemento %2 debe ter un valor de %3.</translation> + </message> + <message> + <source>%1 attribute of %2 element must have a value of %3 or %4.</source> + <translation type="unfinished">O atributo %1 do elemento %2 debe ter un valor de %3 ou %4.</translation> + </message> + <message> + <source>%1 element must not have %2 and %3 attribute together.</source> + <translation type="unfinished">O elemento %1 non debe ter á vez os atributos %2 e %3.</translation> + </message> + <message> + <source>Content of %1 attribute of %2 element must not be from namespace %3.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 attribute of %2 element must not be %3.</source> + <translation type="unfinished">O atributo %1 do elemento %2 non debe ser %3.</translation> + </message> + <message> + <source>%1 attribute of %2 element must have the value %3 because the %4 attribute is set.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Specifying use='prohibited' inside an attribute group has no effect.</source> + <translation type="unfinished">Indicar use='prohibited' dentro dun grupo de atributos non ten efecto.</translation> + </message> + <message> + <source>%1 element must have either %2 or %3 attribute.</source> + <translation type="unfinished">O elemento %1 debe ter o do atributo %2 ou o %3.</translation> + </message> + <message> + <source>%1 element must have either %2 attribute or %3 or %4 as child element.</source> + <translation type="unfinished">O elemento %1 debe ter ou o atributo %2 ou un elemento fillo %3 ou %4.</translation> + </message> + <message> + <source>%1 element requires either %2 or %3 attribute.</source> + <translation type="unfinished">O elemento %1 require o atributo %2 ou o %3.</translation> + </message> + <message> + <source>Text or entity references not allowed inside %1 element</source> + <translation type="unfinished">Non se permite referencias nin texto nin a entidades dentro dun elemento %1</translation> + </message> + <message> + <source>%1 attribute of %2 element must contain %3, %4 or a list of URIs.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element is not allowed in this context.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 attribute of %2 element has larger value than %3 attribute.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Prefix of qualified name %1 is not defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 attribute of %2 element must either contain %3 or the other values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Component with ID %1 has been defined previously.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 already defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute %1 already defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Type %1 already defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute group %1 already defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element group %1 already defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Notation %1 already defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Identity constraint %1 already defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Duplicated facets in simple type %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 references unknown %2 or %3 element %4.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 references identity constraint %2 that is no %3 or %4 element.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has a different number of fields from the identity constraint %2 that it references.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Base type %1 of %2 element cannot be resolved.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Item type %1 of %2 element cannot be resolved.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Member type %1 of %2 element cannot be resolved.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Type %1 of %2 element cannot be resolved.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Base type %1 of complex type cannot be resolved.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 cannot have complex base type that has a %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Type of %1 element must be a simple type, %2 is not.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Substitution group %1 of %2 element cannot be resolved.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Substitution group %1 has circular definition.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Duplicated element names %1 in %2 element.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Reference %1 of %2 element cannot be resolved.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Circular group reference for %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element is not allowed in this scope</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element cannot have %2 attribute with value other than %3.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element cannot have %2 attribute with value other than %3 or %4.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute group %1 has circular reference.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 attribute in %2 must have %3 use like in base type %4.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has attribute wildcard but its base type %2 has not.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Enumeration facet contains invalid content: {%1} is not a value of type %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Namespace prefix of qualified name %1 is not defined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 element %2 is not a valid restriction of the %3 element it redefines: %4.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 is not valid according to %2.</source> + <translation type="unfinished">%1 non é válido segundo %2.</translation> + </message> + <message> + <source>String content does not match the length facet.</source> + <translation type="unfinished">O contido da cadea non coincide coa faceta «length».</translation> + </message> + <message> + <source>String content does not match the minLength facet.</source> + <translation type="unfinished">O contido da cadea non coincide coa faceta «minLength».</translation> + </message> + <message> + <source>String content does not match the maxLength facet.</source> + <translation type="unfinished">O contido da cadea non coincide coa faceta «maxLength».</translation> + </message> + <message> + <source>String content does not match pattern facet.</source> + <translation type="unfinished">O contido da cadea non coincide coa faceta «pattern».</translation> + </message> + <message> + <source>String content is not listed in the enumeration facet.</source> + <translation type="unfinished">O contido da cadea non está enumerado na enumeración de facetas.</translation> + </message> + <message> + <source>Signed integer content does not match the maxInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Signed integer content does not match the maxExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Signed integer content does not match the minInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Signed integer content does not match the minExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Signed integer content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Signed integer content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Signed integer content does not match in the totalDigits facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unsigned integer content does not match the maxInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unsigned integer content does not match the maxExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unsigned integer content does not match the minInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unsigned integer content does not match the minExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unsigned integer content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unsigned integer content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Unsigned integer content does not match in the totalDigits facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Double content does not match the maxInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Double content does not match the maxExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Double content does not match the minInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Double content does not match the minExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Double content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Double content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Decimal content does not match in the fractionDigits facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Decimal content does not match in the totalDigits facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Date time content does not match the maxInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Date time content does not match the maxExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Date time content does not match the minInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Date time content does not match the minExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Date time content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Date time content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Duration content does not match the maxInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Duration content does not match the maxExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Duration content does not match the minInclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Duration content does not match the minExclusive facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Duration content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Duration content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Boolean content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Binary content does not match the length facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Binary content does not match the minLength facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Binary content does not match the maxLength facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Binary content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Invalid QName content: %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>QName content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>QName content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Notation content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>List content does not match length facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>List content does not match minLength facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>List content does not match maxLength facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>List content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>List content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Union content is not listed in the enumeration facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Union content does not match pattern facet.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Data of type %1 are not allowed to be empty.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 is missing child element.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>There is one IDREF value with no corresponding ID: %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Loaded schema file is invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 contains invalid data.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>No schema defined for validation.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>No definition for element %1 available.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Specified type %1 is not known to the schema.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 is not defined in this scope.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Declaration for element %1 does not exist.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 contains invalid content.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 is declared as abstract.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 is not nillable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute %1 contains invalid data: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element contains content although it is nillable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Fixed value constraint not allowed if element is nillable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Specified type %1 is not validly substitutable with element type %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Complex type %1 is not allowed to be abstract.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 contains not allowed attributes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 contains not allowed child element.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Content of element %1 does not match its type definition: %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Content of element %1 does not match defined value constraint.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 contains not allowed child content.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 contains not allowed text content.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 cannot contain other elements, as it has a fixed content.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 is missing required attribute %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute %1 does not match the attribute wildcard.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Declaration for attribute %1 does not exist.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 contains two attributes of type %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Attribute %1 contains invalid content.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Element %1 contains unknown attribute %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Content of attribute %1 does not match its type definition: %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Content of attribute %1 does not match defined value constraint.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Non-unique value found for constraint %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Key constraint %1 contains absent fields.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Key constraint %1 contains references nillable element %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>No referenced value found for key reference %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>More than one value found for field %1.</source> + <translation type="unfinished">Atopouse máis dun valor para o campo %1.</translation> + </message> + <message> + <source>Field %1 has no simple type.</source> + <translation type="unfinished">O campo %1 non ten un tipo simple.</translation> + </message> + <message> + <source>ID value '%1' is not unique.</source> + <translation type="unfinished">O valor do ID «%1» non é único.</translation> + </message> + <message> + <source>'%1' attribute contains invalid QName content: %2.</source> + <translation type="unfinished">O atributo «%1» contén contido non válido para un QName: %2.</translation> + </message> + <message> + <source>empty</source> + <translation type="unfinished">baleiro</translation> + </message> + <message> + <source>zero or one</source> + <translation type="unfinished">cero ou un</translation> + </message> + <message> + <source>exactly one</source> + <translation type="unfinished">exactamente un</translation> + </message> + <message> + <source>one or more</source> + <translation type="unfinished">un ou máis</translation> + </message> + <message> + <source>zero or more</source> + <translation type="unfinished">cero ou máis</translation> + </message> + <message> + <source>Required type is %1, but %2 was found.</source> + <translation type="unfinished">O tipo requirido é %1, pero atopouse %2.</translation> + </message> + <message> + <source>Promoting %1 to %2 may cause loss of precision.</source> + <translation type="unfinished">Converter de %1 a %2 pode causar perda de precisión.</translation> + </message> + <message> + <source>The focus is undefined.</source> + <translation type="unfinished">O foco non está definido.</translation> + </message> + <message> + <source>It's not possible to add attributes after any other kind of node.</source> + <translation type="unfinished">Non é posíbel engadir atributos tras calquera outro tipo de nodo.</translation> + </message> + <message> + <source>An attribute by name %1 has already been created.</source> + <translation type="unfinished">Xa se creou un atributo co nome %1.</translation> + </message> + <message> + <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/translations/qt_help_sl.ts b/translations/qt_help_sl.ts index 7d76e58..db9ab3c 100644 --- a/translations/qt_help_sl.ts +++ b/translations/qt_help_sl.ts @@ -177,7 +177,7 @@ </message> <message> <source>The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it.</source> - <translation>Sklicana datoteka %1 se mora nahajti v mapi (%1) ali njeni podmapi. Preskakujem jo.</translation> + <translation>Sklicana datoteka %1 se mora nahajti v mapi (%2) ali njeni podmapi. Preskakujem jo.</translation> </message> <message> <source>The file %1 does not exist! Skipping it.</source> diff --git a/translations/qt_sl.ts b/translations/qt_sl.ts index 6bc552b..fb16fee 100644 --- a/translations/qt_sl.ts +++ b/translations/qt_sl.ts @@ -382,13 +382,13 @@ da je nameščen paket libgstreamer-plugins-base.</translation> <source>Decay HF ratio (%)</source> <extracomment>DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. </extracomment> - <translation type="unfinished"></translation> + <translation>VF razmerje zamrtja (%)</translation> </message> <message> <source>Decay time (ms)</source> <extracomment>DecayTime: Time over which reverberation is diminished. </extracomment> - <translation type="unfinished"></translation> + <translation>Čas zamrtja (ms)</translation> </message> <message> <source>Density (%)</source> @@ -1519,11 +1519,11 @@ v </message> <message> <source>Empty signal assignment</source> - <translation type="unfinished">Prazna prireditev signalu</translation> + <translation>Prazna prireditev signalu</translation> </message> <message> <source>Empty property assignment</source> - <translation type="unfinished">Prazna prireditev lastnosti</translation> + <translation>Prazna prireditev lastnosti</translation> </message> <message> <source>Attached properties cannot be used here</source> @@ -1717,19 +1717,19 @@ v <name>QDeclarativeCompositeTypeManager</name> <message> <source>Resource %1 unavailable</source> - <translation>Vir %1 ni na voljo</translation> + <translation type="obsolete">Vir %1 ni na voljo</translation> </message> <message> <source>Namespace %1 cannot be used as a type</source> - <translation>Imenskega prostora %1 ni moč uporabiti kot vrste</translation> + <translation type="obsolete">Imenskega prostora %1 ni moč uporabiti kot vrste</translation> </message> <message> <source>%1 %2</source> - <translation>%1 %2</translation> + <translation type="obsolete">%1 %2</translation> </message> <message> <source>Type %1 unavailable</source> - <translation>Vrsta %1 ni na voljo</translation> + <translation type="obsolete">Vrsta %1 ni na voljo</translation> </message> </context> <context> @@ -1771,7 +1771,7 @@ v </message> <message> <source>transaction: missing callback</source> - <translation type="unfinished">transaction: manjka povratni klic</translation> + <translation>transaction: manjka povratni klic</translation> </message> <message> <source>SQL: database version mismatch</source> @@ -2113,6 +2113,25 @@ v </message> </context> <context> + <name>QDeclarativeTypeData</name> + <message> + <source>Script %1 unavailable</source> + <translation>Skript %1 ni na voljo</translation> + </message> + <message> + <source>Type %1 unavailable</source> + <translation>Vrsta %1 ni na voljo</translation> + </message> + <message> + <source>Namespace %1 cannot be used as a type</source> + <translation>Imenskega prostora %1 ni moč uporabiti kot vrste</translation> + </message> + <message> + <source>%1 %2</source> + <translation>%1 %2</translation> + </message> +</context> +<context> <name>QDeclarativeVME</name> <message> <source>Unable to create object of type %1</source> @@ -2685,7 +2704,7 @@ Ali jo kljub temu želite izbrisati?</translation> <name>QFontDatabase</name> <message> <source>Normal</source> - <translation>Normalno</translation> + <translation>Običajno</translation> </message> <message> <source>Bold</source> @@ -2697,7 +2716,7 @@ Ali jo kljub temu želite izbrisati?</translation> </message> <message> <source>Black</source> - <translation type="unfinished"></translation> + <translation>Krepko</translation> </message> <message> <source>Demi</source> @@ -2924,7 +2943,7 @@ Ali jo kljub temu želite izbrisati?</translation> <message> <source>Connecting to host failed: %1</source> - <translation>Povezovanje z gostiteljem %1 ni uspelo: + <translation>Povezovanje z gostiteljem ni uspelo: %1</translation> </message> <message> @@ -3331,7 +3350,7 @@ Ali jo kljub temu želite izbrisati?</translation> <name>QLibrary</name> <message> <source>Could not mmap '%1': %2</source> - <translation>Ni bilo moč izvesti funkcije mmap za »%1«: %2</translation> + <translation type="obsolete">Ni bilo moč izvesti funkcije mmap za »%1«: %2</translation> </message> <message> <source>Plugin verification data mismatch in '%1'</source> @@ -3339,7 +3358,7 @@ Ali jo kljub temu želite izbrisati?</translation> </message> <message> <source>Could not unmap '%1': %2</source> - <translation>Ni bilo moč izvesti funkcije unmap za »%1«: %2</translation> + <translation type="obsolete">Ni bilo moč izvesti funkcije unmap za »%1«: %2</translation> </message> <message> <source>The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5]</source> @@ -4618,15 +4637,15 @@ Izberite drugo ime datoteke.</translation> </message> <message> <source>First page</source> - <translation>&Prva stran</translation> + <translation>Prva stran</translation> </message> <message> <source>Last page</source> - <translation>&Zadnja stran</translation> + <translation>Zadnja stran</translation> </message> <message> <source>Fit width</source> - <translation>Prilagodi &širini</translation> + <translation>Prilagodi širini</translation> </message> <message> <source>Fit page</source> @@ -6469,7 +6488,7 @@ Izberite drugo ime datoteke.</translation> </message> <message> <source>Save edits?</source> - <translation>&Shranmi urejan?.</translation> + <translation>Ali shranim urejanja?.</translation> </message> <message> <source>Cancel</source> @@ -9770,428 +9789,4 @@ Izberite drugo ime datoteke.</translation> <translation>Lastnost »%1« vsebuje neveljavno vsebino QName: %2.</translation> </message> </context> -<context> - <name></name> - <message> - <source>Remaining move time</source> - <comment>QWebPage~|Media controller element</comment> - <translation type="obsolete">Preostali čas filma</translation> - </message> - <message> - <source>attribute group %1 contains attribute %2 twice</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">skupina lastnosti %1 dvakrat vsebuje lastnost %2</translation> - </message> - <message> - <source>complex type %1 contains attribute %2 twice</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">kompleksna vrsta %1 dvakrat vsebuje lastnost %2</translation> - </message> - <message> - <source>element %1 exists twice with different types</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 obstaja dvakrat, z različnima vrstama</translation> - </message> - <message> - <source>can not process unknown element %1, expected elements are: %2</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">ni moč obdelati neznanega elementa %1, pričakovani elementi so: %2</translation> - </message> - <message> - <source>element %1 is not allowed in this scope, possible elements are: %2</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 v tem obsegu ni dovoljen, možni elementi so: %2</translation> - </message> - <message> - <source>child element is missing in that scope, possible child elements are: %1</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">v tem obsegu manjka podelement, možni podelementi so: %1</translation> - </message> - <message> - <source>document is not a XML schema</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">dokument ni shema XML</translation> - </message> - <message> - <source>%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} ni vrednost vrste %4</translation> - </message> - <message> - <source>%1 attribute of %2 element contains invalid content: {%3}</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3}</translation> - </message> - <message> - <source>%1 element is not allowed inside %2 element if %3 attribute is present</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 znotraj elementa %2 ni dovoljen, če je prisotna lastnost %3</translation> - </message> - <message> - <source>%1 element has neither %2 attribute nor %3 child element</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 nima niti lastnosti %2 niti podelementa %3</translation> - </message> - <message> - <source>%1 element with %2 child element must not have a %3 attribute</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 s podelementom %2 ne sme imeti lastnosti %3</translation> - </message> - <message> - <source>%1 attribute of %2 element must be %3 or %4</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">lastnost %1 elementa %2 mora biti %3 ali %4</translation> - </message> - <message> - <source>%1 attribute of %2 element must have a value of %3</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">lastnost %1 elementa %2 mora imeti vrednost %3</translation> - </message> - <message> - <source>%1 attribute of %2 element must have a value of %3 or %4</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">lastnost %1 elementa %2 mora imeti vrednost %3 ali %4</translation> - </message> - <message> - <source>%1 element must not have %2 and %3 attribute together</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 hkrati ne sme imeti lastnosti %2 in %3</translation> - </message> - <message> - <source>content of %1 attribute of %2 element must not be from namespace %3</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">vsebina lastnosti %1 elementa %2 ne sme biti iz imenskega prostora %3</translation> - </message> - <message> - <source>%1 attribute of %2 element must not be %3</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">lastnost %1 elementa %2 ne sme biti %3</translation> - </message> - <message> - <source>%1 element must have either %2 or %3 attribute</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 mora imeti lastnost %2 ali %3</translation> - </message> - <message> - <source>%1 element requires either %2 or %3 attribute</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 potrebuje vsaj lastnost %2 ali %3</translation> - </message> - <message> - <source>%1 element is not allowed in this context</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 v tem kontekstu ni dovoljen</translation> - </message> - <message> - <source>component with id %1 has been defined previously</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">komponenta z ID-jem %1 je že bila definirana</translation> - </message> - <message> - <source>element %1 already defined</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 je že definiran</translation> - </message> - <message> - <source>attribute %1 already defined</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">lastnost %1 je že definirana</translation> - </message> - <message> - <source>type %1 already defined</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">vrsta %1 je že definirana</translation> - </message> - <message> - <source>attribute group %1 already defined</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">skupina lastnosti %1 je že definirana</translation> - </message> - <message> - <source>element group %1 already defined</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">skupina elementov %1 je že definirana</translation> - </message> - <message> - <source>notation %1 already defined</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">zapis %1 je že definiran</translation> - </message> - <message> - <source>type of %1 element must be a simple type, %2 is not</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">vrsta elementa %1 mora biti preprosta, %2 to ni</translation> - </message> - <message> - <source>duplicated element names %1 in %2 element</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">podvojeni imeni elementov %1 v elementu %2</translation> - </message> - <message> - <source>%1 is not valid according to %2</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">%1 glede na %2 ni veljaven</translation> - </message> - <message> - <source>invalid QName content: %1</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">neveljavna vsebina QName: %1</translation> - </message> - <message> - <source>data of type %1 are not allowed to be empty</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">podatki vrste %1 ne smejo biti prazni</translation> - </message> - <message> - <source>element %1 is missing child element</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">elementu %1 manjka podelement</translation> - </message> - <message> - <source>%1 contains invalid data</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">%1 vsebuje neveljavne podatke</translation> - </message> - <message> - <source>no definition for element %1 available</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">definicija za element %1 ni na voljo</translation> - </message> - <message> - <source>element %1 is not defined in this scope</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 v tem obsegu ni definiran</translation> - </message> - <message> - <source>declaration for element %1 does not exist</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">deklaracija elementa %1 ne obstaja</translation> - </message> - <message> - <source>element %1 contains invalid content</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 vsebuje neveljavno vsebino</translation> - </message> - <message> - <source>element %1 is declared as abstract</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 je deklariran kot abstrakten</translation> - </message> - <message> - <source>complex type %1 is not allowed to be abstract</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">kompleksna vrsta %1 ne sme biti abstraktna</translation> - </message> - <message> - <source>element %1 contains not allowed attributes</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 vsebuje nedovoljene lastnosti</translation> - </message> - <message> - <source>element %1 contains not allowed child element</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 vsebuje nedovoljen podelement</translation> - </message> - <message> - <source>content of element %1 does not match its type definition: %2</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">vsebina elementa %1 ne ustreza zanj določeni vrsti: %2</translation> - </message> - <message> - <source>element %1 contains not allowed child content</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 vsebuje nedovoljeno vsebino v podelementih</translation> - </message> - <message> - <source>element %1 contains not allowed text content</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 vsebuje nedovoljeno besedilno vsebino</translation> - </message> - <message> - <source>element %1 can not contain other elements, as it has a fixed content</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino</translation> - </message> - <message> - <source>element %1 is missing required attribute %2</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">elementu %1 manjka obvezna lastnost %2</translation> - </message> - <message> - <source>declaration for attribute %1 does not exist</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">deklaracija lastnosti %1 ne obstaja</translation> - </message> - <message> - <source>element %1 contains two attributes of type %2</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 vsebuje dve lastnosti vrste %2</translation> - </message> - <message> - <source>attribute %1 contains invalid content</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">lastnost %1 vsebuje neveljavno vsebino</translation> - </message> - <message> - <source>element %1 contains unknown attribute %2</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">element %1 vsebuje neznano lastnost %2</translation> - </message> - <message> - <source>more than one value found for field %1</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">za polje %1 je bila najdena več kot ena vrednost</translation> - </message> - <message> - <source>field %1 has no simple type</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">polje %1 nima preproste vrste</translation> - </message> - <message> - <source>ID value '%1' is not unique</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">Vrednost ID »%1« ni edinstvena</translation> - </message> - <message> - <source>'%1' attribute contains invalid QName content: %2</source> - <comment>QtXmlPatterns~|</comment> - <translation type="obsolete">Lastnost »%1« vsebuje neveljavno vsebino QName: %2</translation> - </message> - <message> - <source>Cannot start playback. - -Check your Gstreamer installation and make sure you -have libgstreamer-plugins-base installed.</source> - <comment>Phonon::Gstreamer::MediaObject|</comment> - <translation type="obsolete">Ni moč začeti predvajanja. - -Preverite namestitev GStreamerja in se prepričajte, -da je nameščen paket libgstreamer-plugins-base.</translation> - </message> - <message> - <source>Frequency band, %1 Hz</source> - <comment>Phonon::MMF::AudioEqualizer|</comment> - <translation type="obsolete">Frekvenčni pas, %1 Hz</translation> - </message> - <message> - <source>audio equalizer</source> - <comment>Phonon::MMF::EffectFactory|</comment> - <translation type="obsolete">izenačevalnik zvoka</translation> - </message> - <message> - <source>Bass boost</source> - <comment>Phonon::MMF::EffectFactory|</comment> - <translation type="obsolete">Ojačanje basov</translation> - </message> - <message> - <source>Distance Attenuation</source> - <comment>Phonon::MMF::EffectFactory|</comment> - <translation type="obsolete">Utišanje zaradi razdalje</translation> - </message> - <message> - <source>Environmental Reverb</source> - <comment>Phonon::MMF::EffectFactory|</comment> - <translation type="obsolete">Okoljsko odmevanje</translation> - </message> - <message> - <source>Loudness</source> - <comment>Phonon::MMF::EffectFactory|</comment> - <translation type="obsolete">Glasnost</translation> - </message> - <message> - <source>Source Orientation</source> - <comment>Phonon::MMF::EffectFactory|</comment> - <translation type="obsolete">Usmerjenost vira</translation> - </message> - <message> - <source>Stereo Widening</source> - <comment>Phonon::MMF::EffectFactory|</comment> - <translation type="obsolete">Razširitev sterea</translation> - </message> - <message> - <source>Invalid hostname</source> - <comment>QObject|</comment> - <translation type="obsolete">Neveljavno ime gostitelja</translation> - </message> - <message> - <source>Operation not supported on %1</source> - <comment>QObject|</comment> - <translation type="obsolete">Dejanje na %1 ni podprto</translation> - </message> - <message> - <source>Invalid URI: %1</source> - <comment>QObject|</comment> - <translation type="obsolete">Neveljaven URI: %1</translation> - </message> - <message> - <source>Socket error on %1: %2</source> - <comment>QObject|</comment> - <translation type="obsolete">Napaka vtičnice na %1: %2</translation> - </message> - <message> - <source>Remote host closed the connection prematurely on %1</source> - <comment>QObject|</comment> - <translation type="obsolete">Oddaljen gostitelj je predčasno prekinil povezavo na %1</translation> - </message> - <message> - <source>No host name given</source> - <comment>QObject|</comment> - <translation type="obsolete">Podano ni bilo nobeno ime gostitelja</translation> - </message> - <message> - <source>Private key does not certificate public key, %1</source> - <comment>QSslSocket|</comment> - <translation type="obsolete">Zasebni ključ ne potrjuje javnega ključa, %1</translation> - </message> - <message> - <source>No variable by name %1 exists</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Spremenljivka z imenom %1 ne obstaja</translation> - </message> - <message> - <source>No value is available for the external variable by name %1.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Za zunanjo spremenljivko z imenom %1 ni na voljo nobene vrednosti.</translation> - </message> - <message> - <source>A template by name %1 has already been declared.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Predloga z imenom %1 je že bila deklarirana.</translation> - </message> - <message> - <source>The value of attribute %1 must of type %2, which %3 isn't.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Vrednost lastnosti %1 mora biti vrste %2, %3 pa to ni.</translation> - </message> - <message> - <source>A variable by name %1 has already been declared.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Spremenljivka z imenom %1 je že bila deklarirana.</translation> - </message> - <message> - <source>An argument by name %1 has already been declared. Every argument name must be unique.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Argument z imenom %1 je že bil deklariran. Vsako ime argumenta mora biti edinstveno.</translation> - </message> - <message> - <source>No function by name %1 is available.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Na voljo ni nobene funkcije z imenom %1.</translation> - </message> - <message> - <source>An attribute by name %1 has already appeared on this element.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Atribut z imenom %1 se je v tem elementu že pojavil.</translation> - </message> - <message> - <source>Component with id %1 has been defined previously.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Komponenta z ID-jem %1 je že bila definirana.</translation> - </message> - <message> - <source>Element %1 can not contain other elements, as it has a fixed content.</source> - <comment>QtXmlPatterns|</comment> - <translation type="obsolete">Element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino.</translation> - </message> -</context> </TS> diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index f2ebe7c..cfe5956 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -403,7 +403,7 @@ struct PropertyFlags { // from DerivedAge.txt QChar::UnicodeVersion age : 4; int digitValue; - uint line_break_class : 6; + LineBreakClass line_break_class; int mirrorDiff : 16; @@ -429,7 +429,7 @@ static int appendToSpecialCaseMap(const QList<int> &map) QList<int> utf16map; for (int i = 0; i < map.size(); ++i) { int val = map.at(i); - if (val > 0xffff) { + if (val >= 0x10000) { utf16map << QChar::highSurrogate(val); utf16map << QChar::lowSurrogate(val); } else { @@ -505,7 +505,7 @@ struct UnicodeData { // from BidiMirroring.txt int mirroredChar; - // CompositionExclusions.txt + // DerivedNormalizationProps.txt bool excludedComposition; // computed position of unicode property set @@ -726,8 +726,8 @@ static void readUnicodeData() data.p.category = categoryMap.value(properties[UD_Category], QChar::NoCategory); if (data.p.category == QChar::NoCategory) qFatal("unassigned char category: %s", properties[UD_Category].constData()); - data.p.combiningClass = properties[UD_CombiningClass].toInt(); + data.p.combiningClass = properties[UD_CombiningClass].toInt(); if (!combiningClassUsage.contains(data.p.combiningClass)) combiningClassUsage[data.p.combiningClass] = 1; else @@ -738,27 +738,29 @@ static void readUnicodeData() if (!properties[UD_UpperCase].isEmpty()) { int upperCase = properties[UD_UpperCase].toInt(&ok, 16); Q_ASSERT(ok); - if (qAbs(upperCase - codepoint) >= (1<<14)) + int diff = upperCase - codepoint; + if (qAbs(diff) >= (1<<14)) qWarning() << "upperCaseDiff exceeded (" << hex << codepoint << "->" << upperCase << ")"; - data.p.upperCaseDiff = upperCase - codepoint; - maxUpperCaseDiff = qMax(maxUpperCaseDiff, qAbs(data.p.upperCaseDiff)); - if (codepoint > 0xffff) { - // if the condition below doesn't hold anymore we need to modify our case folding code - //qDebug() << codepoint << QChar::highSurrogate(codepoint) << QChar::highSurrogate(foldMap.at(0)); + data.p.upperCaseDiff = diff; + maxUpperCaseDiff = qMax(maxUpperCaseDiff, qAbs(diff)); + if (codepoint >= 0x10000 || upperCase >= 0x10000) { + // if the conditions below doesn't hold anymore we need to modify our upper casing code Q_ASSERT(QChar::highSurrogate(codepoint) == QChar::highSurrogate(upperCase)); + Q_ASSERT(QChar::lowSurrogate(codepoint) + diff == QChar::lowSurrogate(upperCase)); } } if (!properties[UD_LowerCase].isEmpty()) { int lowerCase = properties[UD_LowerCase].toInt(&ok, 16); Q_ASSERT(ok); - if (qAbs(lowerCase - codepoint) >= (1<<14)) + int diff = lowerCase - codepoint; + if (qAbs(diff) >= (1<<14)) qWarning() << "lowerCaseDiff exceeded (" << hex << codepoint << "->" << lowerCase << ")"; - data.p.lowerCaseDiff = lowerCase - codepoint; - maxLowerCaseDiff = qMax(maxLowerCaseDiff, qAbs(data.p.lowerCaseDiff)); - if (codepoint > 0xffff) { - // if the condition below doesn't hold anymore we need to modify our case folding code - //qDebug() << codepoint << QChar::highSurrogate(codepoint) << QChar::highSurrogate(foldMap.at(0)); + data.p.lowerCaseDiff = diff; + maxLowerCaseDiff = qMax(maxLowerCaseDiff, qAbs(diff)); + if (codepoint >= 0x10000 || lowerCase >= 0x10000) { + // if the conditions below doesn't hold anymore we need to modify our lower casing code Q_ASSERT(QChar::highSurrogate(codepoint) == QChar::highSurrogate(lowerCase)); + Q_ASSERT(QChar::lowSurrogate(codepoint) + diff == QChar::lowSurrogate(lowerCase)); } } // we want toTitleCase to map to ToUpper in case we don't have any titlecase. @@ -767,14 +769,15 @@ static void readUnicodeData() if (!properties[UD_TitleCase].isEmpty()) { int titleCase = properties[UD_TitleCase].toInt(&ok, 16); Q_ASSERT(ok); - if (qAbs(titleCase - codepoint) >= (1<<14)) + int diff = titleCase - codepoint; + if (qAbs(diff) >= (1<<14)) qWarning() << "titleCaseDiff exceeded (" << hex << codepoint << "->" << titleCase << ")"; - data.p.titleCaseDiff = titleCase - codepoint; - maxTitleCaseDiff = qMax(maxTitleCaseDiff, qAbs(data.p.titleCaseDiff)); - if (codepoint > 0xffff) { - // if the condition below doesn't hold anymore we need to modify our case folding code - //qDebug() << codepoint << QChar::highSurrogate(codepoint) << QChar::highSurrogate(foldMap.at(0)); + data.p.titleCaseDiff = diff; + maxTitleCaseDiff = qMax(maxTitleCaseDiff, qAbs(diff)); + if (codepoint >= 0x10000 || titleCase >= 0x10000) { + // if the conditions below doesn't hold anymore we need to modify our title casing code Q_ASSERT(QChar::highSurrogate(codepoint) == QChar::highSurrogate(titleCase)); + Q_ASSERT(QChar::lowSurrogate(codepoint) + diff == QChar::lowSurrogate(titleCase)); } } @@ -1003,16 +1006,16 @@ static void readDerivedNormalizationProps() && d.decomposition.size() > 1) { Q_ASSERT(d.decomposition.size() == 2); - uint part1 = d.decomposition.at(0); - uint part2 = d.decomposition.at(1); + int part1 = d.decomposition.at(0); + int part2 = d.decomposition.at(1); // all non-starters are listed in DerivedNormalizationProps.txt // and already excluded from composition Q_ASSERT(unicodeData.value(part1, UnicodeData(part1)).p.combiningClass == 0); ++numLigatures; - highestLigature = qMax(highestLigature, (int)part1); - Ligature l = {(ushort)part1, (ushort)part2, codepoint}; + highestLigature = qMax(highestLigature, part1); + Ligature l = {(ushort)part1, (ushort)part2, (ushort)codepoint}; ligatureHashes[part2].append(l); } } @@ -1109,6 +1112,7 @@ static void computeUniqueProperties() static void readLineBreak() { + qDebug() << "Reading LineBreak.txt"; QFile f("data/LineBreak.txt"); if (!f.exists()) qFatal("Couldn't find LineBreak.txt"); @@ -1145,7 +1149,7 @@ static void readLineBreak() Q_ASSERT(ok); } - LineBreakClass lb = line_break_map.value(l[1].trimmed(), LineBreak_Unassigned); + LineBreakClass lb = line_break_map.value(l[1], LineBreak_Unassigned); if (lb == LineBreak_Unassigned) qFatal("unassigned line break class: %s", l[1].constData()); @@ -1190,7 +1194,10 @@ static void readSpecialCasing() bool ok; int codepoint = l[0].trimmed().toInt(&ok, 16); Q_ASSERT(ok); - Q_ASSERT(codepoint <= 0xffff); + + // if the condition below doesn't hold anymore we need to modify our + // lower/upper/title casing code and case folding code + Q_ASSERT(codepoint < 0x10000); // qDebug() << "codepoint" << hex << codepoint; // qDebug() << line; @@ -1290,16 +1297,18 @@ static void readCaseFolding() UnicodeData ud = unicodeData.value(codepoint, UnicodeData(codepoint)); if (foldMap.size() == 1) { - if (qAbs(foldMap.at(0) - codepoint) >= (1<<14)) - qWarning() << "caseFoldDiff exceeded (" << hex << codepoint << "->" << foldMap.at(0) << ")"; - ud.p.caseFoldDiff = foldMap.at(0) - codepoint; - maxCaseFoldDiff = qMax(maxCaseFoldDiff, qAbs(ud.p.caseFoldDiff)); - if (codepoint > 0xffff) { - // if the condition below doesn't hold anymore we need to modify our case folding code - //qDebug() << codepoint << QChar::highSurrogate(codepoint) << QChar::highSurrogate(foldMap.at(0)); - Q_ASSERT(QChar::highSurrogate(codepoint) == QChar::highSurrogate(foldMap.at(0))); + int caseFolded = foldMap.at(0); + int diff = caseFolded - codepoint; + if (qAbs(diff) >= (1<<14)) + qWarning() << "caseFoldDiff exceeded (" << hex << codepoint << "->" << caseFolded << ")"; + ud.p.caseFoldDiff = diff; + maxCaseFoldDiff = qMax(maxCaseFoldDiff, qAbs(diff)); + if (codepoint >= 0x10000 || caseFolded >= 0x10000) { + // if the conditions below doesn't hold anymore we need to modify our case folding code + Q_ASSERT(QChar::highSurrogate(codepoint) == QChar::highSurrogate(caseFolded)); + Q_ASSERT(QChar::lowSurrogate(codepoint) + diff == QChar::lowSurrogate(caseFolded)); } - if (foldMap.at(0) != codepoint + ud.p.lowerCaseDiff) + if (caseFolded != codepoint + ud.p.lowerCaseDiff) qDebug() << hex << codepoint; } else { qFatal("we currently don't support full case foldings"); @@ -1329,13 +1338,15 @@ static void readGraphemeBreak() int comment = line.indexOf('#'); if (comment >= 0) line = line.left(comment); + line.replace(" ", ""); if (line.isEmpty()) continue; QList<QByteArray> l = line.split(';'); + Q_ASSERT(l.size() == 2); - QByteArray codes = l[0].trimmed(); + QByteArray codes = l[0]; codes.replace("..", "."); QList<QByteArray> cl = codes.split('.'); @@ -1348,7 +1359,7 @@ static void readGraphemeBreak() Q_ASSERT(ok); } - GraphemeBreak brk = grapheme_break_map.value(l[1].trimmed(), GraphemeBreak_Unassigned); + GraphemeBreak brk = grapheme_break_map.value(l[1], GraphemeBreak_Unassigned); if (brk == GraphemeBreak_Unassigned) qFatal("unassigned grapheme break class: %s", l[1].constData()); @@ -1378,13 +1389,15 @@ static void readWordBreak() int comment = line.indexOf('#'); if (comment >= 0) line = line.left(comment); + line.replace(" ", ""); if (line.isEmpty()) continue; QList<QByteArray> l = line.split(';'); + Q_ASSERT(l.size() == 2); - QByteArray codes = l[0].trimmed(); + QByteArray codes = l[0]; codes.replace("..", "."); QList<QByteArray> cl = codes.split('.'); @@ -1397,7 +1410,7 @@ static void readWordBreak() Q_ASSERT(ok); } - WordBreak brk = word_break_map.value(l[1].trimmed(), WordBreak_Unassigned); + WordBreak brk = word_break_map.value(l[1], WordBreak_Unassigned); if (brk == WordBreak_Unassigned) qFatal("unassigned word break class: %s", l[1].constData()); @@ -1427,13 +1440,15 @@ static void readSentenceBreak() int comment = line.indexOf('#'); if (comment >= 0) line = line.left(comment); + line.replace(" ", ""); if (line.isEmpty()) continue; QList<QByteArray> l = line.split(';'); + Q_ASSERT(l.size() == 2); - QByteArray codes = l[0].trimmed(); + QByteArray codes = l[0]; codes.replace("..", "."); QList<QByteArray> cl = codes.split('.'); @@ -1446,7 +1461,7 @@ static void readSentenceBreak() Q_ASSERT(ok); } - SentenceBreak brk = sentence_break_map.value(l[1].trimmed(), SentenceBreak_Unassigned); + SentenceBreak brk = sentence_break_map.value(l[1], SentenceBreak_Unassigned); if (brk == SentenceBreak_Unassigned) qFatal("unassigned sentence break class: %s", l[1].constData()); @@ -1624,17 +1639,22 @@ static void readBlocks() QByteArray blockName = line.mid(semicolon + 1); int blockIndex = blockNames.indexOf(blockName); - if (blockIndex < 0) { + if (blockIndex == -1) { + blockIndex = blockNames.size(); blockNames.append(blockName); - blockIndex = blockNames.indexOf(blockName); - Q_ASSERT(blockIndex >= 0); } - int dotdot = codePoints.indexOf(".."); - Q_ASSERT(dotdot >= 0); - bool unused; - int first = codePoints.left(dotdot).toInt(&unused, 16); - int last = codePoints.mid(dotdot + 2).toInt(&unused, 16); + codePoints.replace("..", "."); + QList<QByteArray> cl = codePoints.split('.'); + + bool ok; + int first = cl[0].toInt(&ok, 16); + Q_ASSERT(ok); + int last = first; + if (cl.size() == 2) { + last = cl[1].toInt(&ok, 16); + Q_ASSERT(ok); + } BlockInfo blockInfo = { blockIndex, first, last }; blockInfoList.append(blockInfo); @@ -1670,7 +1690,6 @@ static void readScripts() if (!f.exists()) qFatal("Couldn't find %s", files[i]); - f.open(QFile::ReadOnly); while (!f.atEnd()) { @@ -1693,28 +1712,25 @@ static void readScripts() QByteArray scriptName = line.mid(semicolon + 1); int scriptIndex = scriptNames.indexOf(scriptName); - if (scriptIndex < 0) { + if (scriptIndex == -1) { + scriptIndex = scriptNames.size(); scriptNames.append(scriptName); - scriptIndex = scriptNames.indexOf(scriptName); - Q_ASSERT(scriptIndex >= 0); } - int dotdot = codePoints.indexOf(".."); - bool unused; - int first = -1, last = -1; - if (dotdot >= 0) { - first = codePoints.left(dotdot).toInt(&unused, 16); - last = codePoints.mid(dotdot + 2).toInt(&unused, 16); - } else { - first = codePoints.toInt(&unused, 16); - } + codePoints.replace("..", "."); + QList<QByteArray> cl = codePoints.split('.'); - if (last != -1) { - for (int i = first; i <= last; ++i) - scriptAssignment[i] = scriptIndex; - } else { - scriptAssignment[first] = scriptIndex; + bool ok; + int first = cl[0].toInt(&ok, 16); + Q_ASSERT(ok); + int last = first; + if (cl.size() == 2) { + last = cl[1].toInt(&ok, 16); + Q_ASSERT(ok); } + + for (int i = first; i <= last; ++i) + scriptAssignment[i] = scriptIndex; } } } @@ -1849,21 +1865,18 @@ QByteArray createScriptTableDeclaration() declaration += ", /* U+"; declaration += QByteArray::number(block, 16).rightJustified(4, '0'); declaration += '-'; - declaration += - QByteArray::number(block + unicodeBlockSize - 1, 16).rightJustified(4, '0'); + declaration += QByteArray::number(block + unicodeBlockSize - 1, 16).rightJustified(4, '0'); declaration += " */\n"; } else { const int value = extraBlockList.size() + scriptSentinel; - const int offset = - ((value - scriptSentinel) * unicodeBlockSize) + unicodeBlockCount; + const int offset = ((value - scriptSentinel) * unicodeBlockSize) + unicodeBlockCount; declaration += " "; declaration += QByteArray::number(value); declaration += ", /* U+"; declaration += QByteArray::number(block, 16).rightJustified(4, '0'); declaration += '-'; - declaration += - QByteArray::number(block + unicodeBlockSize - 1, 16).rightJustified(4, '0'); + declaration += QByteArray::number(block + unicodeBlockSize - 1, 16).rightJustified(4, '0'); declaration += " at offset "; declaration += QByteArray::number(offset); declaration += " */\n"; @@ -1880,16 +1893,14 @@ QByteArray createScriptTableDeclaration() for (int i = 0; i < extraBlockList.size(); ++i) { const int value = i + scriptSentinel; - const int offset = - ((value - scriptSentinel) * unicodeBlockSize) + unicodeBlockCount; + const int offset = ((value - scriptSentinel) * unicodeBlockSize) + unicodeBlockCount; const ExtraBlock &extraBlock = extraBlockList.at(i); const int block = extraBlock.block; declaration += "\n\n /* U+"; declaration += QByteArray::number(block, 16).rightJustified(4, '0'); declaration += '-'; - declaration += - QByteArray::number(block + unicodeBlockSize - 1, 16).rightJustified(4, '0'); + declaration += QByteArray::number(block + unicodeBlockSize - 1, 16).rightJustified(4, '0'); declaration += " at offset "; declaration += QByteArray::number(offset); declaration += " */\n "; @@ -1905,9 +1916,24 @@ QByteArray createScriptTableDeclaration() else declaration += ' '; } + if (declaration.endsWith(' ')) + declaration.chop(1); } declaration += "\n};\n\n} // namespace QUnicodeTables\n\n"; + declaration += + "Q_CORE_EXPORT int QT_FASTCALL QUnicodeTables::script(uint ucs4)\n" + "{\n" + " if (ucs4 > 0xffff)\n" + " return Common;\n" + " int script = uc_scripts[ucs4 >> 7];\n" + " if (script < ScriptSentinel)\n" + " return script;\n" + " script = (((script - ScriptSentinel) * UnicodeBlockSize) + UnicodeBlockCount);\n" + " script = uc_scripts[script + (ucs4 & 0x7f)];\n" + " return script;\n" + "}\n\n"; + qDebug("createScriptTableDeclaration: table size is %d bytes", unicodeBlockCount + (extraBlockList.size() * unicodeBlockSize)); @@ -2168,6 +2194,11 @@ static QByteArray createPropertyInfo() " return uc_properties + index;\n" "}\n\n"; + out += "Q_CORE_EXPORT QUnicodeTables::LineBreakClass QT_FASTCALL QUnicodeTables::lineBreakClass(uint ucs4)\n" + "{\n" + " return (QUnicodeTables::LineBreakClass)qGetProp(ucs4)->line_break_class;\n" + "}\n\n"; + out += "static const ushort specialCaseMap[] = {\n "; for (int i = 0; i < specialCaseMap.size(); ++i) { out += QByteArray(" 0x") + QByteArray::number(specialCaseMap.at(i), 16); @@ -2204,7 +2235,7 @@ static QByteArray createCompositionInfo() const int SMP_BLOCKSIZE = 256; const int SMP_SHIFT = 8; - if(SMP_END <= highestComposedCharacter) + if (SMP_END <= highestComposedCharacter) qFatal("end of table smaller than highest composed character at %x", highestComposedCharacter); QList<DecompositionBlock> blocks; @@ -2417,15 +2448,15 @@ static QByteArray createLigatureInfo() int uc = block*BMP_BLOCKSIZE + i; QList<Ligature> l = ligatureHashes.value(uc); if (!l.isEmpty()) { - b.decompositionPositions.append(tableIndex); qSort(l); ligatures.append(l.size()); - for (int i = 0; i < l.size(); ++i) { - Q_ASSERT(l.at(i).u2 == uc); - ligatures.append(l.at(i).u1); - ligatures.append(l.at(i).ligature); + for (int j = 0; j < l.size(); ++j) { + Q_ASSERT(l.at(j).u2 == uc); + ligatures.append(l.at(j).u1); + ligatures.append(l.at(j).ligature); } + b.decompositionPositions.append(tableIndex); tableIndex += 2*l.size() + 1; } else { b.decompositionPositions.append(0xffff); @@ -2450,12 +2481,11 @@ static QByteArray createLigatureInfo() qDebug(" %d unique blocks in BMP.", blocks.size()); qDebug(" block data uses: %d bytes", bmp_block_data); qDebug(" trie data uses : %d bytes", bmp_trie); - qDebug(" ligature data uses : %d bytes", ligatures.size()*2); - qDebug(" memory usage: %d bytes", bmp_mem + ligatures.size() * 2); + qDebug("\n ligature data uses : %d bytes", ligatures.size()*2); + qDebug(" memory usage: %d bytes", bmp_mem + ligatures.size() * 2); QByteArray out; - out += "static const unsigned short uc_ligature_trie[] = {\n"; // first write the map @@ -2531,6 +2561,7 @@ QByteArray createCasingInfo() return out; } + int main(int, char **) { initAgeMap(); @@ -2650,14 +2681,14 @@ int main(int, char **) f.write("\n"); f.write(scriptEnumDeclaration); f.write("\n"); - f.write(lineBreakClass); - f.write("\n"); f.write(grapheme_break_string); f.write("\n"); f.write(word_break_string); f.write("\n"); f.write(sentence_break_string); f.write("\n"); + f.write(lineBreakClass); + f.write("\n"); f.write(methods); f.write("} // namespace QUnicodeTables\n\n" "QT_END_NAMESPACE\n\n" |
