Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) bye bye QMakeProjectEnv short-cut evaluation inside if() tests eliminate special splitting of INCLUDEPATH and DEPENDPATH do not env-expand cache file path s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ s/INCPATH/INCLUDEPATH/ s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH) warn about usage of deprecated variables warn about using non-lowercased replace $$function()s add -Wdeprecated option (on by default) make QMakeProject::isEmpty() consider legacy mappings document some functions' scope fix $$size() not using function-scoped variables doc: Fixed some qdoc errors. qdoc: Added breadcrumbs for namespaces. Autotest: check that we receive key events on toplevel widgets Cocoa: key events stopped working Update Polish translations qdoc: Added "All namespaces" to the API Lookup box. ...
author: Qt Continuous Integration System <qt-info@nokia.com> 2010-04-30 23:11:37 (GMT)
committer: Qt Continuous Integration System <qt-info@nokia.com> 2010-04-30 23:11:37 (GMT)
commit: 0da9aa430240cefc7486efb3a68421423bc4fb76 (patch)
tree: e09cae283a652c5b926a059570f9f403356528af
parent: 3e6a12e90d05d24bca68128d60215c207a416ef6 (diff)
parent: c693b4f8f38c435beffe1deb6186912123cd05f9 (diff)
download: Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.zip
Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.tar.gz
Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.tar.bz2
83 files changed, 3467 insertions, 1976 deletions
diff --git a/configure b/configure
index 63d8f2d..6763969 100755
--- a/configure
+++ b/configure
@@ -4420,8 +4420,7 @@ fi
 # is where the resulting variable is written to
 setBootstrapVariable()
 {
-    variableRegExp="^$1[^_A-Z0-9]"
-    getQMakeConf | grep "$variableRegExp" | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK '
+    getQMakeConf | $AWK '/^('"$1"')[^_A-Z0-9]/ { print $0; }' | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK '
 {
     varLength = index($0, "=") - 1
     valStart = varLength + 2
@@ -4536,10 +4535,10 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
         fi
 
-	if [ '!' -z "$RPATH_FLAGS" ] && [ '!' -z "`getQMakeConf \"$QMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then
-  	    setBootstrapVariable QMAKE_RPATH 's,\$\$LITERAL_WHITESPACE, ,'
-	    for rpath in $RPATH_FLAGS; do
-		EXTRA_LFLAGS="\$(QMAKE_RPATH)\"$rpath\" $EXTRA_LFLAGS"
+        if [ '!' -z "$RPATH_FLAGS" ] && [ '!' -z "`getQMakeConf \"$QMAKESPEC\" | $AWK '/QMAKE_(LFLAGS_)?RPATH/ {print $3;}'`" ]; then
+            setBootstrapVariable "QMAKE_(LFLAGS_)?RPATH" 's,\$\$LITERAL_WHITESPACE, ,;s,QMAKE_RPATH,QMAKE_LFLAGS_RPATH,'
+            for rpath in $RPATH_FLAGS; do
+                EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"
             done
         fi
         if [ "$PLATFORM_MAC" = "yes" ]; then
@@ -6679,10 +6678,10 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
     if [ "$CFG_RPATH" = "yes" ]; then
        QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
     fi
-elif [ -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then
+elif [ -z "`getQMakeConf \"$XQMAKESPEC\" | $AWK '/QMAKE_(LFLAGS_)?RPATH/ {print $3;}'`" ]; then
     if [ -n "$RPATH_FLAGS" ]; then
         echo
-        echo "ERROR: -R cannot be used on this platform as \$QMAKE_RPATH is"
+        echo "ERROR: -R cannot be used on this platform as \$QMAKE_LFLAGS_RPATH is"
         echo "       undefined."
         echo
         exit 1
diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
index 25d447c..d3db24a 100644
--- a/mkspecs/common/g++.conf
+++ b/mkspecs/common/g++.conf
@@ -43,7 +43,7 @@ QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	+=
 QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/common/llvm.conf b/mkspecs/common/llvm.conf
index aee3904..70f52aa 100644
--- a/mkspecs/common/llvm.conf
+++ b/mkspecs/common/llvm.conf
@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
 QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	+=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf
index 1863898..446547d 100644
--- a/mkspecs/common/mac-g++.conf
+++ b/mkspecs/common/mac-g++.conf
@@ -67,7 +67,7 @@ QMAKE_LFLAGS_VERSION    += -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
 # -all_load requred to make Objective-C categories work in static builds.
 QMAKE_LFLAGS_STATIC_LIB += -all_load
-QMAKE_RPATH		+=
+QMAKE_LFLAGS_RPATH	+=
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/common/mac-llvm.conf b/mkspecs/common/mac-llvm.conf
index 55850c6..4ff088c 100644
--- a/mkspecs/common/mac-llvm.conf
+++ b/mkspecs/common/mac-llvm.conf
@@ -65,7 +65,7 @@ QMAKE_LFLAGS_PPC        += -arch ppc
 QMAKE_LFLAGS_X86        += -arch i386
 QMAKE_LFLAGS_VERSION    += -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
-QMAKE_RPATH		+=
+QMAKE_LFLAGS_RPATH	+=
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index 5d88ac4..96cd239 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -14,7 +14,7 @@ QMAKE_INCDIR_OPENGL	= /System/Library/Frameworks/OpenGL.framework/Headers \
 
 QMAKE_FIX_RPATH         = install_name_tool -id 
 
-QMAKE_RPATH		=
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_OPENGL	= -framework OpenGL -framework AGL
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index af9881b..29d0958 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 QMAKE_CYGWIN_SHLIB	= 1
 QMAKE_CYGWIN_EXE	= 1
  
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index 995679e..fc55503 100644
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -69,7 +69,7 @@ QMAKE_LFLAGS_SONAME	+= -install_name$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
 
-QMAKE_RPATH		=
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index a097771..eaa7687 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -282,13 +282,3 @@ contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") {
 # Generated pkg files
 
 QMAKE_DISTCLEAN += $${TARGET}_template.pkg
-
-# Pre 2.6.23 Linux kernels have a limit on the environment size that can be passed to
-# a forked process. We quite easily overstep this boundary when building big projects
-# on Symbian, and since we depend on running the system() command, this causes the build
-# to fail. Test here that system() can be successfully run. It is important that this
-# check happens as late as possible, otherwise it will not be caught.
-execve_sanity_test = $$system("echo testing")
-!contains(execve_sanity_test, "testing") {
-    error("Running system() failed. Maybe your kernel is too old? (Linux kernels need at least version 2.6.23)")
-}
diff --git a/mkspecs/features/win32/embed_manifest_dll.prf b/mkspecs/features/win32/embed_manifest_dll.prf
index 408efd2..60a55ce 100644
--- a/mkspecs/features/win32/embed_manifest_dll.prf
+++ b/mkspecs/features/win32/embed_manifest_dll.prf
@@ -1,6 +1,6 @@
 MANIFEST_DIR = $$OBJECTS_DIR
 isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
-!if(plugin:no_plugin_manifest):if(win32-msvc2005|win32-msvc2008|win32-msvc2010):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
+!if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
     NOPATH_TARGET = $$TARGET
     NOPATH_TARGET ~= s,\\ , ,q      # Remove space escaping (NOPATH_TARGET is quoted)
     NOPATH_TARGET ~= s,\\,/,g       # Change to single type separators
diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf
index 6f63103..169134d 100644
--- a/mkspecs/features/win32/embed_manifest_exe.prf
+++ b/mkspecs/features/win32/embed_manifest_exe.prf
@@ -1,6 +1,6 @@
 MANIFEST_DIR = $$OBJECTS_DIR
 isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
-if(win32-msvc2005|win32-msvc2008|win32-msvc2010):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
+if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
     NOPATH_TARGET = $$TARGET
     NOPATH_TARGET ~= s,\\ , ,q      # Remove space escaping (NOPATH_TARGET is quoted)
     NOPATH_TARGET ~= s,\\,/,g       # Change to single type separators
diff --git a/mkspecs/freebsd-g++34/qmake.conf b/mkspecs/freebsd-g++34/qmake.conf
index 3e6bf6a..810efab 100644
--- a/mkspecs/freebsd-g++34/qmake.conf
+++ b/mkspecs/freebsd-g++34/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	= -pthread
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/freebsd-g++40/qmake.conf b/mkspecs/freebsd-g++40/qmake.conf
index 43d6980..4b0ac4c 100644
--- a/mkspecs/freebsd-g++40/qmake.conf
+++ b/mkspecs/freebsd-g++40/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	= -pthread
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf
index c9c3140..99d6126 100644
--- a/mkspecs/freebsd-icc/qmake.conf
+++ b/mkspecs/freebsd-icc/qmake.conf
@@ -80,7 +80,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Qoption,ld,-soname,
 QMAKE_LFLAGS_THREAD	= -mt
-QMAKE_RPATH		= -Qoption,ld,-rpath,
+QMAKE_LFLAGS_RPATH	= -Qoption,ld,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index b138ef8..38c8555 100644
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -98,7 +98,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_RPATH		= -Wl,+b,
+QMAKE_LFLAGS_RPATH	= -Wl,+b,
 QMAKE_HPUX_SHLIB	= 3
 QMAKE_EXTENSION_SHLIB	= sl
 
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index b703540..630129c 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -95,7 +95,7 @@ QMAKE_LFLAGS_SHLIB	= -b
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_RPATH		= -Wl,+b,
+QMAKE_LFLAGS_RPATH	= -Wl,+b,
 QMAKE_HPUX_SHLIB	= 2
 QMAKE_EXTENSION_SHLIB	= sl
 
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index 8223a07..1c732c6 100644
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -77,7 +77,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_RPATH		= -Wl,+b,
+QMAKE_LFLAGS_RPATH	= -Wl,+b,
 QMAKE_HPUX_SHLIB	= 1
 QMAKE_EXTENSION_SHLIB	= sl
 
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index 734a5f7..d8b0a4a 100644
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -60,7 +60,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_RPATH		= -Wl,+b,
+QMAKE_LFLAGS_RPATH	= -Wl,+b,
 QMAKE_HPUX_SHLIB	= 3
 QMAKE_EXTENSION_SHLIB	= sl
 
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index 6935ea9..312c44b 100644
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -60,7 +60,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_RPATH		= -Wl,+b,
+QMAKE_LFLAGS_RPATH	= -Wl,+b,
 QMAKE_HPUX_SHLIB	= 1
 QMAKE_EXTENSION_SHLIB	= sl
 
diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
index 93006e5..a26cb32 100644
--- a/mkspecs/hpuxi-acc-32/qmake.conf
+++ b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -54,7 +54,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		=
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
index 2fa1f01..3e2d59f 100644
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -97,7 +97,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_RPATH		=
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
index 05b0691..3151d85 100644
--- a/mkspecs/hpuxi-g++-64/qmake.conf
+++ b/mkspecs/hpuxi-g++-64/qmake.conf
@@ -65,7 +65,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,+h,
 QMAKE_LFLAGS_THREAD	= -lpthread
 QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_RPATH		= -Wl,+b,
+QMAKE_LFLAGS_RPATH	= -Wl,+b,
 
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index 4b651b2..b8d316e 100644
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -88,7 +88,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,-no_unresolved
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index 0070d42..2f4f03f 100644
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -88,7 +88,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,-no_unresolved
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
index 56f02f1..610d92c 100644
--- a/mkspecs/irix-g++-64/qmake.conf
+++ b/mkspecs/irix-g++-64/qmake.conf
@@ -58,7 +58,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,-no_unresolved
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		= -lC
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index c1eafdb..41841f3 100644
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -58,7 +58,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -Wl,-no_unresolved
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		= -lC
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index 21f2960..aa50b87 100644
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -56,7 +56,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Qoption,ld,-soname,
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Qoption,ld,-rpath,
+QMAKE_LFLAGS_RPATH	= -Qoption,ld,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index eeb24a3..3353180 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -62,7 +62,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Qoption,ld,-soname,
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Qoption,ld,-rpath,
+QMAKE_LFLAGS_RPATH	= -Qoption,ld,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 217572f..5c6001c 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -65,7 +65,7 @@ QMAKE_LFLAGS_SHLIB	=
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= --soname$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= --thread_safe
-QMAKE_RPATH		= -rpath$$LITERAL_WHITESPACE
+QMAKE_LFLAGS_RPATH	= -rpath$$LITERAL_WHITESPACE
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf
index 4b4deab..d359625 100644
--- a/mkspecs/linux-lsb-g++/qmake.conf
+++ b/mkspecs/linux-lsb-g++/qmake.conf
@@ -62,7 +62,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index 19af8ee..16d0023 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -56,7 +56,7 @@ QMAKE_LFLAGS_SHLIB	= -shared -fpic
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -R
+QMAKE_LFLAGS_RPATH	= -R
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
index eae3308..fc0fc43 100644
--- a/mkspecs/lynxos-g++/qmake.conf
+++ b/mkspecs/lynxos-g++/qmake.conf
@@ -59,7 +59,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
index 00de6c4..d93ed5e 100644
--- a/mkspecs/macx-icc/qmake.conf
+++ b/mkspecs/macx-icc/qmake.conf
@@ -70,7 +70,7 @@ QMAKE_LFLAGS_SONAME	= -install_name$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_THREAD	=
 #QMAKE_LFLAGS_PPC        = -arch ppc
 #QMAKE_LFLAGS_X86        = -arch i386
-QMAKE_RPATH		=
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index 1cb449f..1d3fd2b 100644
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -58,7 +58,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	= -pthread
 QMAKE_LFLAGS_NOUNDEF	= -Wl,-no_unresolved
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf
index 6e30d4f..d50ce6b 100644
--- a/mkspecs/qws/freebsd-generic-g++/qmake.conf
+++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf
@@ -56,7 +56,7 @@ QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     = -pthread
-QMAKE_RPATH             = -Wl,-rpath,
+QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_QT		= -lqte
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf
index f753222..9096712 100644
--- a/mkspecs/qws/macx-generic-g++/qmake.conf
+++ b/mkspecs/qws/macx-generic-g++/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
 QMAKE_LFLAGS_PLUGIN	= -bundle
 QMAKE_LFLAGS_SONAME	= 
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= 
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_LIBS		=
 QMAKE_LIBS_X11		=
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf
index f5874c2..3bf7e56 100644
--- a/mkspecs/qws/solaris-generic-g++/qmake.conf
+++ b/mkspecs/qws/solaris-generic-g++/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		= -lsocket -lnsl -lresolv
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index 746cf2c..d4091ff 100644
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -55,7 +55,7 @@ QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
-QMAKE_RPATH		=
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index 3d35d62..a026756 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -76,7 +76,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -mt
 QMAKE_LFLAGS_NOUNDEF	= -z defs
-QMAKE_RPATH		= -R
+QMAKE_LFLAGS_RPATH	= -R
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index 0c97620..8a8f1ac 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -59,7 +59,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -mt
 QMAKE_LFLAGS_NOUNDEF	= -z defs
-QMAKE_RPATH		= -R
+QMAKE_LFLAGS_RPATH	= -R
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index 587c630..01e331c 100644
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -80,7 +80,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -z defs
-QMAKE_RPATH		= -Wl,-R,
+QMAKE_LFLAGS_RPATH	= -Wl,-R,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 0814980..c7f6406 100644
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -63,7 +63,7 @@ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_NOUNDEF	= -z defs
-QMAKE_RPATH		= -Wl,-R,
+QMAKE_LFLAGS_RPATH	= -Wl,-R,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf
index c75e46e..57bb56a 100644
--- a/mkspecs/symbian/linux-gcce/qmake.conf
+++ b/mkspecs/symbian/linux-gcce/qmake.conf
@@ -47,7 +47,7 @@ QMAKE_CXXFLAGS_STATIC_LIB	-= -fPIC
 QMAKE_LFLAGS_SONAME	=
 #QMAKE_LFLAGS_THREAD	+=
 #QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
-QMAKE_RPATH		= --rpath=
+QMAKE_LFLAGS_RPATH	= --rpath=
 
 DEFINES		+= __GCCE__ \
                    UNICODE \
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index 88021df..d2c6937 100644
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -54,7 +54,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_THREAD	= -pthread
 QMAKE_LFLAGS_SONAME	= -soname$$LITERAL_WHITESPACE
-QMAKE_RPATH             = -rpath$$LITERAL_WHITESPACE
+QMAKE_LFLAGS_RPATH	= -rpath$$LITERAL_WHITESPACE
 
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index 71e5682..f2b8e39 100644
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -56,7 +56,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_THREAD	=
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
-QMAKE_RPATH             = -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index 5fb2b2c..5f88b80 100644
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SHLIB	= -G
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= -Kthread
-QMAKE_RPATH		= -R
+QMAKE_LFLAGS_RPATH	= -R
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index b6a438a..34d6d61 100644
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	=
 QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Wl,-R,
+QMAKE_LFLAGS_RPATH	= -Wl,-R,
 
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 7b17789..38849f8 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -63,7 +63,7 @@ QMAKE_LFLAGS_PLUGIN     += $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     += -Wl,-soname,
 QMAKE_LFLAGS_THREAD     +=
 QMAKE_LFLAGS_NOUNDEF    += -Wl,--no-undefined
-QMAKE_RPATH             = -Wl,-rpath,
+QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/unsupported/qws/qnx-641/qmake.conf b/mkspecs/unsupported/qws/qnx-641/qmake.conf
index 12eaf1d..441f408 100644
--- a/mkspecs/unsupported/qws/qnx-641/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-641/qmake.conf
@@ -51,7 +51,7 @@ QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_LN_SHLIB		= -cp
-QMAKE_RPATH             = -Wl,-rpath,
+QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
index 62857bf..26de9b7 100644
--- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
@@ -53,7 +53,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
 QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	+=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
index dce60ea..b43c391 100644
--- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
@@ -49,7 +49,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
 QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	+=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
index 93d04ff..29a2952 100644
--- a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
@@ -49,7 +49,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
 QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	+=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index fc0b125..e3eb6cd 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -53,7 +53,7 @@ QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	+=
 QMAKE_LFLAGS_THREAD	+=
 QMAKE_LFLAGS_NOUNDEF	+=
-QMAKE_RPATH		=
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index be35172..d0aeff6 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -53,7 +53,7 @@ QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	+=
 QMAKE_LFLAGS_THREAD	+=
 QMAKE_LFLAGS_NOUNDEF	+=
-QMAKE_RPATH		=
+QMAKE_LFLAGS_RPATH	=
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 3e731a1..d16cd6b 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -148,7 +148,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     if(!project->isActiveConfig("staticlib")) {
         t << "LINK          = " << var("QMAKE_LINK") << endl;
         t << "LFLAGS        = " << var("QMAKE_LFLAGS") << endl;
-        t << "LIBS          = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKDIR_FLAGS") << " "
+        t << "LIBS          = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKPATH_FLAGS") << " "
           << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl;
     }
 
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 49030c3..13e855c 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -84,7 +84,7 @@ Option::QMAKE_MODE Option::qmake_mode = Option::QMAKE_GENERATE_NOTHING;
 
 //all modes
 QString Option::qmake_abslocation;
-int Option::warn_level = WarnLogic;
+int Option::warn_level = WarnLogic | WarnDeprecated;
 int Option::debug_level = 0;
 QFile Option::output;
 QString Option::output_dir;
@@ -170,10 +170,12 @@ bool usage(const char *a0)
             "                 file in your current working directory\n"
             "\n"
             "Warnings Options:\n"
-            "  -Wnone         Turn off all warnings\n"
+            "  -Wnone         Turn off all warnings; specific ones may be re-enabled by\n"
+            "                 later -W options\n"
             "  -Wall          Turn on all warnings\n"
             "  -Wparser       Turn on parser warnings\n"
-            "  -Wlogic        Turn on logic warnings\n"
+            "  -Wlogic        Turn on logic warnings (on by default)\n"
+            "  -Wdeprecated   Turn on deprecation warnings (on by default)\n"
             "\n"
             "Options:\n"
             "   * You can place any variable assignment in options and it will be     *\n"
@@ -278,6 +280,8 @@ Option::parseCommandLine(int argc, char **argv, int skip)
                 Option::warn_level |= WarnParser;
             } else if(opt == "Wlogic") {
                 Option::warn_level |= WarnLogic;
+            } else if(opt == "Wdeprecated") {
+                Option::warn_level |= WarnDeprecated;
             } else if(opt == "Wnone") {
                 Option::warn_level = WarnNone;
             } else if(opt == "r" || opt == "recursive") {
diff --git a/qmake/option.h b/qmake/option.h
index 9bfdaed..b09ead2 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -63,6 +63,7 @@ enum QMakeWarn {
     WarnNone    = 0x00,
     WarnParser  = 0x01,
     WarnLogic   = 0x02,
+    WarnDeprecated = 0x04,
     WarnAll     = 0xFF
 };
 void warn_msg(QMakeWarn t, const char *fmt, ...);
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 3c56272..998d173 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -220,6 +220,11 @@ static QString varMap(const QString &x)
         ret = "QMAKE_FRAMEWORKPATH";
     else if(ret == "QMAKE_FRAMEWORKDIR_FLAGS")
         ret = "QMAKE_FRAMEWORKPATH_FLAGS";
+    else
+        return ret;
+    warn_msg(WarnDeprecated, "%s:%d: Variable %s is deprecated; use %s instead.",
+             parser.file.toLatin1().constData(), parser.line_no,
+             x.toLatin1().constData(), ret.toLatin1().constData());
     return ret;
 }
 
@@ -278,7 +283,7 @@ static QStringList split_arg_list(QString params)
     return args;
 }
 
-static QStringList split_value_list(const QString &vals, bool do_semicolon=false)
+static QStringList split_value_list(const QString &vals)
 {
     QString build;
     QStringList ret;
@@ -289,7 +294,6 @@ static QStringList split_value_list(const QString &vals, bool do_semicolon=false
     const ushort SINGLEQUOTE = '\'';
     const ushort DOUBLEQUOTE = '"';
     const ushort BACKSLASH = '\\';
-    const ushort SEMICOLON = ';';
 
     ushort unicode;
     const QChar *vals_data = vals.data();
@@ -309,8 +313,7 @@ static QStringList split_value_list(const QString &vals, bool do_semicolon=false
             ++parens;
         }
 
-        if(!parens && quote.isEmpty() && ((do_semicolon && unicode == SEMICOLON) ||
-                                           vals_data[x] == Option::field_sep)) {
+        if(!parens && quote.isEmpty() && (vals_data[x] == Option::field_sep)) {
             ret << build;
             build.clear();
         } else {
@@ -558,7 +561,7 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
         QString path;
         int last_slash = Option::mkfile::cachefile.lastIndexOf(QDir::separator());
         if(last_slash != -1)
-            path = Option::fixPathToLocalOS(Option::mkfile::cachefile.left(last_slash));
+            path = Option::fixPathToLocalOS(Option::mkfile::cachefile.left(last_slash), false);
         for(QStringList::Iterator concat_it = concat.begin();
             concat_it != concat.end(); ++concat_it)
             feature_roots << (path + (*concat_it));
@@ -614,38 +617,6 @@ QStringList qmake_mkspec_paths()
     return ret;
 }
 
-class QMakeProjectEnv
-{
-    QStringList envs;
-public:
-    QMakeProjectEnv() { }
-    QMakeProjectEnv(QMakeProject *p) { execute(p->variables()); }
-    QMakeProjectEnv(const QMap<QString, QStringList> &values) { execute(values); }
-
-    void execute(QMakeProject *p) { execute(p->variables()); }
-    void execute(const QMap<QString, QStringList> &values) {
-#ifdef Q_OS_UNIX
-        for(QMap<QString, QStringList>::ConstIterator it = values.begin(); it != values.end(); ++it) {
-            const QString var = it.key(), val = it.value().join(" ");
-            if(!var.startsWith(".")) {
-                const QString env_var = Option::sysenv_mod + var;
-                if(!putenv(strdup(QString(env_var + "=" + val).toAscii().data())))
-                    envs.append(env_var);
-            }
-        }
-#else
-        Q_UNUSED(values);
-#endif
-    }
-    ~QMakeProjectEnv() {
-#ifdef Q_OS_UNIX
-        for(QStringList::ConstIterator it = envs.begin();it != envs.end(); ++it) {
-            putenv(strdup(QString(*it + "=").toAscii().data()));
-        }
-#endif
-    }
-};
-
 QMakeProject::~QMakeProject()
 {
     if(own_prop)
@@ -1155,7 +1126,7 @@ QMakeProject::parse(const QString &t, QMap<QString, QStringList> &place, int num
         QStringList vallist;
         {
             //doVariableReplace(vals, place);
-            QStringList tmp = split_value_list(vals, (var == "DEPENDPATH" || var == "INCLUDEPATH"));
+            QStringList tmp = split_value_list(vals);
             for(int i = 0; i < tmp.size(); ++i)
                 vallist += doVariableReplaceExpand(tmp[i], place);
         }
@@ -1836,7 +1807,11 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
     for(int i = 0; i < args_list.size(); ++i)
         args += args_list[i].join(QString(Option::field_sep));
 
-    ExpandFunc func_t = qmake_expandFunctions().value(func.toLower());
+    QString lfunc = func.toLower();
+    if (!lfunc.isSharedWith(func))
+        warn_msg(WarnDeprecated, "%s:%d: Using uppercased builtin functions is deprecated.",
+                 parser.file.toLatin1().constData(), parser.line_no);
+    ExpandFunc func_t = qmake_expandFunctions().value(lfunc);
     debug_msg(1, "Running project expand: %s(%s) [%d]",
               func.toLatin1().constData(), args.join("::").toLatin1().constData(), func_t);
 
@@ -2090,7 +2065,6 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
             fprintf(stderr, "%s:%d system(execut) requires one argument.\n",
                     parser.file.toLatin1().constData(), parser.line_no);
         } else {
-            QMakeProjectEnv env(place);
             char buff[256];
             bool singleLine = true;
             if(args.count() > 1)
@@ -2250,8 +2224,7 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
             fprintf(stderr, "%s:%d: size(var) requires one argument.\n",
                     parser.file.toLatin1().constData(), parser.line_no);
         } else {
-            //QString target = args[0];
-            int size = values(args[0]).size();
+            int size = values(args[0], place).size();
             ret += QString::number(size);
         }
         break; }
@@ -2377,12 +2350,9 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt
                 if(d_off == d_len-1)
                     test += *(d+d_off);
                 if(!test.isEmpty()) {
-                    const bool success = doProjectTest(test, place);
-                    test = "";
-                    if(or_op)
-                        ret = ret || success;
-                    else
-                        ret = ret && success;
+                    if (or_op != ret)
+                        ret = doProjectTest(test, place);
+                    test.clear();
                 }
                 if(*(d+d_off) == QLatin1Char(':')) {
                     or_op = false;
@@ -2485,8 +2455,7 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt
             }
         }
         return false; }
-    case T_SYSTEM: {
-        bool setup_env = true;
+    case T_SYSTEM:
         if(args.count() < 1 || args.count() > 2) {
             fprintf(stderr, "%s:%d: system(exec) requires one argument.\n", parser.file.toLatin1().constData(),
                     parser.line_no);
@@ -2494,13 +2463,11 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt
         }
         if(args.count() == 2) {
             const QString sarg = args[1];
-            setup_env = (sarg.toLower() == "true" || sarg.toInt());
+            if (sarg.toLower() == "true" || sarg.toInt())
+                warn_msg(WarnParser, "%s:%d: system()'s second argument is now hard-wired to false.\n",
+                         parser.file.toLatin1().constData(), parser.line_no);
         }
-        QMakeProjectEnv env;
-        if(setup_env)
-            env.execute(place);
-        bool ret = system(args[0].toLatin1().constData()) == 0;
-        return ret; }
+        return system(args[0].toLatin1().constData()) == 0;
     case T_RETURN:
         if(function_blocks.isEmpty()) {
             fprintf(stderr, "%s:%d unexpected return()\n",
@@ -3162,4 +3129,10 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList
     return place[var];
 }
 
+bool QMakeProject::isEmpty(const QString &v)
+{
+    QMap<QString, QStringList>::ConstIterator it = vars.constFind(varMap(v));
+    return it == vars.constEnd() || it->isEmpty();
+}
+
 QT_END_NAMESPACE
diff --git a/qmake/project.h b/qmake/project.h
index bfebed0..0c542db 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -150,11 +150,11 @@ public:
     bool isActiveConfig(const QString &x, bool regex=false,
                         QMap<QString, QStringList> *place=NULL);
 
-    bool isSet(const QString &v);
-    bool isEmpty(const QString &v);
-    QStringList &values(const QString &v);
-    QString first(const QString &v);
-    QMap<QString, QStringList> &variables();
+    bool isSet(const QString &v); // No compat mapping, no magic variables
+    bool isEmpty(const QString &v); // With compat mapping, but no magic variables
+    QStringList &values(const QString &v); // With compat mapping and magic variables
+    QString first(const QString &v); // ditto
+    QMap<QString, QStringList> &variables(); // No compat mapping and magic, obviously
 
     bool isRecursive() const { return recursive; }
 
@@ -179,9 +179,6 @@ inline QString QMakeProject::configFile()
 inline QStringList &QMakeProject::values(const QString &v)
 { return values(v, vars); }
 
-inline bool QMakeProject::isEmpty(const QString &v)
-{ return !isSet(v) || values(v).isEmpty(); }
-
 inline bool QMakeProject::isSet(const QString &v)
 { return vars.contains(v); }
 
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 4213253..b602afa 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -19,7 +19,7 @@ VPATH += $$QT_SOURCE_TREE/src/corelib/global \
          $$QT_SOURCE_TREE/src/corelib/plugin \
          $$QT_SOURCE_TREE/src/corelib/xml \
          $$QT_SOURCE_TREE/src/corelib/io
-INCPATH += . \
+INCLUDEPATH += . \
            generators \
            generators/unix \
            generators/win32 \
@@ -30,7 +30,7 @@ INCPATH += . \
            $$QT_SOURCE_TREE/qmake
 
 VPATH += $$QT_SOURCE_TREE/tools/shared
-INCPATH += $$QT_SOURCE_TREE/tools/shared
+INCLUDEPATH += $$QT_SOURCE_TREE/tools/shared
 
 include(qmake.pri)
 
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index c5f70b0..29a7263 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -3814,7 +3814,7 @@ QByteArray QByteArray::number(double n, char f, int prec)
     accepting a \c{const char *} expected to be '\\0'-terminated will
     fail.
 
-    \sa data(), constData()
+    \sa setRawData(), data(), constData()
 */
 
 QByteArray QByteArray::fromRawData(const char *data, int size)
@@ -3834,6 +3834,37 @@ QByteArray QByteArray::fromRawData(const char *data, int size)
 }
 
 /*!
+    \since 4.7
+
+    Resets the QByteArray to use the first \a size bytes of the
+    \a data array. The bytes are \e not copied. The QByteArray will
+    contain the \a data pointer. The caller guarantees that \a data
+    will not be deleted or modified as long as this QByteArray and any
+    copies of it exist that have not been modified.
+
+    This function can be used instead of fromRawData() to re-use
+    existings QByteArray objects to save memory re-allocations.
+
+    \sa fromRawData(), data(), constData()
+*/
+QByteArray &QByteArray::setRawData(const char *data, uint size)
+{
+    if (d->ref != 1 || d->alloc) {
+        *this = fromRawData(data, size);
+    } else {
+        if (data) {
+            d->data = const_cast<char *>(data);
+        } else {
+            d->data = d->array;
+            size = 0;
+        }
+        d->alloc = d->size = size;
+        *d->array = '\0';
+    }
+    return *this;
+}
+
+/*!
     Returns a decoded copy of the Base64 array \a base64. Input is not checked
     for validity; invalid characters in the input are skipped, enabling the
     decoding process to continue with subsequent characters.
@@ -4228,12 +4259,6 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA
 */
 
 /*!
-    \fn QByteArray& QByteArray::setRawData(const char *a, uint n)
-
-    Use fromRawData() instead.
-*/
-
-/*!
     \fn void QByteArray::resetRawData(const char *data, uint n)
 
     Use clear() instead.
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index 0b77512..a3fe3f5 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -299,6 +299,7 @@ public:
     QByteArray &setNum(qulonglong, int base = 10);
     QByteArray &setNum(float, char f = 'g', int prec = 6);
     QByteArray &setNum(double, char f = 'g', int prec = 6);
+    QByteArray &setRawData(const char *a, uint n); // ### Qt 5: use an int
 
     static QByteArray number(int, int base = 10);
     static QByteArray number(uint, int base = 10);
@@ -343,8 +344,6 @@ public:
     inline QT3_SUPPORT QByteArray& duplicate(const QByteArray& a) { *this = a; return *this; }
     inline QT3_SUPPORT QByteArray& duplicate(const char *a, uint n)
     { *this = QByteArray(a, n); return *this; }
-    inline QT3_SUPPORT QByteArray& setRawData(const char *a, uint n)
-    { *this = fromRawData(a, n); return *this; }
     inline QT3_SUPPORT void resetRawData(const char *, uint) { clear(); }
     inline QT3_SUPPORT QByteArray lower() const { return toLower(); }
     inline QT3_SUPPORT QByteArray upper() const { return toUpper(); }
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 2f12b80..0169b20 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -7056,7 +7056,7 @@ void QString::updateProperties() const
     '\\0'-terminated string (although utf16() does, at the cost of
     copying the raw data).
 
-    \sa fromUtf16()
+    \sa fromUtf16(), setRawData()
 */
 QString QString::fromRawData(const QChar *unicode, int size)
 {
@@ -7075,6 +7075,44 @@ QString QString::fromRawData(const QChar *unicode, int size)
     return QString(x, 0);
 }
 
+/*!
+    \since 4.7
+
+    Resets the QString to use the first \a size Unicode characters
+    in the array \a unicode. The data in \a unicode is \e not
+    copied. The caller must be able to guarantee that \a unicode will
+    not be deleted or modified as long as the QString (or an
+    unmodified copy of it) exists.
+
+    This function can be used instead of fromRawData() to re-use
+    existings QString objects to save memory re-allocations.
+
+    \sa fromRawData()
+*/
+QString &QString::setRawData(const QChar *unicode, int size)
+{
+    if (d->ref != 1 || d->alloc) {
+        *this = fromRawData(unicode, size);
+    } else {
+#ifdef QT3_SUPPORT
+        if (d->asciiCache) {
+            Q_ASSERT(asciiCache);
+            asciiCache->remove(d);
+        }
+#endif
+        if (unicode) {
+            d->data = (ushort *)unicode;
+        } else {
+            d->data = d->array;
+            size = 0;
+        }
+        d->alloc = d->size = size;
+        *d->array = '\0';
+        d->clean = d->asciiCache = d->simpletext = d->righttoleft = d->capacity = 0;
+    }
+    return *this;
+}
+
 /*! \class QLatin1String
     \brief The QLatin1String class provides a thin wrapper around an US-ASCII/Latin-1 encoded string literal.
 
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index ea12c2f..a1c4e77 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -343,6 +343,7 @@ public:
     int toWCharArray(wchar_t *array) const;
     static QString fromWCharArray(const wchar_t *, int size = -1);
 
+    QString &setRawData(const QChar *unicode, int size);
     QString &setUnicode(const QChar *unicode, int size);
     inline QString &setUtf16(const ushort *utf16, int size);
 
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index bc0c65e..096e4bf 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1268,11 +1268,6 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec
 */
 
 /*!
-    \property QDeclarativeItem::effect
-    \internal
-*/
-
-/*!
     \property QDeclarativeItem::focus
     \internal
 */
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index bc8ccb01..06a44b7 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -324,11 +324,9 @@ void QGraphicsWidget::resize(const QSizeF &size)
 */
 
 /*!
-
   \fn QGraphicsWidget::geometryChanged()
 
-  This signal gets emitted whenever the geometry of the item changes
-  \internal
+  This signal gets emitted whenever the geometry is changed in setGeometry().
 */
 
 /*!
@@ -408,12 +406,6 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
 }
 
 /*!
-  \fn QGraphicsWidget::geometryChanged()
-
-  This signal gets emitted whenever the geometry is changed in setGeometry().
-*/
-
-/*!
     \fn QRectF QGraphicsWidget::rect() const
 
     Returns the item's local rect as a QRectF. This function is equivalent
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index d7cd2eb..e29b755 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -2300,6 +2300,12 @@ void QWidgetPrivate::finishCreateWindow_sys_Cocoa(void * /*NSWindow * */ voidWin
         if (q->testAttribute(Qt::WA_DropSiteRegistered))
             registerDropSite(true);
         transferChildren();
+
+        // Tell Cocoa explicit that we wan't the view to receive key events
+        // (regardless of focus policy) because this is how it works on other
+        // platforms (and in the carbon port):
+        if (!qApp->focusWidget())
+            [windowRef makeFirstResponder:nsview];
     }
 
     if (topExtra->posFromMove) {
diff --git a/src/gui/widgets/qtabwidget.cpp b/src/gui/widgets/qtabwidget.cpp
index 047a905..4a61935 100644
--- a/src/gui/widgets/qtabwidget.cpp
+++ b/src/gui/widgets/qtabwidget.cpp
@@ -542,6 +542,8 @@ void QTabWidget::setTabEnabled(int index, bool enable)
 {
     Q_D(QTabWidget);
     d->tabs->setTabEnabled(index, enable);
+    if (QWidget *widget = d->stack->widget(index))
+        widget->setEnabled(enable);
 }
 
 /*!
diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp
index 8727095..0b3a918 100644
--- a/src/network/access/qnetworkcookiejar.cpp
+++ b/src/network/access/qnetworkcookiejar.cpp
@@ -269,6 +269,7 @@ QList<QNetworkCookie> QNetworkCookieJar::cookiesForUrl(const QUrl &url) const
     Q_D(const QNetworkCookieJar);
     QDateTime now = QDateTime::currentDateTime();
     QList<QNetworkCookie> result;
+    bool isEncrypted = url.scheme().toLower() == QLatin1String("https");
 
     // scan our cookies for something that matches
     QList<QNetworkCookie>::ConstIterator it = d->allCookies.constBegin(),
@@ -280,6 +281,8 @@ QList<QNetworkCookie> QNetworkCookieJar::cookiesForUrl(const QUrl &url) const
             continue;
         if (!(*it).isSessionCookie() && (*it).expirationDate() < now)
             continue;
+        if ((*it).isSecure() && !isEncrypted)
+            continue;
 
         // insert this cookie into result, sorted by path
         QList<QNetworkCookie>::Iterator insertIt = result.begin();
diff --git a/tests/auto/macnativeevents/expectedeventlist.cpp b/tests/auto/macnativeevents/expectedeventlist.cpp
index b1fb9a6..0679dcb 100644
--- a/tests/auto/macnativeevents/expectedeventlist.cpp
+++ b/tests/auto/macnativeevents/expectedeventlist.cpp
@@ -97,6 +97,9 @@ void ExpectedEventList::compareMouseEvents(QEvent *received, QEvent *expected)
 {
     QMouseEvent *e1 = static_cast<QMouseEvent *>(received);
     QMouseEvent *e2 = static_cast<QMouseEvent *>(expected);
+
+    // Do a manual check first to be able to write more sensible
+    // debug output if we know we're going to fail:
     if (e1->pos() == e2->pos()
             && (e1->globalPos() == e2->globalPos())
             && (e1->button() == e2->button())
@@ -104,6 +107,9 @@ void ExpectedEventList::compareMouseEvents(QEvent *received, QEvent *expected)
             && (e1->modifiers() == e2->modifiers()))
         return; // equal
 
+    // INVARIANT: The two events are not equal. So we fail. Depending
+    // on whether debug mode is no or not, we let QTest fail. Otherwise
+    // we let the test continue for debugging puposes.
     int eventListNr = eventCount - eventList.size();
     if (!debug) {
         qWarning() << "Expected event" << eventListNr << "differs from received event:";
@@ -119,12 +125,34 @@ void ExpectedEventList::compareMouseEvents(QEvent *received, QEvent *expected)
     }
 }
 
-void ExpectedEventList::compareKeyEvents(QEvent *event1, QEvent *event2)
+void ExpectedEventList::compareKeyEvents(QEvent *received, QEvent *expected)
 {
-    QKeyEvent *e1 = static_cast<QKeyEvent *>(event1);
-    QKeyEvent *e2 = static_cast<QKeyEvent *>(event2);
-    Q_UNUSED(e1);
-    Q_UNUSED(e2);
+    QKeyEvent *e1 = static_cast<QKeyEvent *>(received);
+    QKeyEvent *e2 = static_cast<QKeyEvent *>(expected);
+
+    // Do a manual check first to be able to write more sensible
+    // debug output if we know we're going to fail:
+    if (e1->key() == e2->key()
+            && (e1->modifiers() == e2->modifiers())
+            && (e1->count() == e2->count())
+            && (e1->isAutoRepeat() == e2->isAutoRepeat()))
+        return; // equal
+
+    // INVARIANT: The two events are not equal. So we fail. Depending
+    // on whether debug mode is no or not, we let QTest fail. Otherwise
+    // we let the test continue for debugging puposes.
+    int eventListNr = eventCount - eventList.size();
+    if (!debug) {
+        qWarning() << "Expected event" << eventListNr << "differs from received event:";
+        QCOMPARE(e1->key(), e2->key());
+        QCOMPARE(e1->modifiers(), e2->modifiers());
+        QCOMPARE(e1->count(), e2->count());
+        QCOMPARE(e1->isAutoRepeat(), e2->isAutoRepeat());
+    } else {
+        qWarning() << "*** FAIL *** : Expected event" << eventListNr << "differs from received event:";
+        qWarning() << "Received:" << e1 << e1->key();
+        qWarning() << "Expected:" << e2 << e2->key();
+    }
 }
 
 bool ExpectedEventList::eventFilter(QObject *, QEvent *received)
@@ -149,10 +177,9 @@ bool ExpectedEventList::eventFilter(QObject *, QEvent *received)
                 compareMouseEvents(received, expected);
                 break;
             }
-            case QEvent::KeyPress: {
-                break;
-            }
+            case QEvent::KeyPress:
             case QEvent::KeyRelease: {
+                compareKeyEvents(received, expected);
                 break;
             }
             case QEvent::Resize: {
diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/macnativeevents/tst_macnativeevents.cpp
index 70a14f5..ffd0596 100644
--- a/tests/auto/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/macnativeevents/tst_macnativeevents.cpp
@@ -67,6 +67,7 @@ private slots:
     void testDragWindow();
     void testMouseEnter();
     void testChildDialogInFrontOfModalParent();
+    void testKeyPressOnToplevel();
 };
 
 void tst_MacNativeEvents::testMouseMoveLocation()
@@ -307,6 +308,28 @@ void tst_MacNativeEvents::testChildDialogInFrontOfModalParent()
     QVERIFY(!child.isVisible());
 }
 
+void tst_MacNativeEvents::testKeyPressOnToplevel()
+{
+    // Check that we receive keyevents for
+    // toplevel widgets. For leagacy reasons, and according to Qt on
+    // other platforms (carbon port + linux), we should get these events
+    // even when the focus policy is set to Qt::NoFocus when there is no
+    // other focus widget on screen:
+    QWidget w;
+    w.show();
+
+    NativeEventList native;
+    native.append(new QNativeKeyEvent(QNativeKeyEvent::Key_A, true, Qt::NoModifier));
+    native.append(new QNativeKeyEvent(QNativeKeyEvent::Key_A, false, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QKeyEvent(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier));
+    expected.append(new QKeyEvent(QEvent::KeyRelease, Qt::Key_A, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
+}
+
 #include "tst_macnativeevents.moc"
 
 QTEST_MAIN(tst_MacNativeEvents)
diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index f4c4429..01b9c0c 100644
--- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -304,6 +304,21 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
     QTest::newRow("path-match-2") << allCookies << "http://nokia.com/web/" << result;
     QTest::newRow("path-match-3") << allCookies << "http://nokia.com/web/content" << result;
 
+    // secure cookies
+    allCookies.clear();
+    result.clear();
+    QNetworkCookie secureCookie;
+    secureCookie.setName("a");
+    secureCookie.setPath("/web");
+    secureCookie.setDomain(".nokia.com");
+    secureCookie.setSecure(true);
+    allCookies += secureCookie;
+    QTest::newRow("no-match-secure-1") << allCookies << "http://nokia.com/web" << result;
+    QTest::newRow("no-match-secure-2") << allCookies << "http://qt.nokia.com/web" << result;
+    result += secureCookie;
+    QTest::newRow("match-secure-1") << allCookies << "https://nokia.com/web" << result;
+    QTest::newRow("match-secure-2") << allCookies << "https://qt.nokia.com/web" << result;
+
 }
 
 void tst_QNetworkCookieJar::cookiesForUrl()
diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp
index 4491fb3..504579f 100644
--- a/tests/auto/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp
@@ -259,11 +259,14 @@ void tst_QTabWidget::tabEnabled()
     int index = addPage();
 
     tw->setTabEnabled(index, true);
-    QVERIFY(tw->isTabEnabled(index) == true);
+    QVERIFY(tw->isTabEnabled(index));
+    QVERIFY(tw->widget(index)->isEnabled());
     tw->setTabEnabled(index, false);
-    QVERIFY(tw->isTabEnabled(index) == false);
+    QVERIFY(!tw->isTabEnabled(index));
+    QVERIFY(!tw->widget(index)->isEnabled());
     tw->setTabEnabled(index, true);
-    QVERIFY(tw->isTabEnabled(index) == true);
+    QVERIFY(tw->isTabEnabled(index));
+    QVERIFY(tw->widget(index)->isEnabled());
 
     removePage(index);
 }
diff --git a/tools/designer/src/lib/shared/filterwidget.cpp b/tools/designer/src/lib/shared/filterwidget.cpp
index 07af901..9363b7c 100644
--- a/tools/designer/src/lib/shared/filterwidget.cpp
+++ b/tools/designer/src/lib/shared/filterwidget.cpp
@@ -209,10 +209,9 @@ QString FilterWidget::text() const
 
 void FilterWidget::checkButton(const QString &text)
 {
-    static QString oldtext;
-    if (oldtext.isEmpty() || text.isEmpty())
+    if (m_oldText.isEmpty() || text.isEmpty())
         m_button->animateShow(!m_editor->text().isEmpty());
-    oldtext = text;
+    m_oldText = text;
 }
 
 void FilterWidget::reset()
diff --git a/tools/designer/src/lib/shared/filterwidget_p.h b/tools/designer/src/lib/shared/filterwidget_p.h
index 423b30e..8ca2073 100644
--- a/tools/designer/src/lib/shared/filterwidget_p.h
+++ b/tools/designer/src/lib/shared/filterwidget_p.h
@@ -142,6 +142,7 @@ private:
     HintLineEdit *m_editor;
     IconButton *m_button;
     int m_buttonwidth;
+    QString m_oldText;
 };
 } // namespace qdesigner_internal
 
diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index a717ff1..65d9572 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -70,6 +70,7 @@ QT_BEGIN_NAMESPACE
 
 QList<CodeParser *> CodeParser::parsers;
 bool CodeParser::showInternal = false;
+QMap<QString,QString> CodeParser::nameToTitle;
 
 /*!
   The constructor adds this code parser to the static
@@ -250,10 +251,20 @@ void CodeParser::processCommonMetaCommand(const Location &location,
 	if (node->type() == Node::Fake) {
 	    FakeNode *fake = static_cast<FakeNode *>(node);
             fake->setTitle(arg);
+            nameToTitle.insert(fake->name(),arg);
         }
         else
 	    location.warning(tr("Ignored '\\%1'").arg(COMMAND_TITLE));
     }
 }
 
+/*!
+  Find the page title given the page \a name and return it.
+ */
+const QString CodeParser::titleFromName(const QString& name)
+{
+    const QString t = nameToTitle.value(name);
+    return t;
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/codeparser.h b/tools/qdoc3/codeparser.h
index 7b0d0eb..ebba601 100644
--- a/tools/qdoc3/codeparser.h
+++ b/tools/qdoc3/codeparser.h
@@ -78,6 +78,7 @@ class CodeParser
     static void initialize(const Config& config);
     static void terminate();
     static CodeParser *parserForLanguage(const QString& language);
+    static const QString titleFromName(const QString& name);
 
  protected:
     QSet<QString> commonMetaCommands();
@@ -88,6 +89,7 @@ class CodeParser
  private:
     static QList<CodeParser *> parsers;
     static bool showInternal;
+    static QMap<QString,QString> nameToTitle;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index f5c304e..fb3c3f3 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -44,6 +44,7 @@
 */
 
 #include "codemarker.h"
+#include "codeparser.h"
 #include "helpprojectwriter.h"
 #include "htmlgenerator.h"
 #include "node.h"
@@ -1223,7 +1224,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         namespasse = static_cast<const NamespaceNode *>(inner);
         rawTitle = marker->plainName(inner);
         fullTitle = marker->plainFullName(inner);
-        title = rawTitle + " Namespace Reference";
+        title = rawTitle + " Namespace";
     }
     else if (inner->type() == Node::Class) {
         classe = static_cast<const ClassNode *>(inner);
@@ -1263,7 +1264,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         }
     }
 
-    generateHeader(title, inner, marker, true);
+    generateHeader(title, inner, marker);
     sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
     generateTableOfContents(inner,marker,&sections);
     generateTitle(title, subtitleText, SmallSubTitle, inner, marker);
@@ -1474,7 +1475,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         htmlTitle = fullTitle;
     }
 
-    generateHeader(htmlTitle, fake, marker, true);
+    generateHeader(htmlTitle, fake, marker);
         
     /*
       Generate the TOC for the new doc format.
@@ -1674,6 +1675,9 @@ QString HtmlGenerator::fileExtension(const Node * /* node */) const
     return "html";
 }
 
+/*!
+  Output breadcrumb list in the html file.
+ */
 void HtmlGenerator::generateBreadCrumbs(const QString& title,
                                         const Node *node,
                                         CodeMarker *marker)
@@ -1682,6 +1686,7 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title,
     if (node->type() == Node::Class) {
         const ClassNode* cn = static_cast<const ClassNode*>(node);
         QString name =  node->moduleName();
+        out() << "              <li><a href=\"modules.html\">All Modules</a></li>";
         if (!name.isEmpty()) {
             out() << "              <li>";
             breadcrumb << Atom(Atom::AutoLink,name);
@@ -1699,24 +1704,57 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title,
     else if (node->type() == Node::Fake) {
         const FakeNode* fn = static_cast<const FakeNode*>(node);
         if (node->subType() == Node::Module) {
+            out() << "              <li><a href=\"modules.html\">All Modules</a></li>";
+            QString name =  node->name();
+            if (!name.isEmpty()) {
+                out() << "              <li>";
+                breadcrumb << Atom(Atom::AutoLink,name);
+                generateText(breadcrumb, 0, marker);
+                out() << "</li>\n";
+            }
+        }
+        else if (node->subType() == Node::Group) {
+            if (fn->name() == QString("modules"))
+                out() << "              <li><a href=\"modules.html\">All Modules</a></li>";
         }
         else if (node->subType() == Node::Page) {
+            if (fn->name() == QString("examples.html")) {
+                out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+            }
+            else if (fn->name().startsWith("examples-")) {
+                out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+                out() << "              <li><a href=\"" << fn->name() << "\">" << title
+                      << "</a></li>";
+            }
+            else if (fn->name() == QString("namespaces.html")) {
+                out() << "              <li><a href=\"namespaces.html\">All Namespaces</a></li>";
+            }
         }
         else if (node->subType() == Node::QmlClass) {
         }
         else if (node->subType() == Node::Example) {
+            out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+            QStringList sl = fn->name().split('/');
+            QString name = "examples-" + sl.at(0) + ".html";
+            QString t = CodeParser::titleFromName(name);
+            out() << "              <li><a href=\"" << name << "\">"
+                  << t << "</a></li>";
+            out() << "              <li><a href=\"" << sl.at(0)
+                  << "-" << sl.at(sl.size()-1) << ".html\">"
+                  << title << "</a></li>";
         }
     }
     else if (node->type() == Node::Namespace) {
         const NamespaceNode* nsn = static_cast<const NamespaceNode*>(node);
+        out() << "              <li><a href=\"namespaces.html\">All Namespaces</a></li>";
+        out() << "              <li><a href=\"" << fileName(nsn) << "\">" << title
+              << "</a></li>";
     }
 }
 
-
 void HtmlGenerator::generateHeader(const QString& title,
                                    const Node *node,
-                                   CodeMarker *marker,
-                                   bool mainPage)
+                                   CodeMarker *marker)
 {
     out() << QString("<?xml version=\"1.0\" encoding=\"%1\"?>\n").arg(outputEncoding);
     out() << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
@@ -2082,7 +2120,7 @@ QString HtmlGenerator::generateListOfAllMemberFile(const InnerNode *inner,
     QString fileName = fileBase(inner) + "-members." + fileExtension(inner);
     beginSubPage(inner->location(), fileName);
     QString title = "List of All Members for " + inner->name();
-    generateHeader(title, inner, marker, false);
+    generateHeader(title, inner, marker);
     generateTitle(title, Text(), SmallSubTitle, inner, marker);
     out() << "<p>This is the complete list of members for ";
     generateFullName(inner, 0, marker);
@@ -2126,7 +2164,7 @@ QString HtmlGenerator::generateLowStatusMemberFile(const InnerNode *inner,
     }
 
     beginSubPage(inner->location(), fileName);
-    generateHeader(title, inner, marker, false);
+    generateHeader(title, inner, marker);
     generateTitle(title, Text(), SmallSubTitle, inner, marker);
 
     if (status == CodeMarker::Compat) {
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 68e620e..d80cbdb 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -134,8 +134,9 @@ class HtmlGenerator : public PageGenerator
     void generateBreadCrumbs(const QString& title,
                              const Node *node,
                              CodeMarker *marker);
-    void generateHeader(const QString& title, const Node *node = 0,
-                        CodeMarker *marker = 0, bool mainPage = true);
+    void generateHeader(const QString& title, 
+                        const Node *node = 0,
+                        CodeMarker *marker = 0);
     void generateTitle(const QString& title, 
                        const Text &subTitle, 
                        SubTitleSize subTitleSize,
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index 7449ac3..0426f4d 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -3,6 +3,7 @@ defines                 = Q_QDOC \
                           QT_.*_LIB \
                           QT_COMPAT \
                           QT_KEYPAD_NAVIGATION \
+			  QT_NO_EGL \
                           QT3_SUPPORT \
                           Q_WS_.* \
                           Q_OS_.* \
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 944a32c..85a29c2 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -45,6 +45,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "              <li><a href=\"modules.html\">All modules</a></li>\n" \
 			  "              <li><a href=\"classes.html\">All classes</a></li>\n" \
 			  "              <li><a href=\"functions.html\">All functions</a></li>\n" \
+			  "              <li><a href=\"namespaces.html\">All namespaces</a></li>\n" \
 			  "              <li><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \
 			  "            </ul>\n" \
 			  "          </div>\n" \
diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts
index 7a69cbe..77feab6 100644
--- a/translations/qt_fr.ts
+++ b/translations/qt_fr.ts
@@ -44,7 +44,7 @@
     <message>
         <location filename="../src/3rdparty/phonon/phonon/audiooutput.cpp" line="+375"/>
         <source>&lt;html&gt;The audio playback device &lt;b&gt;%1&lt;/b&gt; does not work.&lt;br/&gt;Falling back to &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</source>
-        <translation>&lt;html&gt;Le dispositif audio &lt;b&gt;%1&lt;/b&gt; ne fonctionne pas.&lt;br/&gt;Utilisation de &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;Le périphérique audio &lt;b&gt;%1&lt;/b&gt; ne fonctionne pas.&lt;br/&gt;Utilisation de &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -102,7 +102,6 @@
 <context>
     <name>CloseButton</name>
     <message>
-        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2251"/>
         <source>Close Tab</source>
         <translation>Fermer l&apos;onglet</translation>
     </message>
@@ -176,32 +175,26 @@ so on.</source>
 <context>
     <name>Phonon::</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/phononnamespace.cpp" line="+55"/>
         <source>Notifications</source>
-        <translation></translation>
+        <translation>Notifications</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Music</source>
         <translation>Musique</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Communication</source>
-        <translation></translation>
+        <translation>Communication</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Games</source>
         <translation>Jeux</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Accessibility</source>
         <translation>Accessibilité</translation>
     </message>
@@ -209,14 +202,12 @@ so on.</source>
 <context>
     <name>Phonon::Gstreamer::Backend</name>
     <message>
-        <location filename="../src/3rdparty/phonon/gstreamer/backend.cpp" line="+171"/>
         <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.
           Some video features have been disabled.</source>
         <translation>Attention: Vous n&apos;avez apparemment pas installé le paquet gstreamer0.10-plugins-good.
 Des fonctionnalités vidéo ont été desactivées.</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Warning: You do not seem to have the base GStreamer plugins installed.
           All audio and video support has been disabled</source>
         <translation>Attention: Vous n&apos;avez apparemment pas installées les plugins de base de GStreamer.
@@ -231,7 +222,7 @@ Le support audio et vidéo est désactivé</translation>
 
 Check your Gstreamer installation and make sure you 
 have libgstreamer-plugins-base installed.</source>
-        <translation>Impossible de démarrer la lecture. Verifiez votre installation de Gstreamer et assuez-vousd&apos;avoir installé libgstreamer-plugins-base.</translation>
+        <translation>Impossible de démarrer la lecture. Verifiez votre installation de Gstreamer et assurez-vous d&apos;avoir installé libgstreamer-plugins-base.</translation>
     </message>
     <message>
         <source>Unknown media format: %1</source>
@@ -266,68 +257,62 @@ have libgstreamer-plugins-base installed.</source>
         <translation type="obsolete">Impossible de charger la source</translation>
     </message>
     <message>
-        <location line="+113"/>
         <source>A required codec is missing. You need to install the following codec(s) to play this content: %0</source>
         <translation>Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu: %0</translation>
     </message>
     <message>
-        <location line="+676"/>
-        <location line="+8"/>
-        <location line="+15"/>
-        <location line="+9"/>
-        <location line="+6"/>
-        <location line="+19"/>
-        <location line="+335"/>
-        <location line="+24"/>
         <source>Could not open media source.</source>
         <translation>Impossible d&apos;ouvrir le média source.</translation>
     </message>
     <message>
-        <location line="-403"/>
         <source>Invalid source type.</source>
         <translation>Type de source invalide.</translation>
     </message>
     <message>
-        <location line="+377"/>
         <source>Could not locate media source.</source>
         <translation>Impossible de localiser le média source.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Could not open audio device. The device is already in use.</source>
         <translation>Impossible d&apos;ouvrir le périphérique audio. Celui-ci est déjà en cours d&apos;utilisation.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Could not decode media source.</source>
         <translation>Impossible de décoder le média source.</translation>
     </message>
+    <message>
+        <source>Cannot start playback. 
+
+Check your GStreamer installation and make sure you 
+have libgstreamer-plugins-base installed.</source>
+        <translation>Impossible de démarrer la lecture.
+
+Vérifiez votre installation de GStreamer et assurez-vous 
+d&apos;avoir installé libgstreamer-plugins-base.</translation>
+    </message>
 </context>
 <context>
     <name>Phonon::VolumeSlider</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/volumeslider.cpp" line="+42"/>
-        <location line="+18"/>
         <source>Volume: %1%</source>
         <translation>Volume: %1%</translation>
     </message>
     <message>
-        <location line="-15"/>
-        <location line="+18"/>
-        <location line="+54"/>
         <source>Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%</source>
         <translation>Utilisez le slider pour ajuster le volume. La position la plus à gauche est 0%, la plus à droite est %1%</translation>
     </message>
+    <message>
+        <source>Muted</source>
+        <translation>Son coupé</translation>
+    </message>
 </context>
 <context>
     <name>Q3Accel</name>
     <message>
-        <location filename="../src/qt3support/other/q3accel.cpp" line="+481"/>
         <source>%1, %2 not defined</source>
         <translation>La séquence %1, %2 n&apos;est pas définie</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Ambiguous %1 not handled</source>
         <translation>Séquence ambiguë %1 non traitée</translation>
     </message>
@@ -335,27 +320,22 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Q3DataTable</name>
     <message>
-        <location filename="../src/qt3support/sql/q3datatable.cpp" line="+285"/>
         <source>True</source>
         <translation>Vrai</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>False</source>
         <translation>Faux</translation>
     </message>
     <message>
-        <location line="+505"/>
         <source>Insert</source>
         <translation>Insérer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Update</source>
         <translation>Actualiser</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
@@ -363,313 +343,238 @@ have libgstreamer-plugins-base installed.</source>
 <context>
     <name>Q3FileDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog.cpp" line="+864"/>
         <source>Copy or Move a File</source>
         <translation>Copie ou déplace un fichier</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Read: %1</source>
         <translation>Lecture : %1</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+30"/>
         <source>Write: %1</source>
         <translation>Écriture : %1</translation>
     </message>
     <message>
-        <location line="-22"/>
-        <location line="+1575"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="-157"/>
-        <location line="+49"/>
-        <location line="+2153"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_mac.cpp" line="+110"/>
         <source>All Files (*)</source>
         <translation>Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location line="-2089"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Attributes</source>
         <translation>Attributs</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location line="+2031"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location line="-1991"/>
         <source>Look &amp;in:</source>
         <translation>Chercher &amp;dans :</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+1981"/>
-        <location line="+16"/>
         <source>File &amp;name:</source>
         <translation>&amp;Nom de fichier :</translation>
     </message>
     <message>
-        <location line="-1996"/>
         <source>File &amp;type:</source>
         <translation>&amp;Type de fichier :</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Back</source>
         <translation>Précédent (historique)</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>One directory up</source>
         <translation>Aller au dossier parent</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Create New Folder</source>
         <translation>Créer un nouveau dossier</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>List View</source>
         <translation>Affichage liste</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Detail View</source>
         <translation>Affichage détaillé</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Preview File Info</source>
         <translation>Informations du fichier prévisualisé</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Preview File Contents</source>
         <translation>Contenu du fichier prévisualisé</translation>
     </message>
     <message>
-        <location line="+88"/>
         <source>Read-write</source>
         <translation>Lecture-écriture</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Read-only</source>
         <translation>Lecture seule</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Write-only</source>
         <translation>Écriture seule</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Inaccessible</source>
         <translation>Inaccessible</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Symlink to File</source>
         <translation>Lien symbolique vers un fichier</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Symlink to Directory</source>
         <translation>Lien symbolique vers un dossier</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Symlink to Special</source>
         <translation>Lien symbolique vers un fichier spécial</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Dir</source>
         <translation>Dossier</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Special</source>
         <translation>Fichier spécial</translation>
     </message>
     <message>
-        <location line="+704"/>
-        <location line="+2100"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+337"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location line="-1990"/>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="+84"/>
         <source>Save As</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location line="+642"/>
-        <location line="+5"/>
-        <location line="+355"/>
         <source>&amp;Open</source>
         <translation>&amp;Ouvrir</translation>
     </message>
     <message>
-        <location line="-357"/>
-        <location line="+341"/>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
     <message>
-        <location line="-334"/>
         <source>&amp;Rename</source>
         <translation>&amp;Renommer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Delete</source>
         <translation>Suppri&amp;mer</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>R&amp;eload</source>
         <translation>R&amp;echarger</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Sort by &amp;Name</source>
         <translation>Trier par &amp;nom</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Sort by &amp;Size</source>
         <translation>Trier par ta&amp;ille</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sort by &amp;Date</source>
         <translation>Trier par &amp;date</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Unsorted</source>
         <translation>&amp;Non trié</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Sort</source>
         <translation>Tri</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Show &amp;hidden files</source>
         <translation>Afficher les fic&amp;hiers cachés</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>the file</source>
         <translation>le fichier</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>the directory</source>
         <translation>le dossier</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>the symlink</source>
         <translation>le lien symbolique</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete %1</source>
         <translation>Supprimer %1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;qt&gt;Are you sure you wish to delete %1 &quot;%2&quot;?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Voulez-vous vraiment supprimer %1 &quot;%2&quot; ?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>New Folder 1</source>
         <translation>Nouveau dossier 1</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>New Folder</source>
         <translation>Nouveau dossier</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>New Folder %1</source>
         <translation>Nouveau dossier %1</translation>
     </message>
     <message>
-        <location line="+98"/>
         <source>Find Directory</source>
         <translation>Chercher dans le dossier</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+108"/>
         <source>Directories</source>
         <translation>Dossiers</translation>
     </message>
     <message>
-        <location line="-2"/>
         <source>Directory:</source>
         <translation>Dossier :</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+1110"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location line="-1109"/>
         <source>%1
 File not found.
 Check path and filename.</source>
@@ -678,17 +583,14 @@ Impossible de trouver le fichier.
 Vérifier le chemin et le nom du fichier.</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/dialogs/q3filedialog_win.cpp" line="-289"/>
         <source>All Files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
     <message>
-        <location line="+375"/>
         <source>Open </source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location line="+155"/>
         <source>Select a Directory</source>
         <translation>Sélectionner un dossier</translation>
     </message>
@@ -696,29 +598,24 @@ Vérifier le chemin et le nom du fichier.</translation>
 <context>
     <name>Q3LocalFs</name>
     <message>
-        <location filename="../src/qt3support/network/q3localfs.cpp" line="+130"/>
-        <location line="+10"/>
         <source>Could not read directory
 %1</source>
         <translation>Impossible de lire le dossier
 %1</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Could not create directory
 %1</source>
         <translation>Impossible de créer le dossier
 %1</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Could not remove file or directory
 %1</source>
         <translation>Impossible de supprimer le fichier ou dossier
 %1</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Could not rename
 %1
 to
@@ -729,14 +626,12 @@ en
 %2</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Could not open
 %1</source>
         <translation>Impossible d&apos;ouvrir
 %1</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>Could not write
 %1</source>
         <translation>Impossible d&apos;écrire
@@ -746,12 +641,10 @@ en
 <context>
     <name>Q3MainWindow</name>
     <message>
-        <location filename="../src/qt3support/widgets/q3mainwindow.cpp" line="+2051"/>
         <source>Line up</source>
         <translation>Aligner</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Customize...</source>
         <translation>Personnaliser...</translation>
     </message>
@@ -759,7 +652,6 @@ en
 <context>
     <name>Q3NetworkProtocol</name>
     <message>
-        <location filename="../src/qt3support/network/q3networkprotocol.cpp" line="+854"/>
         <source>Operation stopped by the user</source>
         <translation>Opération interrompue par l&apos;utilisateur</translation>
     </message>
@@ -767,8 +659,6 @@ en
 <context>
     <name>Q3ProgressDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3progressdialog.cpp" line="+224"/>
-        <location line="+61"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -776,28 +666,22 @@ en
 <context>
     <name>Q3TabDialog</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3tabdialog.cpp" line="+189"/>
-        <location line="+814"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="-356"/>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Defaults</source>
         <translation>Par défaut</translation>
     </message>
     <message>
-        <location line="+50"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -805,38 +689,30 @@ en
 <context>
     <name>Q3TextEdit</name>
     <message>
-        <location filename="../src/qt3support/text/q3textedit.cpp" line="+5429"/>
         <source>&amp;Undo</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Redo</source>
         <translation>&amp;Rétablir</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Cu&amp;t</source>
         <translation>Co&amp;uper</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Copy</source>
         <translation>Cop&amp;ier</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Paste</source>
         <translation>Co&amp;ller</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+2"/>
         <source>Select All</source>
         <translation>Tout sélectionner</translation>
     </message>
@@ -844,75 +720,66 @@ en
 <context>
     <name>Q3TitleBar</name>
     <message>
-        <location filename="../src/plugins/accessible/compat/q3complexwidgets.cpp" line="+246"/>
         <source>System</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore up</source>
         <translation>Restaurer en haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Minimize</source>
         <translation>Réduire</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore down</source>
         <translation>Restaurer en bas</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Maximize</source>
         <translation>Maximiser</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Contains commands to manipulate the window</source>
         <translation>Contient des commandes pour manipuler la fenêtre</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location filename="../src/plugins/accessible/compat/q3complexwidgets.cpp" line="+277"/>
         <source>Puts a minimized back to normal</source>
         <translation>Rend à une fenêtre minimisée son aspect normal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Moves the window out of the way</source>
         <translation>Déplace la fenêtre à l&apos;écart</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Puts a maximized window back to normal</source>
         <translation>Rend à une fenêtre minimisée son aspect normal</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Makes the window full screen</source>
         <translation>Affiche la fenêtre en plein écran</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Closes the window</source>
         <translation>Ferme la fenêtre</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Displays the name of the window and contains controls to manipulate it</source>
         <translation>Affiche le nom de la fenêtre et contient des contrôles pour la manipuler</translation>
     </message>
+    <message>
+        <source>Puts a minimized window back to normal</source>
+        <translation>Rend à une fenêtre minimisée son aspect normal</translation>
+    </message>
 </context>
 <context>
     <name>Q3ToolBar</name>
     <message>
-        <location filename="../src/qt3support/widgets/q3toolbar.cpp" line="+692"/>
         <source>More...</source>
         <translation>Reste...</translation>
     </message>
@@ -920,51 +787,38 @@ en
 <context>
     <name>Q3UrlOperator</name>
     <message>
-        <location filename="../src/qt3support/network/q3urloperator.cpp" line="+386"/>
-        <location line="+260"/>
-        <location line="+4"/>
         <source>The protocol `%1&apos; is not supported</source>
         <translation>Le protocole &apos;%1&apos; n&apos;est pas géré</translation>
     </message>
     <message>
-        <location line="-260"/>
         <source>The protocol `%1&apos; does not support listing directories</source>
         <translation>Le protocole `%1&apos; ne permet pas de lister les fichiers d&apos;un dossier</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support creating new directories</source>
         <translation>Le protocole `%1&apos; ne permet pas de créer de nouveaux dossiers</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support removing files or directories</source>
         <translation>Le protocole `%1&apos; ne permet pas de supprimer des fichiers ou des dossiers</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support renaming files or directories</source>
         <translation>Le protocole `%1&apos; ne permet pas de renommer des fichiers ou des dossiers</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support getting files</source>
         <translation>Le protocole `%1&apos; ne permet pas de recevoir des fichiers</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The protocol `%1&apos; does not support putting files</source>
         <translation>Le protocole `%1&apos; ne permet pas d&apos;envoyer des fichiers</translation>
     </message>
     <message>
-        <location line="+243"/>
-        <location line="+4"/>
         <source>The protocol `%1&apos; does not support copying or moving files or directories</source>
         <translation>Le protocole `%1&apos; ne permet pas de copier ou de déplacer des fichiers</translation>
     </message>
     <message>
-        <location line="+237"/>
-        <location line="+1"/>
         <source>(unknown)</source>
         <translation>(inconnu)</translation>
     </message>
@@ -972,27 +826,22 @@ en
 <context>
     <name>Q3Wizard</name>
     <message>
-        <location filename="../src/qt3support/dialogs/q3wizard.cpp" line="+177"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Précédent</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Suivant &gt;</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Finish</source>
         <translation>&amp;Terminer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
@@ -1000,44 +849,30 @@ en
 <context>
     <name>QAbstractSocket</name>
     <message>
-        <location filename="../src/network/socket/qabstractsocket.cpp" line="+868"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+615"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+657"/>
-        <location line="+26"/>
         <source>Host not found</source>
         <translation>Hôte introuvable</translation>
     </message>
     <message>
-        <location line="+50"/>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="+3"/>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="+4"/>
         <source>Connection refused</source>
         <translation>Connexion refusée</translation>
     </message>
     <message>
-        <location line="+141"/>
         <source>Connection timed out</source>
         <translation>Connexion expirée</translation>
     </message>
     <message>
-        <location line="-547"/>
-        <location line="+787"/>
-        <location line="+208"/>
         <source>Operation on socket is not supported</source>
         <translation>Opération sur socket non supportée</translation>
     </message>
     <message>
-        <location line="+137"/>
         <source>Socket operation timed out</source>
         <translation>Opération socket expirée</translation>
     </message>
     <message>
-        <location line="+380"/>
         <source>Socket is not connected</source>
         <translation>Le socket n&apos;est pas connecté</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-8"/>
         <source>Network unreachable</source>
         <translation>Réseau impossible à rejoindre</translation>
     </message>
@@ -1045,17 +880,14 @@ en
 <context>
     <name>QAbstractSpinBox</name>
     <message>
-        <location filename="../src/gui/widgets/qabstractspinbox.cpp" line="+1199"/>
         <source>&amp;Step up</source>
         <translation>&amp;Augmenter</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Step &amp;down</source>
         <translation>&amp;Diminuer</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>&amp;Select All</source>
         <translation>Tout &amp;sélectionner</translation>
     </message>
@@ -1069,45 +901,41 @@ en
         <translation>LTR</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.h" line="+352"/>
         <source>Executable &apos;%1&apos; requires Qt %2, found Qt %3.</source>
         <translation>L&apos;exécutable &apos;%1&apos; requiert Qt %2 (Qt %3 présent).</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Incompatible Qt Library Error</source>
         <translation>Erreur : bibliothèque Qt incompatible</translation>
     </message>
     <message>
-        <location filename="../src/gui/accessible/qaccessibleobject.cpp" line="+376"/>
         <source>Activate</source>
         <translation>Activer</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Activates the program&apos;s main window</source>
         <translation>Active la fenêtre principale du programme</translation>
     </message>
+    <message>
+        <source>QT_LAYOUT_DIRECTION</source>
+        <translation>LTR</translation>
+    </message>
 </context>
 <context>
     <name>QAxSelect</name>
     <message>
-        <location filename="../src/activeqt/container/qaxselect.ui"/>
         <source>Select ActiveX Control</source>
         <translation>Sélectionner un contrôle ActiveX</translation>
     </message>
     <message>
-        <location/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location/>
         <source>COM &amp;Object:</source>
         <translation>&amp;Objet COM :</translation>
     </message>
@@ -1115,17 +943,14 @@ en
 <context>
     <name>QCheckBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+114"/>
         <source>Uncheck</source>
         <translation>Décocher</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Check</source>
         <translation>Cocher</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Toggle</source>
         <translation>Changer</translation>
     </message>
@@ -1133,52 +958,42 @@ en
 <context>
     <name>QColorDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qcolordialog.cpp" line="+1253"/>
         <source>Hu&amp;e:</source>
         <translation>&amp;Teinte :</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Sat:</source>
         <translation>&amp;Saturation :</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Val:</source>
         <translation>&amp;Valeur :</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Red:</source>
         <translation>&amp;Rouge :</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Green:</source>
         <translation>&amp;Vert :</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bl&amp;ue:</source>
         <translation>Ble&amp;u :</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A&amp;lpha channel:</source>
         <translation>Canal a&amp;lpha :</translation>
     </message>
     <message>
-        <location line="+101"/>
         <source>Select Color</source>
         <translation>Sélectionner une couleur</translation>
     </message>
     <message>
-        <location line="+137"/>
         <source>&amp;Basic colors</source>
         <translation>Couleurs de &amp;base</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Custom colors</source>
         <translation>&amp;Couleurs personnalisées</translation>
     </message>
@@ -1195,7 +1010,6 @@ en
         <translation type="obsolete">Annuler</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Add to Custom Colors</source>
         <translation>&amp;Ajouter aux couleurs personnalisées</translation>
     </message>
@@ -1207,23 +1021,18 @@ en
 <context>
     <name>QComboBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+1771"/>
-        <location line="+65"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qitemeditorfactory.cpp" line="+544"/>
         <source>False</source>
         <translation>Faux</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>True</source>
         <translation>Vrai</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="+0"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
@@ -1273,26 +1082,50 @@ en
         <comment>QSystemSemaphore</comment>
         <translation>%1: ftok a échoué</translation>
     </message>
+    <message>
+        <source>%1: key is empty</source>
+        <translation>%1: clé vide</translation>
+    </message>
+    <message>
+        <source>%1: unable to make key</source>
+        <translation>%1: impossible de créer la clé</translation>
+    </message>
+    <message>
+        <source>%1: ftok failed</source>
+        <translation>%1: ftok a échoué</translation>
+    </message>
+    <message>
+        <source>%1: already exists</source>
+        <translation>%1: existe déjà</translation>
+    </message>
+    <message>
+        <source>%1: does not exist</source>
+        <translation>%1: n&apos;existe pas</translation>
+    </message>
+    <message>
+        <source>%1: out of resources</source>
+        <translation>%1: plus de ressources disponibles</translation>
+    </message>
+    <message>
+        <source>%1: unknown error %2</source>
+        <translation>%1: erreur inconnue %2</translation>
+    </message>
 </context>
 <context>
     <name>QDB2Driver</name>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+1276"/>
         <source>Unable to connect</source>
         <translation>Incapable d&apos;établir une connexion</translation>
     </message>
     <message>
-        <location line="+303"/>
         <source>Unable to commit transaction</source>
         <translation>Incapable de soumettre la transaction</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Incapable d&apos;annuler la transaction</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to set autocommit</source>
         <translation>Impossible d&apos;activer l&apos;auto-soumission</translation>
     </message>
@@ -1300,33 +1133,26 @@ en
 <context>
     <name>QDB2Result</name>
     <message>
-        <location line="-1043"/>
-        <location line="+243"/>
         <source>Unable to execute statement</source>
         <translation>Impossible d&apos;exécuter la requête</translation>
     </message>
     <message>
-        <location line="-206"/>
         <source>Unable to prepare statement</source>
         <translation>Impossible de prépare la requête</translation>
     </message>
     <message>
-        <location line="+196"/>
         <source>Unable to bind variable</source>
         <translation>Impossible d&apos;attacher la variable</translation>
     </message>
     <message>
-        <location line="+92"/>
         <source>Unable to fetch record %1</source>
         <translation>Impossible de récupérer l&apos;enregistrement %1</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to fetch next</source>
         <translation>Impossible de récupérer le suivant</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to fetch first</source>
         <translation>Impossible de récupérer le premier</translation>
     </message>
@@ -1334,22 +1160,18 @@ en
 <context>
     <name>QDateTimeEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qdatetimeedit.cpp" line="+2295"/>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>am</source>
         <translation>am</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>pm</source>
         <translation>pm</translation>
     </message>
@@ -1357,17 +1179,14 @@ en
 <context>
     <name>QDial</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+951"/>
         <source>QDial</source>
-        <translation></translation>
+        <translation>QDial</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>SpeedoMeter</source>
         <translation>Tachymètre</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>SliderHandle</source>
         <translation>Poignée</translation>
     </message>
@@ -1375,12 +1194,10 @@ en
 <context>
     <name>QDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qdialog.cpp" line="+597"/>
         <source>What&apos;s This?</source>
         <translation>Qu&apos;est-ce que c&apos;est ?</translation>
     </message>
     <message>
-        <location line="-115"/>
         <source>Done</source>
         <translation>Terminer</translation>
     </message>
@@ -1388,124 +1205,98 @@ en
 <context>
     <name>QDialogButtonBox</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1866"/>
-        <location line="+464"/>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+561"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+3"/>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Save</source>
         <translation>Enregi&amp;strer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Reset</source>
         <translation>Réinitialiser</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Don&apos;t Save</source>
         <translation>Ne pas enregistrer</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Discard</source>
         <translation>Ne pas enregistrer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Yes to &amp;All</source>
         <translation>Oui à &amp;tout</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>N&amp;o to All</source>
         <translation>Non à to&amp;ut</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Save All</source>
         <translation>Tout Enregistrer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Retry</source>
         <translation>Réessayer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Restore Defaults</source>
         <translation>Restaurer les valeurs par défaut</translation>
     </message>
     <message>
-        <location line="-29"/>
         <source>Close without Saving</source>
-        <translation>Fermer sans sauvegarder</translation>
+        <translation>Fermer sans enregistrer</translation>
     </message>
     <message>
-        <location line="-27"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
@@ -1513,17 +1304,15 @@ en
 <context>
     <name>QDirModel</name>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+453"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+457"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
         <translation>Type</translation>
@@ -1535,25 +1324,29 @@ en
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Date Modified</source>
         <translation>Dernière Modification</translation>
     </message>
+    <message>
+        <source>Kind</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
 </context>
 <context>
     <name>QDockWidget</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/qaccessiblewidgets.cpp" line="+1239"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Dock</source>
         <translation>Attacher</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Float</source>
         <translation>Détacher</translation>
     </message>
@@ -1561,12 +1354,10 @@ en
 <context>
     <name>QDoubleSpinBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-537"/>
         <source>More</source>
         <translation>Plus</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Less</source>
         <translation>Moins</translation>
     </message>
@@ -1574,27 +1365,22 @@ en
 <context>
     <name>QErrorMessage</name>
     <message>
-        <location filename="../src/gui/dialogs/qerrormessage.cpp" line="+391"/>
         <source>&amp;Show this message again</source>
         <translation>&amp;Afficher ce message de nouveau</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location line="-200"/>
         <source>Debug Message:</source>
         <translation>Message de débogage:</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Warning:</source>
         <translation>Avertissement:</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Fatal Error:</source>
         <translation>Erreur fatale:</translation>
     </message>
@@ -1602,115 +1388,90 @@ en
 <context>
     <name>QFile</name>
     <message>
-        <location filename="../src/corelib/io/qfile.cpp" line="+708"/>
-        <location line="+141"/>
         <source>Destination file exists</source>
         <translation>Le fichier destination existe</translation>
     </message>
     <message>
-        <location line="-108"/>
         <source>Cannot remove source file</source>
         <translation>Impossible de supprimer le fichier source</translation>
     </message>
     <message>
-        <location line="+120"/>
         <source>Cannot open %1 for input</source>
         <translation>Impossible d&apos;ouvrir %1 pour lecture</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Cannot open for output</source>
         <translation>Impossible d&apos;ouvrir pour écriture</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Failure to write block</source>
         <translation>Impossible d&apos;écrire un bloc</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Cannot create %1 for output</source>
         <translation>Impossible de créer %1 pour écriture</translation>
     </message>
+    <message>
+        <source>Will not rename sequential file using block copy</source>
+        <translation>Ne renommera pas le fichier séquentiel avec la copie bloc</translation>
+    </message>
 </context>
 <context>
     <name>QFileDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Back</source>
         <translation>Précédent (historique)</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>List View</source>
         <translation>Affichage liste</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Detail View</source>
         <translation>Affichage détaillé</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+498"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location line="+680"/>
-        <location line="+50"/>
-        <location line="+1471"/>
-        <location line="+75"/>
         <source>&amp;Open</source>
         <translation>&amp;Ouvrir</translation>
     </message>
     <message>
-        <location line="-1596"/>
-        <location line="+50"/>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
     <message>
-        <location line="-699"/>
         <source>&amp;Rename</source>
         <translation>&amp;Renommer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Delete</source>
         <translation>Suppri&amp;mer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show &amp;hidden files</source>
         <translation>Afficher les fic&amp;hiers cachés</translation>
     </message>
     <message>
-        <location line="+650"/>
         <source>Directories</source>
         <translation>Dossiers</translation>
     </message>
     <message>
-        <location line="+1869"/>
         <source>Recent Places</source>
         <translation>Emplacements récents</translation>
     </message>
     <message>
-        <location line="-2535"/>
-        <location line="+444"/>
         <source>All Files (*)</source>
         <translation>Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location line="+1054"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
         <translation>Le fichier %1 existe déjà. Voulez-vous l&apos;écraser ?</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>%1
 File not found.
 Please verify the correct file name was given.</source>
@@ -1719,25 +1480,18 @@ Fichier introuvable.
 Veuillez vérifier que le nom du fichier est correct.</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qdirmodel.cpp" line="+402"/>
         <source>My Computer</source>
         <translation>Poste de travail</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Parent Directory</source>
         <translation>Dossier parent</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Files of type:</source>
         <translation>Fichiers de type :</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-1496"/>
-        <location line="+648"/>
         <source>Directory:</source>
         <translation>Dossier :</translation>
     </message>
@@ -1750,8 +1504,6 @@ Fichier introuvable.
 Veuillez vérifier que le nom du fichier est correct</translation>
     </message>
     <message>
-        <location line="+794"/>
-        <location line="+862"/>
         <source>%1
 Directory not found.
 Please verify the correct directory name was given.</source>
@@ -1760,153 +1512,136 @@ Dossier introuvable.
 Veuillez vérifier que le nom du dossier est correct.</translation>
     </message>
     <message>
-        <location line="-218"/>
         <source>&apos;%1&apos; is write protected.
 Do you want to delete it anyway?</source>
         <translation>&apos;%1&apos; est protégé en écriture.
 Voulez-vous quand même le supprimer ?</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Are sure you want to delete &apos;%1&apos;?</source>
         <translation>Etes-vous sûr de vouloir supprimer &apos;%1&apos; ?</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Could not delete directory.</source>
         <translation>Impossible de supprimer le dossier.</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog_win.cpp" line="+160"/>
         <source>All Files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-2143"/>
         <source>Save As</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../src/gui/itemviews/qfileiconprovider.cpp" line="+411"/>
         <source>Drive</source>
         <translation>Unité</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location line="+1"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-4"/>
         <source>Find Directory</source>
         <translation>Chercher dans le dossier</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Show </source>
         <translation>Montrer </translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Forward</source>
         <translation>Successeur</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="+1970"/>
         <source>New Folder</source>
         <translation>Nouveau dossier</translation>
     </message>
     <message>
-        <location line="-1963"/>
         <source>&amp;New Folder</source>
         <translation>&amp;Nouveau dossier</translation>
     </message>
     <message>
-        <location line="+656"/>
-        <location line="+38"/>
         <source>&amp;Choose</source>
         <translation>&amp;Choisir</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qsidebar.cpp" line="+418"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.cpp" line="-687"/>
-        <location line="+652"/>
         <source>File &amp;name:</source>
         <translation>&amp;Nom de fichier :</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfiledialog.ui"/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Look in:</source>
         <translation>Voir dans:</translation>
     </message>
     <message>
-        <location/>
-        <location filename="../src/gui/dialogs/qfiledialog_wince.ui"/>
         <source>Create New Folder</source>
         <translation>Créer un nouveau dossier</translation>
     </message>
+    <message>
+        <source>File Folder</source>
+        <translation>Fichier Dossier</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation>Dossier</translation>
+    </message>
+    <message>
+        <source>Alias</source>
+        <translation>Alias</translation>
+    </message>
+    <message>
+        <source>Shortcut</source>
+        <translation>Raccourci</translation>
+    </message>
 </context>
 <context>
     <name>QFileSystemModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+744"/>
         <source>%1 TB</source>
         <translation>%1 To</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>%1 GB</source>
         <translation>%1 Go</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>%1 MB</source>
         <translation>%1 Mo</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>%1 KB</source>
         <translation>%1 Ko</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>%1 bytes</source>
         <translation>%1 octets</translation>
     </message>
     <message>
-        <location line="+77"/>
         <source>Invalid filename</source>
         <translation>Nom de fichier invalide</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;b&gt;The name &quot;%1&quot; can not be used.&lt;/b&gt;&lt;p&gt;Try using another name, with fewer characters or no punctuations marks.</source>
         <translation>&lt;b&gt;Le nom &quot;%1&quot; ne peut pas être utilisé.&lt;/b&gt;&lt;p&gt;Essayez un autre nom avec moins de caractères ou sans ponctuation.</translation>
     </message>
     <message>
-        <location line="+63"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location filename="../src/gui/dialogs/qfilesystemmodel.cpp" line="+898"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
         <translation>Type</translation>
@@ -1918,283 +1653,238 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Date Modified</source>
         <translation>Dernière modification</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qfilesystemmodel_p.h" line="+234"/>
         <source>My Computer</source>
         <translation>Mon ordinateur</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Computer</source>
         <translation>Ordinateur</translation>
     </message>
+    <message>
+        <source>Kind</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>%1 byte(s)</source>
+        <translation>%1 octet(s)</translation>
+    </message>
 </context>
 <context>
     <name>QFontDatabase</name>
     <message>
-        <location filename="../src/gui/text/qfontdatabase.cpp" line="+90"/>
-        <location line="+1176"/>
         <source>Normal</source>
-        <translation></translation>
+        <translation>Normal</translation>
     </message>
     <message>
-        <location line="-1173"/>
-        <location line="+12"/>
-        <location line="+1149"/>
         <source>Bold</source>
         <translation>Gras</translation>
     </message>
     <message>
-        <location line="-1158"/>
-        <location line="+1160"/>
         <source>Demi Bold</source>
         <translation>Semi Gras</translation>
     </message>
     <message>
-        <location line="-1157"/>
-        <location line="+18"/>
-        <location line="+1135"/>
         <source>Black</source>
         <translation>Noir</translation>
     </message>
     <message>
-        <location line="-1145"/>
         <source>Demi</source>
-        <translation></translation>
+        <translation>Demi</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+1145"/>
         <source>Light</source>
         <translation>Léger</translation>
     </message>
     <message>
-        <location line="-1004"/>
-        <location line="+1007"/>
         <source>Italic</source>
         <translation>Italique</translation>
     </message>
     <message>
-        <location line="-1004"/>
-        <location line="+1006"/>
         <source>Oblique</source>
-        <translation></translation>
+        <translation>Oblique</translation>
     </message>
     <message>
-        <location line="+705"/>
         <source>Any</source>
         <translation>Tous</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Latin</source>
-        <translation></translation>
+        <translation>Latin</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Greek</source>
         <translation>Grec</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cyrillic</source>
         <translation>Cyrillique</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Armenian</source>
         <translation>Arménien</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Hebrew</source>
         <translation>Hébreu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Arabic</source>
         <translation>Arabe</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Syriac</source>
         <translation>Syriaque</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Thaana</source>
-        <translation></translation>
+        <translation>Thaana</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Devanagari</source>
-        <translation></translation>
+        <translation>Devanagari</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Bengali</source>
-        <translation></translation>
+        <translation>Bengali</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Gurmukhi</source>
-        <translation></translation>
+        <translation>Gurmukhi</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Gujarati</source>
-        <translation></translation>
+        <translation>Gujarati</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Oriya</source>
-        <translation></translation>
+        <translation>Oriya</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tamil</source>
-        <translation></translation>
+        <translation>Tamil</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Telugu</source>
-        <translation></translation>
+        <translation>Telugu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Kannada</source>
-        <translation></translation>
+        <translation>Kannada</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Malayalam</source>
-        <translation></translation>
+        <translation>Malayalam</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Sinhala</source>
-        <translation></translation>
+        <translation>Sinhala</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Thai</source>
-        <translation></translation>
+        <translation>Thaï</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Lao</source>
-        <translation></translation>
+        <translatorcomment>Lao/Laotien sont corrects</translatorcomment>
+        <translation>Lao</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tibetan</source>
         <translation>Tibétain</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Myanmar</source>
-        <translation></translation>
+        <translatorcomment>Myanmar/Birman sont corrects mais Myanmar semble plus adapté pour la langue écrite</translatorcomment>
+        <translation>Myanmar</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Georgian</source>
         <translation>Géorgien</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Khmer</source>
-        <translation></translation>
+        <translation>Khmer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Simplified Chinese</source>
         <translation>Chinois Simplifié</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Traditional Chinese</source>
         <translation>Chinois Traditionnel</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Japanese</source>
         <translation>Japonais</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Korean</source>
         <translation>Coréen</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Vietnamese</source>
         <translation>Vietnamien</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Symbol</source>
         <translation>Symbole</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Ogham</source>
-        <translation></translation>
+        <translation>Ogham</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Runic</source>
         <translation>Runique</translation>
     </message>
+    <message>
+        <source>N&apos;Ko</source>
+        <translation>N&apos;Ko</translation>
+    </message>
 </context>
 <context>
     <name>QFontDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qfontdialog.cpp" line="+772"/>
         <source>&amp;Font</source>
         <translation>&amp;Police</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Font st&amp;yle</source>
         <translation>St&amp;yle de police</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Taille</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Effects</source>
         <translation>Effets</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Stri&amp;keout</source>
         <translation>&amp;Barré</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Underline</source>
         <translation>&amp;Souligné</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Sample</source>
         <translation>Exemple</translation>
     </message>
     <message>
-        <location line="-603"/>
-        <location line="+247"/>
         <source>Select Font</source>
         <translation>Choisir une police</translation>
     </message>
     <message>
-        <location line="+357"/>
         <source>Wr&amp;iting System</source>
         <translation>&amp;Système d&apos;écriture</translation>
     </message>
@@ -2202,145 +1892,104 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QFtp</name>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+2303"/>
         <source>Host %1 found</source>
         <translation>Hôte %1 trouvé</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Host found</source>
         <translation>Hôte trouvé</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="+1003"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1456"/>
-        <location line="+1451"/>
         <source>Connected to host %1</source>
         <translation>Connecté à l&apos;hôte %1</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+7"/>
         <source>Connected to host</source>
         <translation>Connecté à l&apos;hôte</translation>
     </message>
     <message>
-        <location line="-5"/>
         <source>Connection to %1 closed</source>
         <translation>Connexion à %1 arrêtée</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qftp.cpp" line="+1375"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-243"/>
-        <location line="+250"/>
         <source>Connection closed</source>
         <translation>Connexion arrêtée</translation>
     </message>
     <message>
-        <location line="-1487"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1566"/>
         <source>Host %1 not found</source>
         <translation>Hôte %1 introuvable</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+4"/>
         <source>Connection refused to host %1</source>
         <translation>Connexion à l&apos;hôte %1 refusée</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection timed out to host %1</source>
         <translation>Connexion expirée vers l&apos;hôte %1</translation>
     </message>
     <message>
-        <location line="+501"/>
-        <location line="+29"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+458"/>
-        <location line="+728"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
     <message>
-        <location line="+889"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+77"/>
         <source>Connecting to host failed:
 %1</source>
         <translation>Échec de la connexion à l&apos;hôte
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Login failed:
 %1</source>
         <translation>Échec du login:
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Listing directory failed:
 %1</source>
         <translation>Échec du listage du dossier :
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Changing directory failed:
 %1</source>
         <translation>Échec du changement de dossier :
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Downloading file failed:
 %1</source>
         <translation>Échec du téléchargement du fichier :
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Uploading file failed:
 %1</source>
         <translation>Échec du télédéchargement :
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Removing file failed:
 %1</source>
         <translation>Échec de la suppression d&apos;un fichier :
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Creating directory failed:
 %1</source>
         <translation>Échec de la création d&apos;un dossier :
 %1</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+3"/>
         <source>Removing directory failed:
 %1</source>
         <translation>Échec de la suppression d&apos;un dossier :
 %1</translation>
     </message>
     <message>
-        <location line="-1524"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="-1356"/>
         <source>Not connected</source>
         <translation>Non connecté</translation>
     </message>
     <message>
-        <location line="+396"/>
-        <location filename="../src/qt3support/network/q3ftp.cpp" line="+332"/>
         <source>Connection refused for data connection</source>
         <translation>Connexion donnée refusée</translation>
     </message>
@@ -2348,7 +1997,6 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QHostInfo</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_p.h" line="+183"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
@@ -2356,185 +2004,133 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QHostInfoAgent</name>
     <message>
-        <location filename="../src/network/kernel/qhostinfo_unix.cpp" line="+178"/>
-        <location line="+9"/>
-        <location line="+64"/>
-        <location line="+31"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="+180"/>
-        <location line="+9"/>
-        <location line="+40"/>
-        <location line="+27"/>
         <source>Host not found</source>
         <translation>Hôte introuvable</translation>
     </message>
     <message>
-        <location line="-44"/>
-        <location line="+39"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-34"/>
-        <location line="+29"/>
         <source>Unknown address type</source>
         <translation>Adresse de type inconnu</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location filename="../src/network/kernel/qhostinfo_win.cpp" line="-19"/>
-        <location line="+27"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
+    <message>
+        <source>No host name given</source>
+        <translation>Aucun nom d&apos;hôte n&apos;a été donné</translation>
+    </message>
+    <message>
+        <source>Invalid hostname</source>
+        <translation>Nom d&apos;hôte non valide</translation>
+    </message>
 </context>
 <context>
     <name>QHttp</name>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+876"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+1836"/>
         <source>Connection refused</source>
         <translation>Connexion refusée</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="+2631"/>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-4"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+3"/>
         <source>Host %1 not found</source>
         <translation>Hôte %1 introuvable</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-45"/>
         <source>Wrong content length</source>
         <translation>Longueur du contenu invalide</translation>
     </message>
     <message>
-        <location line="+82"/>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+10"/>
-        <location line="+19"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+48"/>
         <source>HTTP request failed</source>
         <translation>Échec de la requête HTTP</translation>
     </message>
     <message>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+450"/>
         <source>Host %1 found</source>
         <translation>Hôte %1 trouvé</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Host found</source>
         <translation>Hôte trouvé</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>Connected to host %1</source>
         <translation>Connecté à l&apos;hôte %1</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Connected to host</source>
         <translation>Connecté à l&apos;hôte</translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>Connection to %1 closed</source>
         <translation>Connexion à %1 arrêtée</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="-22"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+14"/>
         <source>Connection closed</source>
         <translation>Connexion arrêtée</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="-1077"/>
-        <location line="+820"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-1152"/>
-        <location line="+567"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
     <message>
-        <location line="-568"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="-370"/>
         <source>Request aborted</source>
         <translation>Requête interrompue</translation>
     </message>
     <message>
-        <location line="+579"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+381"/>
         <source>No server set to connect to</source>
         <translation>Aucun serveur spécifié</translation>
     </message>
     <message>
-        <location line="+168"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+60"/>
         <source>Server closed connection unexpectedly</source>
         <translation>Connexion interrompue par le serveur</translation>
     </message>
     <message>
-        <location line="+151"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+113"/>
         <source>Invalid HTTP response header</source>
         <translation>Entête de réponse HTTP invalide</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Unknown authentication method</source>
         <translation>Méthode d&apos;authentification inconnue</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <location line="+48"/>
-        <location filename="../src/qt3support/network/q3http.cpp" line="+40"/>
-        <location line="+47"/>
         <source>Invalid HTTP chunked body</source>
         <translation>Fragment HTTP invalide</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>Error writing response to device</source>
         <translation>Erreur lors de l&apos;écriture de la réponse</translation>
     </message>
     <message>
-        <location line="-173"/>
         <source>Proxy authentication required</source>
         <translation>Le proxy requiert une authentification</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Authentication required</source>
         <translation>Authentification requise</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttpnetworkconnection.cpp" line="+6"/>
         <source>Proxy requires authentication</source>
         <translation>Le proxy requiert une authentification</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Host requires authentication</source>
         <translation>L&apos;hôte requiert une authentification</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Data corrupted</source>
         <translation>Données corrompues</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unknown protocol specified</source>
         <translation>Protocole spécifié inconnu</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>SSL handshake failed</source>
         <translation>le handshake SSL a échoué</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qhttp.cpp" line="-138"/>
         <source>Connection refused (or timed out)</source>
         <translation>Connexion refusée (ou délai expiré)</translation>
     </message>
     <message>
-        <location line="-2263"/>
         <source>HTTPS connection requested but SSL support not compiled in</source>
         <translation>Connexion HTTPS requise mais le support SSL n&apos;est pas compilé</translation>
     </message>
@@ -2542,47 +2138,38 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QHttpSocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qhttpsocketengine.cpp" line="-89"/>
         <source>Did not receive HTTP response from proxy</source>
         <translation>Pas de réponse HTTP de la part du proxy</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Error parsing authentication request from proxy</source>
         <translation>Erreur dans le reqête d&apos;authentification reçue du proxy</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Authentication required</source>
         <translation>Authentification requise</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Proxy denied connection</source>
         <translation>Le Proxy a rejeté la connexion</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Error communicating with HTTP proxy</source>
         <translation>Erreur de communication avec le proxy HTTP</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Proxy server not found</source>
         <translation>Serveur proxy introuvable</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy connection refused</source>
         <translation>Connexion au proxy refusée</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy server connection timed out</source>
         <translation>La connexion au serveur proxy a expiré</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Proxy connection closed prematurely</source>
         <translation>La connexion au serveur proxy a été fermée prématurément</translation>
     </message>
@@ -2590,22 +2177,18 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QIBaseDriver</name>
     <message>
-        <location filename="../src/sql/drivers/ibase/qsql_ibase.cpp" line="+1428"/>
         <source>Error opening database</source>
         <translation>Erreur d&apos;ouverture de la base de données</translation>
     </message>
     <message>
-        <location line="+54"/>
         <source>Could not start transaction</source>
         <translation>La transaction n&apos;a pas pu être démarrée</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unable to commit transaction</source>
         <translation>Incapable de soumettre la transaction</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Unable to rollback transaction</source>
         <translation>Incapable d&apos;annuler la transaction</translation>
     </message>
@@ -2613,89 +2196,70 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QIBaseResult</name>
     <message>
-        <location line="-1097"/>
         <source>Unable to create BLOB</source>
         <translation>Impossible de créer un BLOB</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to write BLOB</source>
         <translation>Impossible d&apos;écrire le BLOB</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Unable to open BLOB</source>
         <translation>Impossible d&apos;ouvrir le BLOB</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Unable to read BLOB</source>
         <translation>Impossible de lire le BLOB</translation>
     </message>
     <message>
-        <location line="+125"/>
-        <location line="+189"/>
         <source>Could not find array</source>
         <translation>Impossible de trouver le tableau</translation>
     </message>
     <message>
-        <location line="-157"/>
         <source>Could not get array data</source>
         <translation>Impossible de trouver le tableau de données</translation>
     </message>
     <message>
-        <location line="+212"/>
         <source>Could not get query info</source>
         <translation>Impossible d&apos;avoir les informations sur la requête</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Could not start transaction</source>
         <translation>Impossible de démarrer la transaction</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to commit transaction</source>
         <translation>Incapable de soumettre la transaction</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Could not allocate statement</source>
         <translation>Impossible d&apos;allouer la requête</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Could not prepare statement</source>
         <translation>Impossible de préparer la requête</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location line="+7"/>
         <source>Could not describe input statement</source>
         <translation>Impossible de décrire la requête</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Could not describe statement</source>
         <translation>Impossible de décrire la requête</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Unable to close statement</source>
         <translation>Impossible de fermer la requête</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Unable to execute query</source>
         <translation>Impossible d&apos;exécuter la requête</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>Could not fetch next item</source>
         <translation>Impossible de récuperer l&apos;élément suivant</translation>
     </message>
     <message>
-        <location line="+160"/>
         <source>Could not get statement info</source>
         <translation>Impossible d&apos;avoir les informations sur la requête</translation>
     </message>
@@ -2703,27 +2267,22 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QIODevice</name>
     <message>
-        <location filename="../src/corelib/global/qglobal.cpp" line="+1869"/>
         <source>Permission denied</source>
         <translation>Accès refusé</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Too many open files</source>
         <translation>Trop de fichiers ouverts simultanément</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>No such file or directory</source>
         <translation>Aucun fichier ou dossier de ce nom</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>No space left on device</source>
         <translation>Aucun espace disponible sur le périphérique</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qiodevice.cpp" line="+1536"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
@@ -2731,30 +2290,33 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QInputContext</name>
     <message>
-        <location filename="../src/gui/inputmethod/qinputcontextfactory.cpp" line="+242"/>
         <source>XIM</source>
         <translation>XIM</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>XIM input method</source>
         <translation>Méthode d&apos;entrée XIM</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Windows input method</source>
         <translation>Méthode d&apos;entrée Windows</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Mac OS X input method</source>
         <translation>Méthode d&apos;entrée Mac OS X</translation>
     </message>
+    <message>
+        <source>FEP</source>
+        <translation>Processeur frontal</translation>
+    </message>
+    <message>
+        <source>S60 FEP input method</source>
+        <translation>Méthode de saisie processeur frontal S60</translation>
+    </message>
 </context>
 <context>
     <name>QInputDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qinputdialog.cpp" line="+223"/>
         <source>Enter a value:</source>
         <translation>Entrer une valeur :</translation>
     </message>
@@ -2774,66 +2336,50 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="obsolete">QLibrary::resolve_sys: Symbole &quot;%1&quot; non défini dans %2 (%3)</translation>
     </message>
     <message>
-        <location filename="../src/corelib/plugin/qlibrary.cpp" line="+378"/>
         <source>Could not mmap &apos;%1&apos;: %2</source>
         <translation>Impossible d&apos;établir la projection en mémoire de &apos;%1&apos; : %2</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
         <translation>Données de vérification du plugin différente dans &apos;%1&apos;</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Could not unmap &apos;%1&apos;: %2</source>
         <translation>Impossible de supprimer la projection en mémoire de &apos;%1&apos; : %2</translation>
     </message>
     <message>
-        <location line="+302"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (%2.%3.%4) [%5]</source>
         <translation>Le plugin &apos;%1&apos; utilise une bibliothèque Qt incompatible. (%2.%3.%4) [%5]</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. Expected build key &quot;%2&quot;, got &quot;%3&quot;</source>
         <translation>Le plugin &apos;%1&apos; utilise une bibliothèque Qt incompatible. Clé attendue &quot;%2&quot;, reçue &quot;%3&quot;</translation>
     </message>
     <message>
-        <location line="+340"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
     <message>
-        <location line="-377"/>
-        <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+280"/>
         <source>The shared library was not found.</source>
         <translation>La bibliothèque partagée est introuvable.</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>The file &apos;%1&apos; is not a valid Qt plugin.</source>
         <translation>Le fichier &apos;%1&apos; n&apos;est pas un plugin Qt valide.</translation>
     </message>
     <message>
-        <location line="+43"/>
         <source>The plugin &apos;%1&apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)</source>
         <translation>Le plugin &apos;%1&apos; utilise une bibliothèque Qt incompatible.  (Il est impossible de mélanger des bibliothèques &apos;debug&apos; et &apos;release&apos;.)</translation>
     </message>
     <message>
-        <location filename="../src/corelib/plugin/qlibrary_unix.cpp" line="+209"/>
-        <location filename="../src/corelib/plugin/qlibrary_win.cpp" line="+99"/>
         <source>Cannot load library %1: %2</source>
         <translation>Impossible de charger la bibliothèque %1 : %2</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location filename="../src/corelib/plugin/qlibrary_win.cpp" line="+26"/>
         <source>Cannot unload library %1: %2</source>
         <translation>Impossible de décharger la bibliothèque %1 : %2</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location filename="../src/corelib/plugin/qlibrary_win.cpp" line="+15"/>
         <source>Cannot resolve symbol &quot;%1&quot; in %2: %3</source>
         <translation>Impossible de résoudre le symbole &quot;%1&quot; dans %2 : %3</translation>
     </message>
@@ -2841,37 +2387,30 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QLineEdit</name>
     <message>
-        <location filename="../src/gui/widgets/qlineedit.cpp" line="+2710"/>
         <source>Select All</source>
         <translation>Tout sélectionner</translation>
     </message>
     <message>
-        <location line="-30"/>
         <source>&amp;Undo</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Redo</source>
         <translation>&amp;Rétablir</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Cu&amp;t</source>
         <translation>Co&amp;uper</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Copy</source>
         <translation>Cop&amp;ier</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>&amp;Paste</source>
         <translation>Co&amp;ller</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
@@ -2879,24 +2418,18 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QLocalServer</name>
     <message>
-        <location filename="../src/network/socket/qlocalserver.cpp" line="+226"/>
-        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="+231"/>
         <source>%1: Name error</source>
         <translation>%1: Erreur de nom</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qlocalserver_unix.cpp" line="-8"/>
         <source>%1: Permission denied</source>
         <translation>%1: Permission refusée</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>%1: Address in use</source>
         <translation>%1: Address déjà utilisée</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../src/network/socket/qlocalserver_win.cpp" line="+158"/>
         <source>%1: Unknown error %2</source>
         <translation>%1: Erreur inconnue %2</translation>
     </message>
@@ -2904,70 +2437,46 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QLocalSocket</name>
     <message>
-        <location filename="../src/network/socket/qlocalsocket_tcp.cpp" line="+132"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+134"/>
         <source>%1: Connection refused</source>
         <translation>%1: Connexion refusée</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Remote closed</source>
         <translation>%1: Connexion fermée</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_win.cpp" line="+80"/>
-        <location line="+43"/>
         <source>%1: Invalid name</source>
         <translation>%1: Nom invalide</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket access error</source>
         <translation>%1: Erreur d&apos;accès au socket</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket resource error</source>
         <translation>%1: Erreur de ressource du socket</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Socket operation timed out</source>
         <translation>%1: L&apos;opération socket a expiré</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: Datagram too large</source>
         <translation>%1: Datagramme trop grand</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_win.cpp" line="-48"/>
         <source>%1: Connection error</source>
         <translation>%1: Erreur de connexion</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+3"/>
         <source>%1: The socket operation is not supported</source>
         <translation>%1: L&apos;opération n&apos;est pas supportée</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: Unknown error</source>
         <translation>%1 : erreur inconnue</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qlocalsocket_unix.cpp" line="+4"/>
-        <location filename="../src/network/socket/qlocalsocket_win.cpp" line="+10"/>
         <source>%1: Unknown error %2</source>
         <translation>%1: Erreur inconnue %2</translation>
     </message>
@@ -2975,27 +2484,22 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QMYSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/mysql/qsql_mysql.cpp" line="+1231"/>
         <source>Unable to open database &apos;</source>
         <translation>Impossible d&apos;ouvrir la base de données &apos;</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Unable to connect</source>
         <translation>Impossible d&apos;établir une connexion</translation>
     </message>
     <message>
-        <location line="+127"/>
         <source>Unable to begin transaction</source>
         <translation>Impossible de démarrer la transaction</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Impossible de soumettre la transaction</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Impossible d&apos;annuler la transaction</translation>
     </message>
@@ -3003,59 +2507,46 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QMYSQLResult</name>
     <message>
-        <location line="-922"/>
         <source>Unable to fetch data</source>
         <translation>Impossible de récuperer des données</translation>
     </message>
     <message>
-        <location line="+176"/>
         <source>Unable to execute query</source>
         <translation>Impossible d&apos;exécuter la requête</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to store result</source>
         <translation>Impossible de stocker le résultat</translation>
     </message>
     <message>
-        <location line="+190"/>
-        <location line="+8"/>
         <source>Unable to prepare statement</source>
         <translation>Impossible de préparer l&apos;instruction</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>Unable to reset statement</source>
         <translation>Impossible de réinitialiser l&apos;instruction</translation>
     </message>
     <message>
-        <location line="+87"/>
         <source>Unable to bind value</source>
         <translation>Impossible d&apos;attacher la valeur</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Unable to execute statement</source>
         <translation>Impossible d&apos;exécuter la requête</translation>
     </message>
     <message>
-        <location line="+14"/>
-        <location line="+21"/>
         <source>Unable to bind outvalues</source>
         <translation>Impossible d&apos;attacher les valeurs de sortie</translation>
     </message>
     <message>
-        <location line="-12"/>
         <source>Unable to store statement results</source>
         <translation>Impossible de stocker les résultats de la requête</translation>
     </message>
     <message>
-        <location line="-253"/>
         <source>Unable to execute next query</source>
         <translation>Impossible d&apos;exécuterla prochaine requête</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Unable to store next result</source>
         <translation>Impossible de stocker le prochain résultat</translation>
     </message>
@@ -3063,7 +2554,6 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QMdiArea</name>
     <message>
-        <location filename="../src/gui/widgets/qmdiarea.cpp" line="+290"/>
         <source>(Untitled)</source>
         <translation>(Sans titre)</translation>
     </message>
@@ -3071,92 +2561,74 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QMdiSubWindow</name>
     <message>
-        <location filename="../src/gui/widgets/qmdisubwindow.cpp" line="+280"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="-18"/>
         <source>Minimize</source>
         <translation>Réduire</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Restore Down</source>
         <translation>Restaurer en bas</translation>
     </message>
     <message>
-        <location line="+707"/>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Move</source>
         <translation>&amp;Déplacer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
         <translation>&amp;Taille</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Mi&amp;nimize</source>
         <translation>Réd&amp;uire</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ma&amp;ximize</source>
         <translation>Ma&amp;ximiser</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Stay on &amp;Top</source>
         <translation>&amp;Rester au premier plan</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location line="-787"/>
         <source>- [%1]</source>
-        <translation></translation>
+        <translation>- [%1]</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>Maximize</source>
         <translation>Maximiser</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unshade</source>
         <translation>Restaurer</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Shade</source>
         <translation>Ombrer</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Restore</source>
         <translation>Restaurer</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
@@ -3164,21 +2636,14 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QMenu</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/qaccessiblemenu.cpp" line="+157"/>
-        <location line="+225"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="-224"/>
-        <location line="+225"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location line="-223"/>
-        <location line="+225"/>
-        <location line="+51"/>
         <source>Execute</source>
         <translation>Exécuter</translation>
     </message>
@@ -3233,24 +2698,22 @@ Voulez-vous quand même le supprimer ?</translation>
         <source>Quit %1</source>
         <translation type="obsolete">Quitter %1</translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation>Actions</translation>
+    </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
-        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="-1964"/>
-        <location line="+852"/>
-        <location filename="../src/gui/dialogs/qmessagebox.h" line="-52"/>
-        <location line="+8"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="+509"/>
         <source>About Qt</source>
         <translation>À propos de Qt</translation>
     </message>
     <message>
-        <location line="-508"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
@@ -3263,19 +2726,17 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="obsolete">&lt;h3&gt;A propos de Qt&lt;/h3&gt;%1&lt;p&gt;Qt est un toolkit C++ pour le développement d&apos;applications multi-platformes.&lt;/p&gt;&lt;p&gt;Qt fournit la portabilité du code source pour MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux et toutes les variantes commerciales majeures d&apos;Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.&lt;/p&gt;&lt;p&gt;Qt est un produit de Trolltech. &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="-1097"/>
         <source>Show Details...</source>
         <translation>Montrer les détails...</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hide Details...</source>
         <translation>Cacher les détails...</translation>
     </message>
     <message>
-        <location line="+1570"/>
+        <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1693"/>
         <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;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.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h3&gt;À propos de Qt&lt;/h3&gt;&lt;p&gt;Ce programme utilise Qt version %1.&lt;/p&gt;&lt;p&gt;Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.&lt;/p&gt;&lt;p&gt;Qt fournit une portabilité source unique pour MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.&lt;/p&gt;&lt;p&gt;Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.&lt;/p&gt;&lt;p&gt;Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.&lt;/p&gt;&lt;p&gt;Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.&lt;/p&gt;&lt;p&gt;Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.&lt;/p&gt;&lt;p&gt;Veuillez consulter&lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; pour un aperçu des concessions de licences Qt.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation et/ou ses filiales.&lt;/p&gt;&lt;p&gt;Qt est un produit Nokia. Voir &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; pour de plus amples informations.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;h3&gt;About Qt&lt;/h3&gt;%1&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;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.&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
@@ -3289,11 +2750,18 @@ Voulez-vous quand même le supprimer ?</translation>
         <source>&lt;h3&gt;About Qt&lt;/h3&gt;%1&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.&lt;/p&gt;&lt;p&gt;Qt is a Trolltech product. See &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;h3&gt;A propos de Qt&lt;/h3&gt;%1&lt;p&gt;Qt est un toolkit C++ pour le développement d&apos;application multi-plateforme.&lt;/p&gt;&lt;p&gt;Qt fournit la portabilité de votre source pour MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, toutes les variantes majeures d&apos;Unix. Qt est aussi disponible pour les périphériques embarqués avec Qt Embedded.&lt;/p&gt;&lt;p&gt;Qt est un produit de Trolltech. Voir &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; pour plus d&apos;informations.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;À propos de Qt&lt;/h3&gt;&lt;p&gt;Ce programme utilise Qt version %1.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;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.&lt;/p&gt;&lt;p&gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Please see &lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; for an overview of Qt licensing.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; for more information.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Qt est une bibliothèque logicielle C++ pour le développement d’applications multiplateformes.&lt;/p&gt;&lt;p&gt;Qt fournit une portabilité source unique pour MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.&lt;/p&gt;&lt;p&gt;Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.&lt;/p&gt;&lt;p&gt;Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.&lt;/p&gt;&lt;p&gt;Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou libres) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.&lt;/p&gt;&lt;p&gt;Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.&lt;/p&gt;&lt;p&gt;Veuillez consulter&lt;a href=&quot;http://qt.nokia.com/products/licensing&quot;&gt;qt.nokia.com/products/licensing&lt;/a&gt; pour un aperçu des concessions de licences Qt.&lt;/p&gt;&lt;p&gt;Copyright (C) 2010 Nokia Corporation et/ou ses filiales.&lt;/p&gt;&lt;p&gt;Qt est un produit Nokia. Voir &lt;a href=&quot;http://qt.nokia.com/&quot;&gt;qt.nokia.com&lt;/a&gt; pour de plus amples informations.&lt;/p&gt;</translation>
+    </message>
 </context>
 <context>
     <name>QMultiInputContext</name>
     <message>
-        <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp" line="+88"/>
         <source>Select IM</source>
         <translation>Sélectionner IM</translation>
     </message>
@@ -3301,12 +2769,10 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QMultiInputContextPlugin</name>
     <message>
-        <location filename="../src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp" line="+95"/>
         <source>Multiple input method switcher</source>
         <translation>Sélectionneur de méthode de saisie</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Multiple input method switcher that uses the context menu of the text widgets</source>
         <translation>Sélectionneur de méthode de saisie qui utilise le menu contextuel des widgets de texte</translation>
     </message>
@@ -3314,132 +2780,106 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNativeSocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qnativesocketengine.cpp" line="+206"/>
         <source>The remote host closed the connection</source>
         <translation>L&apos;hôte distant a fermé la connexion</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network operation timed out</source>
         <translation>L&apos;opération réseau a expiré</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Out of resources</source>
         <translation>Manque de ressources</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unsupported socket operation</source>
         <translation>Opération socket non supportée</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Protocol type not supported</source>
         <translation>Protocol non géré</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Invalid socket descriptor</source>
         <translation>Descripteur de socket invalide</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Network unreachable</source>
         <translation>Réseau impossible à rejoindre</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Permission denied</source>
         <translation>Accès refusé</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connection timed out</source>
         <translation>Connexion expirée</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Connection refused</source>
         <translation>Connexion refusée</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The bound address is already in use</source>
         <translation>L&apos;adresse liée est déjà en usage</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The address is not available</source>
         <translation>L&apos;adresse n&apos;est pas disponible</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>The address is protected</source>
         <translation>L&apos;adresse est protégée</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unable to send a message</source>
         <translation>Impossible d&apos;envoyer un message</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to receive a message</source>
         <translation>Impossible de recevoir un message</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to write</source>
         <translation>Impossible d&apos;écrire</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Network error</source>
         <translation>Erreur réseau</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Another socket is already listening on the same port</source>
         <translation>Un autre socket écoute déjà sur le même port</translation>
     </message>
     <message>
-        <location line="-66"/>
         <source>Unable to initialize non-blocking socket</source>
         <translation>Impossible d&apos;initialiser le socket asynchrone</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Unable to initialize broadcast socket</source>
         <translation>Impossible d&apos;initialiser le socket broadcast</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
         <translation>Tentative d&apos;utiliser un socket IPv6 sur une plateforme qui ne supporte pas IPv6</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Host unreachable</source>
         <translation>Hôte inaccessible</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>Datagram was too large to send</source>
         <translation>Le datagramme était trop grand pour être envoyé</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Operation on non-socket</source>
         <translation>Operation sur non-socket</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
     <message>
-        <location line="-3"/>
         <source>The proxy type is invalid for this operation</source>
         <translation>Le type de proxy est invalide pour cette opération</translation>
     </message>
@@ -3447,7 +2887,6 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkAccessCacheBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesscachebackend.cpp" line="+65"/>
         <source>Error opening %1</source>
         <translation>Erreur lors de l&apos;ouverture de %1</translation>
     </message>
@@ -3455,27 +2894,22 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkAccessFileBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessfilebackend.cpp" line="+99"/>
         <source>Request for opening non-local file %1</source>
         <translation>Requête d&apos;ouverture de fichier distant %1</translation>
     </message>
     <message>
-        <location line="+42"/>
         <source>Error opening %1: %2</source>
         <translation>Erreur lors de l&apos;ouverture de %1 : %2</translation>
     </message>
     <message>
-        <location line="+56"/>
         <source>Write error writing to %1: %2</source>
         <translation>Erreur d&apos;écriture de %1 : %2</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Cannot open %1: Path is a directory</source>
         <translation>Impossible d&apos;ouvrir %1 : le chemin est un dossier</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>Read error reading from %1: %2</source>
         <translation>Erreur de lecture de %1 : %2</translation>
     </message>
@@ -3483,27 +2917,22 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkAccessFtpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccessftpbackend.cpp" line="+165"/>
         <source>No suitable proxy found</source>
         <translation>Aucun proxy trouvé</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>Cannot open %1: is a directory</source>
         <translation>Impossible d&apos;ouvrir %1 : le chemin est un dossier</translation>
     </message>
     <message>
-        <location line="+130"/>
         <source>Logging in to %1 failed: authentication required</source>
         <translation>Connexion à %1 a échoué : authentification requise</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>Error while downloading %1: %2</source>
         <translation>Erreur lors du téléchargement de %1 : %2</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Error while uploading %1: %2</source>
         <translation>Erreur lors de l&apos;envoi de %1 : %2</translation>
     </message>
@@ -3511,7 +2940,6 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkAccessHttpBackend</name>
     <message>
-        <location filename="../src/network/access/qnetworkaccesshttpbackend.cpp" line="+597"/>
         <source>No suitable proxy found</source>
         <translation>Aucun proxy trouvé</translation>
     </message>
@@ -3519,12 +2947,10 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkReply</name>
     <message>
-        <location line="+128"/>
         <source>Error downloading %1 - server replied: %2</source>
         <translation>Erreur lors du téléchargement de %1 - le serveur a répondu: %2</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkreplyimpl.cpp" line="+68"/>
         <source>Protocol &quot;%1&quot; is unknown</source>
         <translation>Le protocole &quot;%1&quot; est inconnu</translation>
     </message>
@@ -3532,8 +2958,6 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QNetworkReplyImpl</name>
     <message>
-        <location line="+432"/>
-        <location line="+22"/>
         <source>Operation canceled</source>
         <translation>Opération annulée</translation>
     </message>
@@ -3541,63 +2965,55 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QOCIDriver</name>
     <message>
-        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+2069"/>
         <source>Unable to logon</source>
         <translation>Impossible d&apos;ouvrir une session</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location filename="../src/sql/drivers/oci/qsql_oci.cpp" line="+1925"/>
         <source>Unable to initialize</source>
         <comment>QOCIDriver</comment>
-        <translation>L&apos;initialisation a échouée</translation>
+        <translation>L&apos;initialisation a échoué</translation>
     </message>
     <message>
-        <location line="+215"/>
         <source>Unable to begin transaction</source>
         <translation>Impossible de démarrer la transaction</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to commit transaction</source>
         <translation>Impossible d&apos;enregistrer la transaction</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to rollback transaction</source>
         <translation>Impossible d&apos;annuler la transaction</translation>
     </message>
+    <message>
+        <source>Unable to initialize</source>
+        <translation>L&apos;initialisation a échoué</translation>
+    </message>
 </context>
 <context>
     <name>QOCIResult</name>
     <message>
-        <location line="-963"/>
-        <location line="+161"/>
-        <location line="+15"/>
         <source>Unable to bind column for batch execute</source>
         <translation>Impossible d&apos;attacher la colonne pour une execution batch</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to execute batch statement</source>
         <translation>Impossible d&apos;exécuter l&apos;instruction batch</translation>
     </message>
     <message>
-        <location line="+302"/>
         <source>Unable to goto next</source>
         <translation>Impossible de passer au suivant</translation>
     </message>
     <message>
-        <location line="+59"/>
         <source>Unable to alloc statement</source>
         <translation>Impossible d&apos;allouer la requête</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to prepare statement</source>
         <translation>Impossible de préparer la requête</translation>
     </message>
     <message>
-        <location line="+36"/>
         <source>Unable to bind value</source>
         <translation>Impossible d&apos;attacher la valeur</translation>
     </message>
@@ -3606,92 +3022,81 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="obsolete">Impossible d&apos;exéctuer la requête select</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to execute statement</source>
         <translation>Impossible d&apos;exéctuer la requête</translation>
     </message>
+    <message>
+        <source>Unable to get statement type</source>
+        <translation>Impossible d&apos;obtenir le type de la requête</translation>
+    </message>
 </context>
 <context>
     <name>QODBCDriver</name>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1785"/>
         <source>Unable to connect</source>
         <translation>Incapable d&apos;établir une connexion</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="+1791"/>
         <source>Unable to connect - Driver doesn&apos;t support all needed functionality</source>
         <translation>Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires</translation>
     </message>
     <message>
-        <location line="+242"/>
         <source>Unable to disable autocommit</source>
         <translation>Impossible de désactiver l&apos;autocommit</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Incapable de soumettre la transaction</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to rollback transaction</source>
         <translation>Incapable d&apos;annuler la transaction</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to enable autocommit</source>
-        <translation>Impossible d&apos;active l&apos;autocommit</translation>
+        <translation>Impossible d&apos;activer l&apos;autocommit</translation>
+    </message>
+    <message>
+        <source>Unable to connect - Driver doesn&apos;t support all functionality required</source>
+        <translation>Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires</translation>
     </message>
 </context>
 <context>
     <name>QODBCResult</name>
     <message>
-        <location line="-1218"/>
-        <location line="+349"/>
         <source>QODBCResult::reset: Unable to set &apos;SQL_CURSOR_STATIC&apos; as statement attribute. Please check your ODBC driver configuration</source>
         <translation>QODBCResult::reset: Impossible d&apos;utiliser &apos;SQL_CURSOR_STATIC&apos; comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC</translation>
     </message>
     <message>
-        <location line="-332"/>
-        <location line="+626"/>
         <source>Unable to execute statement</source>
         <translation>Impossible d&apos;exéctuer la requête</translation>
     </message>
     <message>
-        <location line="-555"/>
         <source>Unable to fetch next</source>
         <translation>Impossible de récupérer le suivant</translation>
     </message>
     <message>
-        <location line="+279"/>
         <source>Unable to prepare statement</source>
         <translation>Impossible de préparer la requête</translation>
     </message>
     <message>
-        <location line="+268"/>
         <source>Unable to bind variable</source>
         <translation>Impossible d&apos;attacher la variable</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/db2/qsql_db2.cpp" line="+194"/>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-475"/>
-        <location line="+578"/>
         <source>Unable to fetch last</source>
         <translation>Impossible de récupérer le dernier</translation>
     </message>
     <message>
-        <location filename="../src/sql/drivers/odbc/qsql_odbc.cpp" line="-672"/>
         <source>Unable to fetch</source>
         <translation>Impossible de récupérer</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Unable to fetch first</source>
         <translation>Impossible de récupérer le premier</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Unable to fetch previous</source>
         <translation>Impossible de récupérer le précedent</translation>
     </message>
@@ -3704,12 +3109,10 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation>Début</translation>
     </message>
     <message>
-        <location filename="../src/network/access/qnetworkaccessdatabackend.cpp" line="+74"/>
         <source>Operation not supported on %1</source>
         <translation>Opération non supportée sur %1</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>Invalid URI: %1</source>
         <translation>URI invalide : %1</translation>
     </message>
@@ -3724,36 +3127,34 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation>Erreur de lecture sur %1 : %2</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Socket error on %1: %2</source>
         <translation>Erreur de socket sur %1 : %2</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Remote host closed the connection prematurely on %1</source>
         <translation>L&apos;hôte distant a fermé sa connexion de façon prématurée sur %1</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+99"/>
         <source>Protocol error: packet of size 0 received</source>
         <translation>Erreur de protocole: paquet de taille 0 reçu</translation>
     </message>
     <message>
-        <location filename="../src/network/kernel/qhostinfo.cpp" line="+177"/>
-        <location line="+57"/>
         <source>No host name given</source>
         <translation>Nom d&apos;hôte manquant</translation>
     </message>
+    <message>
+        <source>Invalid hostname</source>
+        <translation>Nom d&apos;hôte non valide</translation>
+    </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="+1195"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Value</source>
         <translation>Valeur</translation>
     </message>
@@ -3761,32 +3162,26 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QPSQLDriver</name>
     <message>
-        <location filename="../src/sql/drivers/psql/qsql_psql.cpp" line="+763"/>
         <source>Unable to connect</source>
         <translation>Impossible d&apos;établir une connexion</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Could not begin transaction</source>
         <translation>Impossible de démarrer la transaction</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Could not commit transaction</source>
         <translation>Impossible de soumettre la transaction</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Could not rollback transaction</source>
         <translation>Impossible d&apos;annuler la transaction</translation>
     </message>
     <message>
-        <location line="+358"/>
         <source>Unable to subscribe</source>
         <translation>Impossible de s&apos;inscrire</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Unable to unsubscribe</source>
         <translation>Impossible de se désinscrire</translation>
     </message>
@@ -3794,12 +3189,10 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QPSQLResult</name>
     <message>
-        <location line="-1058"/>
         <source>Unable to create query</source>
         <translation>Impossible de créer la requête</translation>
     </message>
     <message>
-        <location line="+374"/>
         <source>Unable to prepare statement</source>
         <translation>Impossible de préparer la requête</translation>
     </message>
@@ -3807,102 +3200,82 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QPageSetupWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="+304"/>
         <source>Centimeters (cm)</source>
         <translation>Centimètres (cm)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Millimeters (mm)</source>
         <translation>Millimètres (mm)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Inches (in)</source>
         <translation>Pouces (in)</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Points (pt)</source>
-        <translation></translation>
+        <translation>Points (pts)</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupwidget.ui"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location/>
         <source>Paper</source>
         <translation>Papier</translation>
     </message>
     <message>
-        <location/>
         <source>Page size:</source>
         <translation>Dimensions :</translation>
     </message>
     <message>
-        <location/>
         <source>Width:</source>
         <translation>Largeur :</translation>
     </message>
     <message>
-        <location/>
         <source>Height:</source>
         <translation>Hauteur :</translation>
     </message>
     <message>
-        <location/>
         <source>Paper source:</source>
         <translation>Source du papier :</translation>
     </message>
     <message>
-        <location/>
         <source>Orientation</source>
-        <translation></translation>
+        <translation>Orientation</translation>
     </message>
     <message>
-        <location/>
         <source>Portrait</source>
         <translation>Portrait</translation>
     </message>
     <message>
-        <location/>
         <source>Landscape</source>
         <translation>Paysage</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse landscape</source>
         <translation>Paysage inversé</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse portrait</source>
         <translation>Portrait inversé</translation>
     </message>
     <message>
-        <location/>
         <source>Margins</source>
         <translation>Marges</translation>
     </message>
     <message>
-        <location/>
         <source>top margin</source>
         <translation>marge haute</translation>
     </message>
     <message>
-        <location/>
         <source>left margin</source>
         <translation>marge gauche</translation>
     </message>
     <message>
-        <location/>
         <source>right margin</source>
         <translation>marge droite</translation>
     </message>
     <message>
-        <location/>
         <source>bottom margin</source>
         <translation>marge basse</translation>
     </message>
@@ -3910,12 +3283,10 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QPluginLoader</name>
     <message>
-        <location filename="../src/corelib/plugin/qpluginloader.cpp" line="+24"/>
         <source>Unknown error</source>
         <translation>Erreur inconnue</translation>
     </message>
     <message>
-        <location line="-68"/>
         <source>The plugin was not loaded.</source>
         <translation>Le plugin n&apos;a pas été chargé.</translation>
     </message>
@@ -3923,18 +3294,14 @@ Voulez-vous quand même le supprimer ?</translation>
 <context>
     <name>QPrintDialog</name>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="+98"/>
         <source>locally connected</source>
         <translation>connecté en local</translation>
     </message>
     <message>
-        <location line="+471"/>
-        <location line="+199"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="+268"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -3947,12 +3314,10 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="obsolete">Imprimer en couleur si possible</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="+375"/>
         <source>Print all</source>
         <translation>Imprimer tout</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Print range</source>
         <translation>Imprimer la sélection</translation>
     </message>
@@ -3977,163 +3342,130 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="obsolete">Paysage</translation>
     </message>
     <message>
-        <location line="-48"/>
         <source>A0 (841 x 1189 mm)</source>
         <translation>A0 (841 x 1189 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A1 (594 x 841 mm)</source>
         <translation>A1 (594 x 841 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A2 (420 x 594 mm)</source>
         <translation>A2 (420 x 594 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A3 (297 x 420 mm)</source>
         <translation>A3 (297 x 420 mm)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>A5 (148 x 210 mm)</source>
         <translation>A5 (148 x 210 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A6 (105 x 148 mm)</source>
         <translation>A6 (105 x 148 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A7 (74 x 105 mm)</source>
         <translation>A7 (74 x 105 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A8 (52 x 74 mm)</source>
         <translation>A8 (52 x 74 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A9 (37 x 52 mm)</source>
         <translation>A9 (37 x 52 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B0 (1000 x 1414 mm)</source>
         <translation>B0 (1000 x 1414 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B1 (707 x 1000 mm)</source>
         <translation>B1 (707 x 1000 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B2 (500 x 707 mm)</source>
         <translation>B2 (500 x 707 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B3 (353 x 500 mm)</source>
         <translation>B3 (353 x 500 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B4 (250 x 353 mm)</source>
         <translation>B4 (250 x 353 mm)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>B6 (125 x 176 mm)</source>
         <translation>B6 (125 x 176 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B7 (88 x 125 mm)</source>
         <translation>B7 (88 x 125 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B8 (62 x 88 mm)</source>
         <translation>B8 (62 x 88 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B9 (44 x 62 mm)</source>
         <translation>B9 (44 x 62 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B10 (31 x 44 mm)</source>
         <translation>B10 (31 x 44 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>C5E (163 x 229 mm)</source>
         <translation>C5E (163 x 229 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>DLE (110 x 220 mm)</source>
         <translation>DLE (110 x 220 mm)</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Folio (210 x 330 mm)</source>
         <translation>Folio (210 x 330 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ledger (432 x 279 mm)</source>
         <translation>Ledger (432 x 279 mm)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Tabloid (279 x 432 mm)</source>
         <translation>Tabloïde (279 x 432 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>US Common #10 Envelope (105 x 241 mm)</source>
         <translation>US Common #10 Envelope (105 x 241 mm)</translation>
     </message>
     <message>
-        <location filename="../src/gui/painting/qprinterinfo_unix.cpp" line="-647"/>
-        <location line="+225"/>
         <source>Aliases: %1</source>
         <translation>Alias : %1</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="-25"/>
         <source>A4 (210 x 297 mm, 8.26 x 11.7 inches)</source>
         <translation>A4 (210 x 297 mm)</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>B5 (176 x 250 mm, 6.93 x 9.84 inches)</source>
         <translation>B5 (176 x 250 mm)</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source>
         <translation>Executive (7,5 x 10 pouces, 191 x 254 mm)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Legal (8.5 x 14 inches, 216 x 356 mm)</source>
         <translation>Legal (8.5 x 14 pouces, 216 x 356 mm)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Letter (8.5 x 11 inches, 216 x 279 mm)</source>
         <translation>Letter (8,5 x 11 pouces, 216 x 279 mm)</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Print selection</source>
         <translation>Imprimer la sélection</translation>
     </message>
@@ -4150,9 +3482,6 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="obsolete">Source du papier :</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qabstractprintdialog.cpp" line="+110"/>
-        <location line="+13"/>
-        <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="-2"/>
         <source>Print</source>
         <translation>Impr écran</translation>
     </message>
@@ -4165,7 +3494,6 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="obsolete">Imprimante</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-357"/>
         <source>Print To File ...</source>
         <translation>Imprimer dans un fichier...</translation>
     </message>
@@ -4222,229 +3550,184 @@ Voulez-vous quand même le supprimer ?</translation>
         <translation type="obsolete">Impression recto verso</translation>
     </message>
     <message>
-        <location line="+80"/>
         <source>File %1 is not writable.
 Please choose a different file name.</source>
         <translation>Impossible d&apos;écrire dans le fichier %1.
 Veuillez choisir un nom de fichier différent.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 already exists.
 Do you want to overwrite it?</source>
         <translation>%1 existe.
 Voulez-vous l&apos;écraser ?</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_qws.cpp" line="-228"/>
         <source>File exists</source>
         <translation>Le fichier existe</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&lt;qt&gt;Do you want to overwrite it?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;voulez-vous l&apos;écraser ?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-8"/>
         <source>%1 is a directory.
 Please choose a different file name.</source>
         <translation>%1 est un dossier.
 Veuillez choisir un nom de fichier différent.</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qpagesetupdialog_unix.cpp" line="-232"/>
         <source>A0</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A1</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A2</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A3</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A4</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A5</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A6</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A7</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A8</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>A9</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B0</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B1</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B2</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B3</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B4</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B5</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B6</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B7</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B8</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B9</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>B10</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>C5E</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>DLE</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Executive</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Folio</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ledger</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Legal</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Letter</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tabloid</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>US Common #10 Envelope</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Custom</source>
         <translation>Personnalisé</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_unix.cpp" line="-522"/>
-        <location line="+68"/>
         <source>&amp;Options &gt;&gt;</source>
         <translation></translation>
     </message>
     <message>
-        <location line="-63"/>
         <source>&amp;Print</source>
         <translation>Im&amp;primer</translation>
     </message>
     <message>
-        <location line="+67"/>
         <source>&amp;Options &lt;&lt;</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+253"/>
         <source>Print to File (PDF)</source>
         <translation>Imprimer dans un fichier (PDF)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Print to File (Postscript)</source>
         <translation>Imprimer dans un fichier (PostScript)</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Local file</source>
         <translation>Fichier local</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Write %1 file</source>
         <translation>Ecriture du fichier %1</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qprintdialog_win.cpp" line="+1"/>
         <source>The &apos;From&apos; value cannot be greater than the &apos;To&apos; value.</source>
         <translation>La valeur &apos;de&apos; ne peut pas être plus grande que la valeur &apos;à&apos;.</translation>
     </message>
@@ -4452,108 +3735,86 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QPrintPreviewDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintpreviewdialog.cpp" line="+252"/>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
     <message>
-        <location line="+79"/>
         <source>Print Preview</source>
         <translation>Aperçu avant impression</translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>Next page</source>
         <translation>Page suivante</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Previous page</source>
         <translation>Page précédente</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>First page</source>
         <translation>Première page</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Last page</source>
         <translation>Dernière page</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Fit width</source>
         <translation>Ajuster la largeur</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Fit page</source>
         <translation>Ajuster la page</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Zoom in</source>
         <translation>Zoom avant</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Zoom out</source>
         <translation>Zoom arrière</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Portrait</source>
         <translation>Portrait</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Landscape</source>
         <translation>Paysage</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Show single page</source>
         <translation>Afficher une seule page</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show facing pages</source>
         <translation>Afficher deux pages</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Show overview of all pages</source>
         <translation>Afficher un aperçu de toutes les pages</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Print</source>
         <translation>Impr écran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page setup</source>
         <translation>Configuration de la page</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="+151"/>
         <source>Export to PDF</source>
         <translation>Exporter vers PDF</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Export to PostScript</source>
         <translation>Exporter vers PostScript</translation>
     </message>
     <message>
-        <location filename="../src/gui/dialogs/qabstractpagesetupdialog.cpp" line="+68"/>
-        <location line="+12"/>
         <source>Page Setup</source>
         <translation>Configuration de la page</translation>
     </message>
@@ -4576,17 +3837,14 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QPrintPropertiesWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintpropertieswidget.ui"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location/>
         <source>Page</source>
         <translation></translation>
     </message>
     <message>
-        <location/>
         <source>Advanced</source>
         <translation>Avancé</translation>
     </message>
@@ -4594,97 +3852,78 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QPrintSettingsOutput</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintsettingsoutput.ui"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location/>
         <source>Copies</source>
         <translation>Copies</translation>
     </message>
     <message>
-        <location/>
         <source>Print range</source>
         <translation>Imprimer la sélection</translation>
     </message>
     <message>
-        <location/>
         <source>Print all</source>
         <translation>Imprimer tout</translation>
     </message>
     <message>
-        <location/>
         <source>Pages from</source>
         <translation>Pages</translation>
     </message>
     <message>
-        <location/>
         <source>to</source>
         <translation>à</translation>
     </message>
     <message>
-        <location/>
         <source>Selection</source>
         <translation>Sélection</translation>
     </message>
     <message>
-        <location/>
         <source>Output Settings</source>
         <translation>Paramètres de sortie</translation>
     </message>
     <message>
-        <location/>
         <source>Copies:</source>
-        <translation></translation>
+        <translation>Copies :</translation>
     </message>
     <message>
-        <location/>
         <source>Collate</source>
         <translation>Assembler</translation>
     </message>
     <message>
-        <location/>
         <source>Reverse</source>
         <translation>Inverse</translation>
     </message>
     <message>
-        <location/>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
-        <location/>
         <source>Color Mode</source>
         <translation>Mode de couleur</translation>
     </message>
     <message>
-        <location/>
         <source>Color</source>
         <translation>Couleur</translation>
     </message>
     <message>
-        <location/>
         <source>Grayscale</source>
         <translation>Dégradé de gris</translation>
     </message>
     <message>
-        <location/>
         <source>Duplex Printing</source>
         <translation>Impression en duplex</translation>
     </message>
     <message>
-        <location/>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
-        <location/>
         <source>Long side</source>
         <translation>Côté long</translation>
     </message>
     <message>
-        <location/>
         <source>Short side</source>
         <translation>Côté court</translation>
     </message>
@@ -4692,47 +3931,38 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QPrintWidget</name>
     <message>
-        <location filename="../src/gui/dialogs/qprintwidget.ui"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location/>
         <source>Printer</source>
         <translation>Imprimante</translation>
     </message>
     <message>
-        <location/>
         <source>&amp;Name:</source>
         <translation>&amp;Nom :</translation>
     </message>
     <message>
-        <location/>
         <source>P&amp;roperties</source>
         <translation>P&amp;ropriétés</translation>
     </message>
     <message>
-        <location/>
         <source>Location:</source>
         <translation>Emplacement :</translation>
     </message>
     <message>
-        <location/>
         <source>Preview</source>
         <translation>Prévisualisation</translation>
     </message>
     <message>
-        <location/>
         <source>Type:</source>
-        <translation></translation>
+        <translation>Type :</translation>
     </message>
     <message>
-        <location/>
         <source>Output &amp;file:</source>
         <translation>&amp;Fichier de sortie:</translation>
     </message>
     <message>
-        <location/>
         <source>...</source>
         <translation></translation>
     </message>
@@ -4740,70 +3970,50 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QProcess</name>
     <message>
-        <location filename="../src/corelib/io/qprocess_unix.cpp" line="+475"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+147"/>
         <source>Could not open input redirection for reading</source>
         <translation>Impossible d&apos;ouvrir la redirection d&apos;entrée en lecture</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+36"/>
         <source>Could not open output redirection for writing</source>
         <translation>Impossible d&apos;ouvrir la redirection de sortie pour écriture</translation>
     </message>
     <message>
-        <location line="+235"/>
         <source>Resource error (fork failure): %1</source>
         <translation>Erreur de ressouce (fork) : %1</translation>
     </message>
     <message>
-        <location line="+259"/>
-        <location line="+53"/>
-        <location line="+74"/>
-        <location line="+67"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+422"/>
-        <location line="+50"/>
-        <location line="+75"/>
-        <location line="+42"/>
-        <location line="+54"/>
         <source>Process operation timed out</source>
         <translation>Operation de processus a expiré</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qprocess.cpp" line="+533"/>
-        <location line="+52"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="-211"/>
-        <location line="+50"/>
         <source>Error reading from process</source>
         <translation>Erreur de lecture du processus</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <location line="+779"/>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="+140"/>
         <source>Error writing to process</source>
         <translation>Erreur d&quot;écriture vers le processus</translation>
     </message>
     <message>
-        <location line="-709"/>
         <source>Process crashed</source>
         <translation>Le processus à planté</translation>
     </message>
     <message>
-        <location line="+912"/>
         <source>No program defined</source>
         <translation>Aucun programme défini</translation>
     </message>
     <message>
-        <location filename="../src/corelib/io/qprocess_win.cpp" line="-341"/>
+        <location filename="../src/corelib/io/qprocess_win.cpp" line="+464"/>
         <source>Process failed to start</source>
         <translation>Le processus n&apos;a pas démarré</translation>
     </message>
+    <message>
+        <source>Process failed to start: %1</source>
+        <translation>Le démarrage du processus a échoué: %1</translation>
+    </message>
 </context>
 <context>
     <name>QProgressDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qprogressdialog.cpp" line="+182"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -4811,7 +4021,6 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QPushButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="-8"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
@@ -4819,7 +4028,6 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QRadioButton</name>
     <message>
-        <location line="+12"/>
         <source>Check</source>
         <translation>Cocher</translation>
     </message>
@@ -4827,50 +4035,49 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QRegExp</name>
     <message>
-        <location filename="../src/corelib/tools/qregexp.cpp" line="+64"/>
         <source>no error occurred</source>
         <translation>aucune erreur ne s&apos;est produite</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>disabled feature used</source>
         <translation>option désactivée</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad char class syntax</source>
         <translation>syntaxe invalide pour classe de caractère</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad lookahead syntax</source>
         <translation>syntaxe invalide pour lookahead</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>bad repetition syntax</source>
         <translation>syntaxe invalide pour répétition</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid octal value</source>
         <translation>valeur octale invalide</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>missing left delim</source>
         <translation>délémiteur gauche manquant</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected end</source>
         <translation>fin impromptue</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>met internal limit</source>
         <translation>rencontré limite interne</translation>
     </message>
+    <message>
+        <source>invalid interval</source>
+        <translation>intervalle non valide</translation>
+    </message>
+    <message>
+        <source>invalid category</source>
+        <translation>catégorie non valide</translation>
+    </message>
 </context>
 <context>
     <name>QSQLite2Driver</name>
@@ -4880,30 +4087,34 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Erreur à l&apos;ouverture de la base de données</translation>
     </message>
     <message>
-        <location line="+41"/>
         <source>Unable to begin transaction</source>
         <translation>Impossible de démarrer la transaction</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to commit transaction</source>
         <translation>Impossible de soumettre la transaction</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+75"/>
         <source>Unable to rollback Transaction</source>
         <translation>Impossible d&apos;annuler la transaction</translation>
     </message>
+    <message>
+        <source>Error opening database</source>
+        <translation>Erreur lors de l&apos;ouverture de la base de données</translation>
+    </message>
+    <message>
+        <source>Unable to rollback transaction</source>
+        <translation>Impossible de répéter la transaction</translation>
+    </message>
 </context>
 <context>
     <name>QSQLite2Result</name>
     <message>
-        <location line="-323"/>
         <source>Unable to fetch results</source>
         <translation>Impossible de récupérer les résultats</translation>
     </message>
     <message>
-        <location line="+147"/>
         <source>Unable to execute statement</source>
         <translation>Impossible d&apos;exécuter la requête</translation>
     </message>
@@ -4911,22 +4122,18 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QSQLiteDriver</name>
     <message>
-        <location filename="../src/sql/drivers/sqlite/qsql_sqlite.cpp" line="+528"/>
         <source>Error opening database</source>
         <translation>Erreur lors de l&apos;ouverture de la base de données</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Error closing database</source>
         <translation>Erreur lors de la fermeture de la base de données</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to begin transaction</source>
         <translation>Impossible de démarrer la transaction</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to commit transaction</source>
         <translation>Incapable de soumettre la transaction</translation>
     </message>
@@ -4935,7 +4142,6 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">Impossible d&apos;annuler la transaction</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Unable to rollback transaction</source>
         <translation>Impossible d&apos;annuler la transaction</translation>
     </message>
@@ -4943,34 +4149,26 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QSQLiteResult</name>
     <message>
-        <location line="-400"/>
-        <location line="+66"/>
-        <location line="+8"/>
         <source>Unable to fetch row</source>
         <translation>Impossible de récupérer la rangée</translation>
     </message>
     <message>
-        <location line="+63"/>
         <source>Unable to execute statement</source>
         <translation>Impossible d&apos;exécuter la requête</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Unable to reset statement</source>
         <translation>Impossible de réinitialiser la requête</translation>
     </message>
     <message>
-        <location line="+45"/>
         <source>Unable to bind parameters</source>
         <translation>Impossible d&apos;attacher les paramètres</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Parameter count mismatch</source>
         <translation>Nombre de paramètres incorrect</translation>
     </message>
     <message>
-        <location line="-208"/>
         <source>No query</source>
         <translation>Pas de requête</translation>
     </message>
@@ -4978,84 +4176,66 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QScrollBar</name>
     <message>
-        <location filename="../src/gui/widgets/qscrollbar.cpp" line="+448"/>
         <source>Scroll here</source>
         <translation>Défiler jusqu&apos;ici</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Left edge</source>
         <translation>Extrême gauche</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Top</source>
         <translation>En haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right edge</source>
         <translation>Extrême droite</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Bottom</source>
         <translation>En bas</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Page left</source>
         <translation>Page précédente</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+143"/>
         <source>Page up</source>
         <translation>Page précédente</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page right</source>
         <translation>Page suivante</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+4"/>
         <source>Page down</source>
         <translation>Page suivante</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Scroll left</source>
         <translation>Défiler vers la gauche</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll up</source>
         <translation>Défiler vers le haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll right</source>
         <translation>Défiler vers la droite</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll down</source>
         <translation>Défiler vers le bas</translation>
     </message>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-6"/>
         <source>Line up</source>
         <translation>Aligner</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Position</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Line down</source>
         <translation>Aligner en-bas</translation>
     </message>
@@ -5063,595 +4243,834 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QSharedMemory</name>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory.cpp" line="+207"/>
         <source>%1: unable to set key on lock</source>
         <translation>%1 : impossible d&apos;affecter la clé au verrou</translation>
     </message>
     <message>
-        <location line="+81"/>
         <source>%1: create size is less then 0</source>
         <translation>%1 : taille de création est inférieur à 0</translation>
     </message>
     <message>
-        <location line="+168"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_p.h" line="+148"/>
         <source>%1: unable to lock</source>
         <translation>%1 : impossible de vérrouiller</translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>%1: unable to unlock</source>
         <translation>%1 : impossible de déverrouiller</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+78"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+87"/>
         <source>%1: permission denied</source>
         <translation>%1 : permission refusée</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="-22"/>
         <source>%1: already exists</source>
         <translation>%1 : existe déjà</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+9"/>
         <source>%1: doesn&apos;t exists</source>
         <translation>%1 : n&apos;existe pas</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+9"/>
         <source>%1: out of resources</source>
         <translation>%1 : plus de ressources disponibles</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+7"/>
         <source>%1: unknown error %2</source>
         <translation>%1 : erreur inconnue %2</translation>
     </message>
     <message>
-        <location line="+21"/>
         <source>%1: key is empty</source>
         <translation>%1 : clé vide</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location filename="../src/corelib/kernel/qsharedmemory_unix.cpp" line="+125"/>
         <source>%1: unix key file doesn&apos;t exists</source>
         <translation>%1 : le fichier de clé unix n&apos;existe pas</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1: ftok failed</source>
         <translation>%1 : ftok a échoué</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="+15"/>
         <source>%1: unable to make key</source>
         <translation>%1 : impossible de créer la clé</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>%1: system-imposed size restrictions</source>
         <translation>%1 : le système impose des restrictions sur la taille</translation>
     </message>
     <message>
-        <location line="+53"/>
         <source>%1: not attached</source>
         <translation>%1 : non attaché</translation>
     </message>
     <message>
-        <location filename="../src/corelib/kernel/qsharedmemory_win.cpp" line="-27"/>
         <source>%1: invalid size</source>
         <translation>%1 : taille invalide</translation>
     </message>
     <message>
-        <location line="+68"/>
         <source>%1: key error</source>
         <translation>%1 : erreur de clé</translation>
     </message>
     <message>
-        <location line="+38"/>
         <source>%1: size query failed</source>
         <translation>%1 : la requête de taille a échoué</translation>
     </message>
+    <message>
+        <source>%1: doesn&apos;t exist</source>
+        <translation>%1: n&apos;existe pas</translation>
+    </message>
+    <message>
+        <source>%1: UNIX key file doesn&apos;t exist</source>
+        <translation>%1: le fichier de clés UNIX n&apos;existe pas</translation>
+    </message>
 </context>
 <context>
     <name>QShortcut</name>
     <message>
-        <location filename="../src/gui/kernel/qkeysequence.cpp" line="+373"/>
         <source>Space</source>
         <translation>Espace</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Esc</source>
         <translation>Échap</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backtab</source>
         <translation>Tab arr</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Backspace</source>
         <translation>Effacement</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Return</source>
         <translation>Retour</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Enter</source>
         <translation>Entrée</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Ins</source>
         <translation>Inser</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Del</source>
         <translation>Suppr</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Print</source>
         <translation>Impr écran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>SysReq</source>
         <translation>Syst</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Home</source>
         <translation>Début</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Up</source>
         <translation>Haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Down</source>
         <translation>Bas</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PgUp</source>
         <translation>Page préc</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PgDown</source>
         <translation>Page suiv</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>CapsLock</source>
         <translation>Verr maj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>NumLock</source>
         <translation>Verr num</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ScrollLock</source>
         <translation>Arrêt défil</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Back</source>
         <translation>Précédent (historique)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Forward</source>
         <translation>Successeur (historique)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Refresh</source>
         <translation>Rafraîchir</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Down</source>
         <translation>Volume bas</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Mute</source>
         <translation>Volume muet</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Volume Up</source>
         <translation>Volume haut
 </translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Boost</source>
         <translation>Graves fort</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Up</source>
         <translation>Graves haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Bass Down</source>
         <translation>Graves bas</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Treble Up</source>
         <translation>Aigus haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Treble Down</source>
         <translation>Aigus bas</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Play</source>
         <translation>Média démarrer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Stop</source>
         <translation>Média arrêt</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Previous</source>
         <translation>Média précédent</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Next</source>
         <translation>Média suivant</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Media Record</source>
         <translation>Média enregistrer</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Favorites</source>
         <translation>Préférés</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Search</source>
         <translation>Recherche</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Standby</source>
         <translation>Attente</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Open URL</source>
         <translation>Ouvrir URL</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch Mail</source>
         <translation>Lancer courrier</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch Media</source>
         <translation>Lancer média</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (0)</source>
         <translation>Lancer (0)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (1)</source>
         <translation>Lancer (1)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (2)</source>
         <translation>Lancer (2)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (3)</source>
         <translation>Lancer (3)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (4)</source>
         <translation>Lancer (4)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (5)</source>
         <translation>Lancer (5)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (6)</source>
         <translation>Lancer (6)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (7)</source>
         <translation>Lancer (7)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (8)</source>
         <translation>Lancer (8)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (9)</source>
         <translation>Lancer (9)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (A)</source>
         <translation>Lancer (A)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (B)</source>
         <translation>Lancer (B)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (C)</source>
         <translation>Lancer (C)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (D)</source>
         <translation>Lancer (D)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (E)</source>
         <translation>Lancer (E)</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Launch (F)</source>
         <translation>Lancer (F)</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Print Screen</source>
-        <translation></translation>
+        <translation>Capture d&apos;écran</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page Up</source>
-        <translation></translation>
+        <translation>Page haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page Down</source>
-        <translation></translation>
+        <translation>Page bas</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Caps Lock</source>
-        <translation></translation>
+        <translation>Verr Maj</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Num Lock</source>
-        <translation></translation>
+        <translation>Verr num</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Number Lock</source>
-        <translation></translation>
+        <translation>Verrouillage numérique</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll Lock</source>
-        <translation></translation>
+        <translation>Arrêt défilement</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Insert</source>
         <translation>Insérer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Escape</source>
         <translation>Échapement</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>System Request</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Select</source>
         <translation>Sélectionner</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Context1</source>
         <translation>Contexte1</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context2</source>
         <translation>Contexte2</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context3</source>
         <translation>Contexte3</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Context4</source>
         <translation>Contexte4</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Call</source>
         <translation>Appeler</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Hangup</source>
         <translation>Raccrocher</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Flip</source>
         <translation>Retourner</translation>
     </message>
     <message>
-        <location line="+527"/>
-        <location line="+122"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location line="-121"/>
-        <location line="+125"/>
         <source>Shift</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location line="-124"/>
-        <location line="+122"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location line="-121"/>
-        <location line="+117"/>
         <source>Meta</source>
         <translation>Méta</translation>
     </message>
     <message>
-        <location line="-25"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location line="+46"/>
         <source>F%1</source>
         <translation>F%1</translation>
     </message>
     <message>
-        <location line="-720"/>
         <source>Home Page</source>
         <translation>Page d&apos;accueil</translation>
     </message>
+    <message>
+        <source>Monitor Brightness Up</source>
+        <translation>Augmenter la luminosité du moniteur</translation>
+    </message>
+    <message>
+        <source>Monitor Brightness Down</source>
+        <translation>Baisser la luminosité du moniteur</translation>
+    </message>
+    <message>
+        <source>Keyboard Light On/Off</source>
+        <translation>Avec/sans lumière clavier</translation>
+    </message>
+    <message>
+        <source>Keyboard Brightness Up</source>
+        <translation>Augmenter la luminosité du clavier</translation>
+    </message>
+    <message>
+        <source>Keyboard Brightness Down</source>
+        <translation>Baisser la luminosité du clavier</translation>
+    </message>
+    <message>
+        <source>Power Off</source>
+        <translation>Couper l&apos;alimentation</translation>
+    </message>
+    <message>
+        <source>Wake Up</source>
+        <translation>Réveiller</translation>
+    </message>
+    <message>
+        <source>Eject</source>
+        <translation>Éjecter</translation>
+    </message>
+    <message>
+        <source>Screensaver</source>
+        <translation>Économiseur d&apos;écran</translation>
+    </message>
+    <message>
+        <source>WWW</source>
+        <translation>WWW</translation>
+    </message>
+    <message>
+        <source>Sleep</source>
+        <translation>Dormir</translation>
+    </message>
+    <message>
+        <source>LightBulb</source>
+        <translation>Ampoule</translation>
+    </message>
+    <message>
+        <source>Shop</source>
+        <translation>Magasin</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Historique</translation>
+    </message>
+    <message>
+        <source>Add Favorite</source>
+        <translation>Ajouter favori</translation>
+    </message>
+    <message>
+        <source>Hot Links</source>
+        <translation>Liens chauds</translation>
+    </message>
+    <message>
+        <source>Adjust Brightness</source>
+        <translation>Régler la luminosité</translation>
+    </message>
+    <message>
+        <source>Finance</source>
+        <translation>Finances</translation>
+    </message>
+    <message>
+        <source>Community</source>
+        <translation>Communauté</translation>
+    </message>
+    <message>
+        <source>Audio Rewind</source>
+        <translation>Audio arrière</translation>
+    </message>
+    <message>
+        <source>Back Forward</source>
+        <translation>Retour avant</translation>
+    </message>
+    <message>
+        <source>Application Left</source>
+        <translation>Application gauche</translation>
+    </message>
+    <message>
+        <source>Application Right</source>
+        <translation>Application droite</translation>
+    </message>
+    <message>
+        <source>Book</source>
+        <translation>Livre</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation>CD</translation>
+    </message>
+    <message>
+        <source>Calculator</source>
+        <translation>Calculatrice</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Effacer</translation>
+    </message>
+    <message>
+        <source>Clear Grab</source>
+        <translation>Effacer la prise</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copier</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation>Couper</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation>Affichage</translation>
+    </message>
+    <message>
+        <source>DOS</source>
+        <translation>DOS</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Documents</translation>
+    </message>
+    <message>
+        <source>Spreadsheet</source>
+        <translation>Feuille de calcul</translation>
+    </message>
+    <message>
+        <source>Browser</source>
+        <translation>Navigateur</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Jeu</translation>
+    </message>
+    <message>
+        <source>Go</source>
+        <translation>Aller</translation>
+    </message>
+    <message>
+        <source>iTouch</source>
+        <translation>iTouch</translation>
+    </message>
+    <message>
+        <source>Logoff</source>
+        <translation>Fermer une session</translation>
+    </message>
+    <message>
+        <source>Market</source>
+        <translation>Marché</translation>
+    </message>
+    <message>
+        <source>Meeting</source>
+        <translation>Réunion</translation>
+    </message>
+    <message>
+        <source>Keyboard Menu</source>
+        <translation>Menu du clavier</translation>
+    </message>
+    <message>
+        <source>Menu PB</source>
+        <translation>Menu PB</translation>
+    </message>
+    <message>
+        <source>My Sites</source>
+        <translation>Mes sites</translation>
+    </message>
+    <message>
+        <source>News</source>
+        <translation>Actualités</translation>
+    </message>
+    <message>
+        <source>Home Office</source>
+        <translation>Bureau à domicile</translation>
+    </message>
+    <message>
+        <source>Option</source>
+        <translation>Option</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Coller</translation>
+    </message>
+    <message>
+        <source>Phone</source>
+        <translation>Téléphone</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation>Répondre</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>Recharger</translation>
+    </message>
+    <message>
+        <source>Rotate Windows</source>
+        <translation>Faire tourner la fenêtre</translation>
+    </message>
+    <message>
+        <source>Rotation PB</source>
+        <translation>Rotation PB</translation>
+    </message>
+    <message>
+        <source>Rotation KB</source>
+        <translation>Rotation KB</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Enregistrer</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation>Envoyer</translation>
+    </message>
+    <message>
+        <source>Spellchecker</source>
+        <translation>Correcteur orthographique</translation>
+    </message>
+    <message>
+        <source>Split Screen</source>
+        <translation>Partager l&apos;écran</translation>
+    </message>
+    <message>
+        <source>Support</source>
+        <translation>Supporter</translation>
+    </message>
+    <message>
+        <source>Task Panel</source>
+        <translation>Panneau de tâches</translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation>Terminal</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation>Outils</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation>Voyager</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Vidéo</translation>
+    </message>
+    <message>
+        <source>Word Processor</source>
+        <translation>Traitement de texte</translation>
+    </message>
+    <message>
+        <source>XFer</source>
+        <translation>XFer</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Agrandir</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Rétrécir</translation>
+    </message>
+    <message>
+        <source>Away</source>
+        <translation>Absent</translation>
+    </message>
+    <message>
+        <source>Messenger</source>
+        <translation>Messagerie instantanée</translation>
+    </message>
+    <message>
+        <source>WebCam</source>
+        <translation>Webcaméra</translation>
+    </message>
+    <message>
+        <source>Mail Forward</source>
+        <translation>Faire suivre l&apos;e-mail</translation>
+    </message>
+    <message>
+        <source>Pictures</source>
+        <translation>Images</translation>
+    </message>
+    <message>
+        <source>Music</source>
+        <translation>Musique</translation>
+    </message>
+    <message>
+        <source>Battery</source>
+        <translation>Batterie</translation>
+    </message>
+    <message>
+        <source>Bluetooth</source>
+        <translation>Bluetooth</translation>
+    </message>
+    <message>
+        <source>Wireless</source>
+        <translation>Sans fil</translation>
+    </message>
+    <message>
+        <source>Ultra Wide Band</source>
+        <translation>Bande ultralarge</translation>
+    </message>
+    <message>
+        <source>Audio Forward</source>
+        <translation>Audio avant</translation>
+    </message>
+    <message>
+        <source>Audio Repeat</source>
+        <translation>Audio répéter</translation>
+    </message>
+    <message>
+        <source>Audio Random Play</source>
+        <translation>Audio lecture aléatoire</translation>
+    </message>
+    <message>
+        <source>Subtitle</source>
+        <translation>Sous-titre</translation>
+    </message>
+    <message>
+        <source>Audio Cycle Track</source>
+        <translation>Audio répéter la piste</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Heure</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Afficher</translation>
+    </message>
+    <message>
+        <source>Top Menu</source>
+        <translation>Haut du menu</translation>
+    </message>
+    <message>
+        <source>Suspend</source>
+        <translation>Suspendre</translation>
+    </message>
+    <message>
+        <source>Hibernate</source>
+        <translation>Hiberner</translation>
+    </message>
 </context>
 <context>
     <name>QSlider</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="+151"/>
         <source>Page left</source>
         <translation>Page précédente</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page up</source>
         <translation>Page précédente</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Position</source>
-        <translation></translation>
+        <translation>Position</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Page right</source>
         <translation>Page suivante</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page down</source>
         <translation>Page suivante</translation>
     </message>
@@ -5659,67 +5078,54 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QSocks5SocketEngine</name>
     <message>
-        <location filename="../src/network/socket/qsocks5socketengine.cpp" line="-67"/>
         <source>Connection to proxy refused</source>
         <translation>Connexion au proxy refusée</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection to proxy closed prematurely</source>
         <translation>connexion au proxy fermée prématurément</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Proxy host not found</source>
         <translation>Hôte proxy introuvable</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Connection to proxy timed out</source>
         <translation>Connexion au proxy expirée</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Proxy authentication failed</source>
         <translation>L&apos;authentification proxy a échoué</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Proxy authentication failed: %1</source>
         <translation>L&apos;authentification proxy a échoué : %1</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>SOCKS version 5 protocol error</source>
         <translation>Erreur de protocole SOCKS version 5</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>General SOCKSv5 server failure</source>
         <translation>Erreur générale du serveur SOCKSv5</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Connection not allowed by SOCKSv5 server</source>
         <translation>Connexion refusée par le serveur SOCKSv5</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>TTL expired</source>
         <translation>TTL expiré</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>SOCKSv5 command not supported</source>
         <translation>Commande SOCKSv5 non supportée</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Address type not supported</source>
         <translation>Type d&apos;adresse non supporté</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unknown SOCKSv5 proxy error code 0x%1</source>
         <translation>Erreur proxy SOCKSv5 inconnue : 0x%1</translation>
     </message>
@@ -5728,7 +5134,6 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">Erreur d&apos;expiration socks5 lors de l&apos;établissement d&apos;une connexion au serveur socks</translation>
     </message>
     <message>
-        <location line="+685"/>
         <source>Network operation timed out</source>
         <translation>L&apos;opération réseau a expiré</translation>
     </message>
@@ -5736,12 +5141,10 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QSpinBox</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/rangecontrols.cpp" line="-574"/>
         <source>More</source>
         <translation>Plus</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Less</source>
         <translation>Moins</translation>
     </message>
@@ -5749,56 +5152,42 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QSql</name>
     <message>
-        <location filename="../src/qt3support/sql/q3sqlmanager_p.cpp" line="+890"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Delete this record?</source>
         <translation>Supprimer cet enregistrement ?</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+16"/>
-        <location line="+36"/>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
-        <location line="-51"/>
-        <location line="+16"/>
-        <location line="+36"/>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
-        <location line="-44"/>
         <source>Insert</source>
         <translation>Insérer</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Update</source>
         <translation>Actualiser</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Save edits?</source>
         <translation>Enregistrer les modifications ?</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Confirm</source>
         <translation>Confirmer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Cancel your edits?</source>
         <translation>Annuler vos modifications ?</translation>
     </message>
@@ -5806,52 +5195,42 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QSslSocket</name>
     <message>
-        <location filename="../src/network/ssl/qsslsocket_openssl.cpp" line="+569"/>
         <source>Unable to write data: %1</source>
         <translation>Impossible d&apos;écrire les données : %1</translation>
     </message>
     <message>
-        <location line="+119"/>
         <source>Error while reading: %1</source>
         <translation>Erreur lors de la lecture : %1</translation>
     </message>
     <message>
-        <location line="+96"/>
         <source>Error during SSL handshake: %1</source>
         <translation>Erreur lors de la poignée de main SSL : %1</translation>
     </message>
     <message>
-        <location line="-524"/>
         <source>Error creating SSL context (%1)</source>
         <translation>Erreur lors de la création du contexte SSL (%1)</translation>
     </message>
     <message>
-        <location line="+25"/>
         <source>Invalid or empty cipher list (%1)</source>
         <translation>La list de chiffrements est invalide ou vide (%1)</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>Error creating SSL session, %1</source>
         <translation>Erreur lors de la création de la session SSL, %1</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Error creating SSL session: %1</source>
         <translation>Erreur lors de la création de la session SSL : %1</translation>
     </message>
     <message>
-        <location line="-61"/>
         <source>Cannot provide a certificate with no key, %1</source>
         <translation>Impossible de fournir un certificat sans clé, %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Error loading local certificate, %1</source>
         <translation>Erreur lors du chargement du certificat local, %1</translation>
     </message>
     <message>
-        <location line="+12"/>
         <source>Error loading private key, %1</source>
         <translation>Erreur lors du chargement de la clé privée, %1</translation>
     </message>
@@ -5860,38 +5239,130 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">La clé privée ne certifie pas la clé publique, %1</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location filename="../src/network/ssl/qsslsocket_openssl.cpp" line="+327"/>
         <source>Private key does not certificate public key, %1</source>
         <translation>La clé privée ne certifie pas la clé publique, %1</translation>
     </message>
+    <message>
+        <source>Unable to decrypt data: %1</source>
+        <translation>Impossible de décrypter les données: %1</translation>
+    </message>
+    <message>
+        <source>Private key does not certify public key, %1</source>
+        <translation>La clé privée ne certifie pas la clé publique, %1</translation>
+    </message>
+    <message>
+        <source>No error</source>
+        <translation>Aucune erreur</translation>
+    </message>
+    <message>
+        <source>The issuer certificate could not be found</source>
+        <translation>Le certificat de l&apos;émetteur est introuvable</translation>
+    </message>
+    <message>
+        <source>The certificate signature could not be decrypted</source>
+        <translation>La signature du certificat n&apos;a pas pu être vérifiée</translation>
+    </message>
+    <message>
+        <source>The public key in the certificate could not be read</source>
+        <translation>La clé publique du certificat n&apos;a pas pu être lue</translation>
+    </message>
+    <message>
+        <source>The signature of the certificate is invalid</source>
+        <translation>La signature du certificat n&apos;est pas valide</translation>
+    </message>
+    <message>
+        <source>The certificate is not yet valid</source>
+        <translation>Le certificat n&apos;est pas encore valide</translation>
+    </message>
+    <message>
+        <source>The certificate has expired</source>
+        <translation>Le certificat a expiré</translation>
+    </message>
+    <message>
+        <source>The certificate&apos;s notBefore field contains an invalid time</source>
+        <translation>Le champ pasAvant du certificat inclut une heure non valide</translation>
+    </message>
+    <message>
+        <source>The certificate&apos;s notAfter field contains an invalid time</source>
+        <translation>Le champ pasAprès du certificat inclut une heure non valide</translation>
+    </message>
+    <message>
+        <source>The certificate is self-signed, and untrusted</source>
+        <translation>Le certificat n&apos;est pas sécurisé car auto-signé</translation>
+    </message>
+    <message>
+        <source>The root certificate of the certificate chain is self-signed, and untrusted</source>
+        <translation>Le certificat racine de la chaîne de certificats n&apos;est pas sécurisé car signé automatiquement</translation>
+    </message>
+    <message>
+        <source>The issuer certificate of a locally looked up certificate could not be found</source>
+        <translation>Le certificat de l&apos;émetteur d&apos;un certificat converti localement est introuvable</translation>
+    </message>
+    <message>
+        <source>No certificates could be verified</source>
+        <translation>Aucun certificat n&apos;a pu être vérifié</translation>
+    </message>
+    <message>
+        <source>One of the CA certificates is invalid</source>
+        <translation>L&apos;un des certificats CA n&apos;est pas valide</translation>
+    </message>
+    <message>
+        <source>The basicConstraints path length parameter has been exceeded</source>
+        <translation>Le paramètre de longueur du chemin basicConstraints a été dépassé</translation>
+    </message>
+    <message>
+        <source>The supplied certificate is unsuitable for this purpose</source>
+        <translation>Le certificat fourni ne convient pas pour cet objectif</translation>
+    </message>
+    <message>
+        <source>The root CA certificate is not trusted for this purpose</source>
+        <translation>Le certificat CA racine n&apos;est pas sécurisé pour cet objectif</translation>
+    </message>
+    <message>
+        <source>The root CA certificate is marked to reject the specified purpose</source>
+        <translation>Le certificat CA racine est marqué pour rejeter l&apos;objectif spécifié</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>Le certificat de l&apos;émetteur candidat actuel a été rejeté car le nom de son sujet ne correspondait pas au nom de l&apos;émetteur du certificat actuel</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>Le certificat de l&apos;émetteur candidat actuel a été rejeté car le nom de son sujet et son numéro de série étaient présents et ne correspondaient pas à l&apos;identifiant de la clé d&apos;autorité du certificat actuel</translation>
+    </message>
+    <message>
+        <source>The peer did not present any certificate</source>
+        <translation>Le poste ne contient aucun certificat</translation>
+    </message>
+    <message>
+        <source>The host name did not match any of the valid hosts for this certificate</source>
+        <translation>Le nom d&apos;hôte ne correspondait à aucun des hôtes valides pour ce certificat</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Erreur inconnue</translation>
+    </message>
 </context>
 <context>
     <name>QSystemSemaphore</name>
     <message>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_unix.cpp" line="-41"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+66"/>
         <source>%1: out of resources</source>
         <translation>%1: plus de ressources disponibles</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+4"/>
         <source>%1: permission denied</source>
         <translation>%1: permission refusée</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: already exists</source>
         <translation>%1 : existe déjà</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1: does not exist</source>
         <translation>%1 : n&apos;existe pas</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location filename="../src/corelib/kernel/qsystemsemaphore_win.cpp" line="+3"/>
         <source>%1: unknown error %2</source>
         <translation>%1: erreur inconnue %2</translation>
     </message>
@@ -5899,12 +5370,10 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QTDSDriver</name>
     <message>
-        <location filename="../src/sql/drivers/tds/qsql_tds.cpp" line="+584"/>
         <source>Unable to open connection</source>
         <translation>Impossible d&apos;ouvrir la connexion</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Unable to use database</source>
         <translation>Impossible d&apos;utiliser la base de données</translation>
     </message>
@@ -5912,12 +5381,10 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QTabBar</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/complexwidgets.cpp" line="-326"/>
         <source>Scroll Left</source>
         <translation>Défiler vers la gauche</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll Right</source>
         <translation>Défiler vers la droite</translation>
     </message>
@@ -5929,7 +5396,6 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">Operation socket non supportée</translation>
     </message>
     <message>
-        <location filename="../src/network/socket/qtcpserver.cpp" line="+282"/>
         <source>Operation on socket is not supported</source>
         <translation>Opération sur le socket non supportée</translation>
     </message>
@@ -5937,42 +5403,34 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QTextControl</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+1973"/>
         <source>&amp;Undo</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Redo</source>
         <translation>&amp;Répéter</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Cu&amp;t</source>
         <translation>Co&amp;uper</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>&amp;Copy</source>
         <translation>Cop&amp;ier</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Copy &amp;Link Location</source>
         <translation>Copier l&apos;adresse du &amp;lien</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>&amp;Paste</source>
         <translation>Co&amp;ller</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Select All</source>
         <translation>Tout sélectionner</translation>
     </message>
@@ -5980,14 +5438,10 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QToolButton</name>
     <message>
-        <location filename="../src/plugins/accessible/widgets/simplewidgets.cpp" line="+254"/>
-        <location line="+6"/>
         <source>Press</source>
         <translation>Presser</translation>
     </message>
     <message>
-        <location line="-4"/>
-        <location line="+8"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
@@ -5995,7 +5449,6 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QUdpSocket</name>
     <message>
-        <location filename="../src/network/socket/qudpsocket.cpp" line="+169"/>
         <source>This platform does not support IPv6</source>
         <translation>Cette plateforme ne supporte pas IPv6</translation>
     </message>
@@ -6003,12 +5456,10 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QUndoGroup</name>
     <message>
-        <location filename="../src/gui/util/qundogroup.cpp" line="+386"/>
         <source>Undo</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Redo</source>
         <translation>Répéter</translation>
     </message>
@@ -6016,7 +5467,6 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QUndoModel</name>
     <message>
-        <location filename="../src/gui/util/qundoview.cpp" line="+101"/>
         <source>&lt;empty&gt;</source>
         <translation>&lt;vide&gt;</translation>
     </message>
@@ -6024,12 +5474,10 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QUndoStack</name>
     <message>
-        <location filename="../src/gui/util/qundostack.cpp" line="+834"/>
         <source>Undo</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Redo</source>
         <translation>Répéter</translation>
     </message>
@@ -6037,57 +5485,46 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QUnicodeControlCharacterMenu</name>
     <message>
-        <location filename="../src/gui/text/qtextcontrol.cpp" line="+884"/>
         <source>LRM Left-to-right mark</source>
         <translation>LRM Left-to-right mark</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLM Right-to-left mark</source>
         <translation>RLM Right-to-left mark</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWJ Zero width joiner</source>
         <translation>ZWJ Zero width joiner</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWNJ Zero width non-joiner</source>
         <translation>ZWNJ Zero width non-joiner</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>ZWSP Zero width space</source>
         <translation>ZWSP Zero width space</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LRE Start of left-to-right embedding</source>
         <translation>LRE Start of left-to-right embedding</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLE Start of right-to-left embedding</source>
         <translation>RLE Start of right-to-left embedding</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>LRO Start of left-to-right override</source>
         <translation>LRO Start of left-to-right override</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>RLO Start of right-to-left override</source>
         <translation>RLO Start of right-to-left override</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>PDF Pop directional formatting</source>
         <translation>PDF Pop directional formatting</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Insert Unicode control character</source>
         <translation>Insérer caractère de contrôle Unicode</translation>
     </message>
@@ -6095,35 +5532,34 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QWebFrame</name>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+692"/>
         <source>Request cancelled</source>
         <translation>Requête annulée</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Request blocked</source>
         <translation>Requête bloquée</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Cannot show URL</source>
         <translation>Impossible d&apos;afficher l&apos;URL</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp" line="+722"/>
         <source>Frame load interruped by policy change</source>
         <translation>Chargement de la frame interrompu par un changement de configuration</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Cannot show mimetype</source>
         <translation>Impossible d&apos;afficher le mimetype</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>File does not exist</source>
         <translation>Le fichier n&apos;existe pas</translation>
     </message>
+    <message>
+        <source>Frame load interrupted by policy change</source>
+        <translation>Chargement du cadre interrompue par le changement de stratégie</translation>
+    </message>
 </context>
 <context>
     <name>QWebPage</name>
@@ -6172,7 +5608,7 @@ Veuillez choisir un nom de fichier différent.</translation>
         <location line="+5"/>
         <source>Save Link...</source>
         <comment>Download Linked File context menu item</comment>
-        <translation>Sauvegarder le lien...</translation>
+        <translation>Enregistrer le lien...</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -6190,7 +5626,7 @@ Veuillez choisir un nom de fichier différent.</translation>
         <location line="+5"/>
         <source>Save Image</source>
         <comment>Download Image context menu item</comment>
-        <translation>SAuvegarder l&apos;image</translation>
+        <translation>Enregistrer l&apos;image</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -6421,83 +5857,68 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>%1 (%2x%3 pixels)</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp" line="+185"/>
         <source>Web Inspector - %2</source>
         <translation>Inspecteur Web - %2</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp" line="+382"/>
         <source>Bad HTTP request</source>
         <translation>Requête HTTP erronée</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp" line="-291"/>
+        <location line="-291"/>
         <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 &apos;searchable index&apos;</comment>
         <translation>Ceci est un index. Veuillez saisir les mots-clé :</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebCore/platform/qt/ScrollbarQt.cpp" line="+58"/>
         <source>Scroll here</source>
         <translation>Défiler jusqu&apos;ici</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Left edge</source>
-        <translation>Extrême gauche</translation>
+        <translation>À gauche</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Top</source>
-        <translation>En haut</translation>
+        <translation>Haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Right edge</source>
-        <translation>Extrême droite</translation>
+        <translation>À droite</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Bottom</source>
         <translation>En bas</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Page left</source>
-        <translation>Page précédente</translation>
+        <translation>Page gauche</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page up</source>
-        <translation>Page précédente</translation>
+        <translation>Page haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Page right</source>
-        <translation>Page suivante</translation>
+        <translation>Page droite</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Page down</source>
-        <translation>Page suivante</translation>
+        <translation>Page bas</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Scroll left</source>
         <translation>Défiler vers la gauche</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll up</source>
         <translation>Défiler vers le haut</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>Scroll right</source>
         <translation>Défiler vers la droite</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>Scroll down</source>
         <translation>Défiler vers le bas</translation>
     </message>
@@ -6511,201 +5932,574 @@ Veuillez choisir un nom de fichier différent.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp" line="+1322"/>
         <source>JavaScript Alert - %1</source>
-        <translation>Alerte javascript - %1</translation>
+        <translation>Alerte JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>JavaScript Confirm - %1</source>
-        <translation>Confirmation javascript - %1</translation>
+        <translation>Confirmation JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>JavaScript Prompt - %1</source>
-        <translation>Invite javascript - %1</translation>
+        <translation>Invite JavaScript - %1</translation>
     </message>
     <message>
-        <location line="+333"/>
         <source>Move the cursor to the next character</source>
-        <translation>Positionner le curseur sur le caractère suivant</translation>
+        <translation>Déplacer le curseur au caractère suivant</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous character</source>
-        <translation>Positionner le curseur sur le caractère précédent</translation>
+        <translation>Déplacer le curseur au caractère précédent</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the next word</source>
-        <translation>Positionner le curseur au mot suivant</translation>
+        <translation>Déplacer le curseur au mot suivant</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous word</source>
-        <translation>Positionner le curseur sur le mot précédent</translation>
+        <translation>Déplacer le curseur au mot précédent</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the next line</source>
-        <translation>Positionner le curseur sur la prochaine ligne</translation>
+        <translation>Déplacer le curseur à la ligne suivante</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the previous line</source>
-        <translation>Déplacer le curseur sur la ligne précédente</translation>
+        <translation>Déplacer le curseur à la ligne précédente</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the line</source>
-        <translation>Positionner le curseur au début de la ligne</translation>
+        <translation>Déplacer le curseur en début de ligne</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the line</source>
-        <translation>Positionner le curseur à la fin de la ligne</translation>
+        <translation>Déplacer le curseur en fin de ligne</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the block</source>
-        <translation>Positionner le curseur au début du bloc</translation>
+        <translation>Déplacer le curseur au début du paragraphe</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the block</source>
-        <translation>Positionner le curseur à la fin du bloc</translation>
+        <translation>Déplacer le curseur à la fin du paragraphe</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the start of the document</source>
-        <translation>Positionner le curseur au début du document</translation>
+        <translation>Déplacer le curseur en début de document</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Move the cursor to the end of the document</source>
-        <translation>Positionner le curseur à la fin du document</translation>
+        <translation>Déplacer le curseur en fin de document</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select all</source>
-        <translation>Sélectionner tout</translation>
+        <translation>Tout sélectionner</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next character</source>
-        <translation>Sélectionner le caractère suivant</translation>
+        <translation>Sélectionner jusqu&apos;au caractère suivant</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous character</source>
-        <translation>Sélectionner le caractère précédent</translation>
+        <translation>Sélectionner jusqu&apos;au caractère précédent</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next word</source>
-        <translation>Sélectionner le prochain mot</translation>
+        <translation>Sélectionner jusqu&apos;au mot suivant</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous word</source>
-        <translation>Sélectionner le mot précédent</translation>
+        <translation>Sélectionner jusqu&apos;au mot précédent</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the next line</source>
-        <translation>Sélectionner jusqu&apos;à la prochaine ligne</translation>
+        <translation>Sélectionner jusqu&apos;à la ligne suivante</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the previous line</source>
         <translation>Sélectionner jusqu&apos;à la ligne précédente</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the line</source>
-        <translation>Sélectionner jusqu&apos;au début de la ligne</translation>
+        <translation>Sélectionner jusqu&apos;en début de ligne</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the line</source>
-        <translation>Sélectionner jusqu&apos;à la fin de la ligne</translation>
+        <translation>Sélectionner jusqu&apos;en fin de ligne</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the block</source>
-        <translation>Sélectionner jusqu&apos;au début du bloc</translation>
+        <translation>Sélectionner jusqu&apos;au début du paragraphe</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the block</source>
-        <translation>Sélectionner jusqu&apos;à la fin du bloc</translation>
+        <translation>Sélectionner jusqu&apos;à la fin du paragraphe</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the start of the document</source>
         <translation>Sélectionner jusqu&apos;au début du document</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Select to the end of the document</source>
         <translation>Sélectionner jusqu&apos;à la fin du document</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete to the start of the word</source>
         <translation>Supprimer jusqu&apos;au début du mot</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Delete to the end of the word</source>
         <translation>Supprimer jusqu&apos;à la fin du mot</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>Insert a new paragraph</source>
         <translation>Insérer un nouveau paragraphe</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Insert a new line</source>
         <translation>Insérer une nouvelle ligne</translation>
     </message>
+    <message>
+        <source>Submit</source>
+        <translation>Soumettre</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>Réinitialiser</translation>
+    </message>
+    <message>
+        <source>Choose File</source>
+        <translation>Choisir le fichier</translation>
+    </message>
+    <message>
+        <source>No file selected</source>
+        <translation>Pas de fichier sélectionné</translation>
+    </message>
+    <message>
+        <source>Open in New Window</source>
+        <translation>Ouvrir dans une Nouvelle Fenêtre</translation>
+    </message>
+    <message>
+        <source>Save Link...</source>
+        <translation>Enregistrer la cible du lien...</translation>
+    </message>
+    <message>
+        <source>Copy Link</source>
+        <translation>Copier le lien</translation>
+    </message>
+    <message>
+        <source>Open Image</source>
+        <translation>Ouvrir l&apos;image</translation>
+    </message>
+    <message>
+        <source>Save Image</source>
+        <translation>Enregistrer l&apos;image</translation>
+    </message>
+    <message>
+        <source>Copy Image</source>
+        <translation>Copier l&apos;image</translation>
+    </message>
+    <message>
+        <source>Open Frame</source>
+        <translation>Ouvrir le cadre</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copier</translation>
+    </message>
+    <message>
+        <source>Go Back</source>
+        <translation>Précédent</translation>
+    </message>
+    <message>
+        <source>Go Forward</source>
+        <translation>Suivant</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Stop</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>Recharger</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation>Couper</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Coller</translation>
+    </message>
+    <message>
+        <source>No Guesses Found</source>
+        <translation>Pas de candidat trouvés</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>Ignorer</translation>
+    </message>
+    <message>
+        <source>Add To Dictionary</source>
+        <translation>Ajouter au dictionnaire</translation>
+    </message>
+    <message>
+        <source>Search The Web</source>
+        <translation>Chercher sur le Web</translation>
+    </message>
+    <message>
+        <source>Look Up In Dictionary</source>
+        <translation>Chercher dans le dictionnaire</translation>
+    </message>
+    <message>
+        <source>Open Link</source>
+        <translation>Ouvrir le lien</translation>
+    </message>
+    <message>
+        <source>Spelling</source>
+        <translation>Orthographe</translation>
+    </message>
+    <message>
+        <source>Show Spelling and Grammar</source>
+        <translation>Afficher Orthographe et Grammaire</translation>
+    </message>
+    <message>
+        <source>Hide Spelling and Grammar</source>
+        <translation>Cacher Orthographe et Grammaire</translation>
+    </message>
+    <message>
+        <source>Check Spelling</source>
+        <translation>Vérifier l&apos;orthographe</translation>
+    </message>
+    <message>
+        <source>Check Spelling While Typing</source>
+        <translation>Vérifier l&apos;orthographe pendant la saisie</translation>
+    </message>
+    <message>
+        <source>Check Grammar With Spelling</source>
+        <translation>Vérifier la grammaire en même temps que l&apos;orthographe</translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation>Polices</translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation>Gras</translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation>Italique</translation>
+    </message>
+    <message>
+        <source>Underline</source>
+        <translation>Souligné</translation>
+    </message>
+    <message>
+        <source>Outline</source>
+        <translation>Contour</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <translation>Direction</translation>
+    </message>
+    <message>
+        <source>Text Direction</source>
+        <translation>Orientation du texte</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Défaut</translation>
+    </message>
+    <message>
+        <source>Left to Right</source>
+        <translation>Gauche à droite</translation>
+    </message>
+    <message>
+        <source>Right to Left</source>
+        <translation>Droite à gauche</translation>
+    </message>
+    <message>
+        <source>Loading...</source>
+        <translation>Chargement...</translation>
+    </message>
+    <message>
+        <source>Live Broadcast</source>
+        <translation>Diffusion en direct</translation>
+    </message>
+    <message>
+        <source>Audio Element</source>
+        <translation>Élément audio</translation>
+    </message>
+    <message>
+        <source>Video Element</source>
+        <translation>Élément vidéo</translation>
+    </message>
+    <message>
+        <source>Mute Button</source>
+        <translation>Bouton de désactivation du son</translation>
+    </message>
+    <message>
+        <source>Unmute Button</source>
+        <translation>Bouton de réactivation du son</translation>
+    </message>
+    <message>
+        <source>Play Button</source>
+        <translation>Bouton de lecture</translation>
+    </message>
+    <message>
+        <source>Pause Button</source>
+        <translation>Bouton de pause</translation>
+    </message>
+    <message>
+        <source>Slider</source>
+        <translation>Barre de défilement</translation>
+    </message>
+    <message>
+        <source>Slider Thumb</source>
+        <translation>Curseur de la barre de défilement</translation>
+    </message>
+    <message>
+        <source>Rewind Button</source>
+        <translation>Bouton de retour en arrière</translation>
+    </message>
+    <message>
+        <source>Return to Real-time Button</source>
+        <translation>Bouton de retour au temps réel</translation>
+    </message>
+    <message>
+        <source>Elapsed Time</source>
+        <translation>Temps écoulé</translation>
+    </message>
+    <message>
+        <source>Remaining Time</source>
+        <translation>Durée restante</translation>
+    </message>
+    <message>
+        <source>Status Display</source>
+        <translation>Affichage de l&apos;état</translation>
+    </message>
+    <message>
+        <source>Fullscreen Button</source>
+        <translation>Bouton de plein écran</translation>
+    </message>
+    <message>
+        <source>Seek Forward Button</source>
+        <translation>Bouton de recherche avant</translation>
+    </message>
+    <message>
+        <source>Seek Back Button</source>
+        <translation>Bouton de recherche arrière</translation>
+    </message>
+    <message>
+        <source>Audio element playback controls and status display</source>
+        <translation>Commandes de lecture et affichage de l&apos;état de l&apos;élément audio</translation>
+    </message>
+    <message>
+        <source>Video element playback controls and status display</source>
+        <translation>Commandes de lecture et affichage de l&apos;état de l&apos;élément vidéo</translation>
+    </message>
+    <message>
+        <source>Mute audio tracks</source>
+        <translation>Couper le son des pistes audio</translation>
+    </message>
+    <message>
+        <source>Unmute audio tracks</source>
+        <translation>Réactiver le son des pistes audio</translation>
+    </message>
+    <message>
+        <source>Begin playback</source>
+        <translation>Commencer la lecture</translation>
+    </message>
+    <message>
+        <source>Pause playback</source>
+        <translation>Pause lecture</translation>
+    </message>
+    <message>
+        <source>Movie time scrubber</source>
+        <translation>Épurateur de la durée du film</translation>
+    </message>
+    <message>
+        <source>Movie time scrubber thumb</source>
+        <translation>Case de défilement de l&apos;épurateur de la durée du film</translation>
+    </message>
+    <message>
+        <source>Rewind movie</source>
+        <translation>Rembobiner le film</translation>
+    </message>
+    <message>
+        <source>Return streaming movie to real-time</source>
+        <translation>Ramener le film en streaming en temps réel</translation>
+    </message>
+    <message>
+        <source>Current movie time</source>
+        <translation>Durée du film actuel</translation>
+    </message>
+    <message>
+        <source>Remaining movie time</source>
+        <translation>Durée de film restante</translation>
+    </message>
+    <message>
+        <source>Current movie status</source>
+        <translation>État du film actuel</translation>
+    </message>
+    <message>
+        <source>Play movie in full-screen mode</source>
+        <translation>Regarder le film en mode plein écran</translation>
+    </message>
+    <message>
+        <source>Seek quickly back</source>
+        <translation>Recherche rapide arrière</translation>
+    </message>
+    <message>
+        <source>Seek quickly forward</source>
+        <translation>Recherche rapide avant</translation>
+    </message>
+    <message>
+        <source>Indefinite time</source>
+        <translation>Durée indéfinie</translation>
+    </message>
+    <message>
+        <source>%1 days %2 hours %3 minutes %4 seconds</source>
+        <translation>%1 jours %2 heures %3 minutes %4 secondes</translation>
+    </message>
+    <message>
+        <source>%1 hours %2 minutes %3 seconds</source>
+        <translation>%1 heures %2 minutes %3 secondes</translation>
+    </message>
+    <message>
+        <source>%1 minutes %2 seconds</source>
+        <translation>%1 minutes %2 secondes</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 secondes</translation>
+    </message>
+    <message>
+        <source>Inspect</source>
+        <translation>Inspecter</translation>
+    </message>
+    <message>
+        <source>No recent searches</source>
+        <translation>Pas de recherche récente</translation>
+    </message>
+    <message>
+        <source>Recent searches</source>
+        <translation>Recherches récentes</translation>
+    </message>
+    <message>
+        <source>Clear recent searches</source>
+        <translation>Effacer les recherches récentes</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Inconnu</translation>
+    </message>
+    <message>
+        <source>%1 (%2x%3 pixels)</source>
+        <translation>%1 (%2x%3 pixels)</translation>
+    </message>
+    <message>
+        <source>This is a searchable index. Enter search keywords: </source>
+        <translation>Ceci est un index. Veuillez saisir les mots-clé :</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n file(s)</source>
+        <translation>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>JavaScript Problem - %1</source>
+        <translation>Problème 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>Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script?</translation>
+    </message>
+    <message>
+        <source>Paste and Match Style</source>
+        <translation>Coller et suivre le style</translation>
+    </message>
+    <message>
+        <source>Remove formatting</source>
+        <translation>Retirer la mise en forme</translation>
+    </message>
+    <message>
+        <source>Strikethrough</source>
+        <translation>Barré</translation>
+    </message>
+    <message>
+        <source>Subscript</source>
+        <translation>Indice</translation>
+    </message>
+    <message>
+        <source>Superscript</source>
+        <translation>Exposant</translation>
+    </message>
+    <message>
+        <source>Insert Bulleted List</source>
+        <translation>Insérer une liste à puces</translation>
+    </message>
+    <message>
+        <source>Insert Numbered List</source>
+        <translation>Insérer une liste numérotée</translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation>Retrait</translation>
+    </message>
+    <message>
+        <source>Outdent</source>
+        <translation>Retrait négatif</translation>
+    </message>
+    <message>
+        <source>Center</source>
+        <translation>Centré</translation>
+    </message>
+    <message>
+        <source>Justify</source>
+        <translation>Justifié</translation>
+    </message>
+    <message>
+        <source>Align Left</source>
+        <translation>Aligner à gauche</translation>
+    </message>
+    <message>
+        <source>Align Right</source>
+        <translation>Aligner à droite</translation>
+    </message>
 </context>
 <context>
     <name>QWhatsThisAction</name>
     <message>
-        <location filename="../src/gui/kernel/qwhatsthis.cpp" line="+522"/>
         <source>What&apos;s This?</source>
-        <translation>Qu&apos;est-ce que c&apos;est ?</translation>
+        <translation>Qu&apos;est-ce que c&apos;est ?</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../src/gui/kernel/qwidget.cpp" line="+5326"/>
         <source>*</source>
-        <translation>*</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>QWizard</name>
     <message>
-        <location filename="../src/gui/dialogs/qwizard.cpp" line="+637"/>
         <source>Go Back</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Continue</source>
-        <translation>Suivant</translation>
+        <translation>Continuer</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Commit</source>
+        <translatorcomment>si il s&apos;agit de commit au même sens que git... (en même temps se marier en cliquant... ?!!?!)</translatorcomment>
         <translation>Soumettre</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Done</source>
         <translation>Terminer</translation>
     </message>
@@ -6714,37 +6508,30 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">Quitter</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location line="-14"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; &amp;Précédent</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>&amp;Finish</source>
         <translation>&amp;Terminer</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location line="-8"/>
         <source>&amp;Next</source>
-        <translation>&amp;Suivant</translation>
+        <translation>&amp;Suivant &gt;</translation>
     </message>
     <message>
-        <location line="+0"/>
         <source>&amp;Next &gt;</source>
         <translation>&amp;Suivant &gt;</translation>
     </message>
@@ -6752,378 +6539,298 @@ Veuillez choisir un nom de fichier différent.</translation>
 <context>
     <name>QWorkspace</name>
     <message>
-        <location filename="../src/gui/widgets/qworkspace.cpp" line="+1094"/>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Move</source>
         <translation>&amp;Déplacer</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>&amp;Size</source>
-        <translation>&amp;Redimensionner</translation>
+        <translation>&amp;Taille</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Mi&amp;nimize</source>
         <translation>Réd&amp;uire</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Ma&amp;ximize</source>
         <translation>Ma&amp;ximiser</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Stay on &amp;Top</source>
-        <translation>&amp;Rester au premier plan</translation>
+        <translation>Rester au &amp;premier plan</translation>
     </message>
     <message>
-        <location line="-993"/>
         <source>Minimize</source>
         <translation>Réduire</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Restore Down</source>
         <translation>Restaurer en bas</translation>
     </message>
     <message>
-        <location line="-4"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="+998"/>
-        <location line="+1059"/>
         <source>Sh&amp;ade</source>
-        <translation>&amp;Enrouler</translation>
+        <translation>Enrou&amp;ler</translation>
     </message>
     <message>
-        <location line="-278"/>
-        <location line="+60"/>
         <source>%1 - [%2]</source>
         <translation>%1 - [%2]</translation>
     </message>
     <message>
-        <location line="+214"/>
         <source>&amp;Unshade</source>
-        <translation>&amp;Dérouler</translation>
+        <translation>Dér&amp;ouler</translation>
     </message>
 </context>
 <context>
     <name>QXml</name>
     <message>
-        <location filename="../src/xml/sax/qxml.cpp" line="+58"/>
         <source>no error occurred</source>
         <translation>aucune erreur ne s&apos;est produite</translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error triggered by consumer</source>
-        <translation>erreur déclenchée par le consommateur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected end of file</source>
-        <translation>fin de fichier impromptue</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>more than one document type definition</source>
-        <translation>plus d&apos;une définition de type de document</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing element</source>
-        <translation>une erreur s&apos;est produite lors de l&apos;analyse d&apos;un élément</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>tag mismatch</source>
-        <translation>balise débalancée</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing content</source>
-        <translation>une erreur s&apos;est produise lors de l&apos;analyse du contenu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unexpected character</source>
-        <translation>caractère impromptu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>invalid name for processing instruction</source>
-        <translation>nom d&apos;instruction de traitement invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>version expected while reading the XML declaration</source>
-        <translation>version attendue dans la déclaration XML</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>wrong value for standalone declaration</source>
-        <translation>valeur invalide pour déclaration autonome</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>error occurred while parsing document type definition</source>
-        <translation>une erreur s&apos;est produite lors de l&apos;analyse d&apos;une définition de type de document</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>letter is expected</source>
-        <translation>lettre attendue</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing comment</source>
-        <translation>une erreur s&apos;est produise lors de l&apos;analyse d&apos;un commentaire</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error occurred while parsing reference</source>
-        <translation>une erreur s&apos;est produite lors de l&apos;analyse d&apos;une référence</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>internal general entity reference not allowed in DTD</source>
-        <translation>appel d&apos;entité interne générale non permis dans la DTD</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>external parsed general entity reference not allowed in attribute value</source>
-        <translation>appel d&apos;entité externe parsée  non permis dans la valeur d&apos;un attribut</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>external parsed general entity reference not allowed in DTD</source>
-        <translation>appel d&apos;entité externe parsée générale non permis dans la DTD</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>unparsed entity reference in wrong context</source>
-        <translation>appel d&apos;entité non parsée dans un contexte invalide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>recursive entities</source>
-        <translation>entités récursives</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>error in the text declaration of an external entity</source>
-        <translation>erreur dans la déclaration de texte d&apos;une entité externe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-11"/>
         <source>encoding declaration or standalone declaration expected while reading the XML declaration</source>
-        <translation>déclaration d&apos;encodage ou déclaration autonome attendue dans la déclaration XML</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
         <source>standalone declaration expected while reading the XML declaration</source>
-        <translation>déclaration autonome attendue dans la déclaration XML</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QXmlStream</name>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream.cpp" line="+592"/>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+1769"/>
         <source>Extra content at end of document.</source>
-        <translation>Conteny supplémentaire à la fin du document.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
         <source>Invalid entity value.</source>
-        <translation>Valeur de l&apos;entité invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
         <source>Invalid XML character.</source>
-        <translation>Caractère XML invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+259"/>
         <source>Sequence &apos;]]&gt;&apos; not allowed in content.</source>
-        <translation>Séquence &apos;]]&gt;&apos; interdite dans le contenu.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
         <source>Namespace prefix &apos;%1&apos; not declared</source>
-        <translation>Le préfixe de namespace &apos;%1&apos; non déclaré</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
         <source>Attribute redefined.</source>
-        <translation>Attribut redéfini.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Unexpected character &apos;%1&apos; in public id literal.</source>
-        <translation>Caractère &apos;%1&apos; inattendu dans un &apos;public id literal&apos;.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>Invalid XML version string.</source>
-        <translation>Version XML invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Unsupported XML version.</source>
-        <translation>Version XML non supportée.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>%1 is an invalid encoding name.</source>
-        <translation>%1 n&apos;est pas un encodage valide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Encoding %1 is unsupported</source>
-        <translation>Encodage %1 n&apos;est pas supporté</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid XML encoding name.</source>
         <translation type="obsolete">Encodage XML invalide.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Standalone accepts only yes or no.</source>
-        <translation>&apos;Standalone&apos; n&apos;accepte que &apos;yes&apos; ou &apos;no&apos;.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid attribute in XML declaration.</source>
-        <translation>Attribut invalide dans la déclaration XML.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>Premature end of document.</source>
-        <translation>Fin de document prématurée.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>Invalid document.</source>
-        <translation>Document invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Expected </source>
-        <translation>Attendu </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>, but got &apos;</source>
-        <translation>, mais eu &apos;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unexpected &apos;</source>
-        <translation>Inattendu &apos;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+210"/>
         <source>Expected character data.</source>
-        <translation>Character data attendu.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="-995"/>
         <source>Recursive entity detected.</source>
-        <translation>Entité recursive détectée.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+516"/>
         <source>Start tag expected.</source>
-        <translation>Balise ouvrante attendue.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
         <source>XML declaration not at start of document.</source>
-        <translation>Déclaration XML après le début du document.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-31"/>
         <source>NDATA in parameter entity declaration.</source>
-        <translation>NDATA dans une déclaration d&apos;entité paramètre.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>%1 is an invalid processing instruction name.</source>
-        <translation>%1 est un nom d&apos;instruction de traitement invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Invalid processing instruction name.</source>
-        <translation>Nom d&apos;instruction de traitement invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream.cpp" line="-521"/>
-        <location line="+12"/>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+164"/>
-        <location line="+53"/>
         <source>Illegal namespace declaration.</source>
-        <translation>Déclaration de namespace illégale.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+15"/>
         <source>Invalid XML name.</source>
-        <translation>Nom XML invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Opening and ending tag mismatch.</source>
-        <translation>Ouverture et fermeture de balise invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Reference to unparsed entity &apos;%1&apos;.</source>
-        <translation>Référence vers une entité non analysée &apos;%1&apos;.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <location line="+61"/>
-        <location line="+40"/>
         <source>Entity &apos;%1&apos; not declared.</source>
-        <translation>Entité &apos;%1&apos; non déclarée.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
         <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
-        <translation>Référence vers une entité externe &apos;%1&apos; dans la valeur de l&apos;attribut.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>Invalid character reference.</source>
-        <translation>Référence vers un caractère invalide.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream.cpp" line="-75"/>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="-823"/>
         <source>Encountered incorrectly encoded content.</source>
-        <translation>Encodage du contenu incorrect.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
         <source>The standalone pseudo attribute must appear after the encoding.</source>
-        <translation>Le pseudo attribut standalone doit apparaître après l&apos;encodage.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/corelib/xml/qxmlstream_p.h" line="+562"/>
         <source>%1 is an invalid PUBLIC identifier.</source>
-        <translation>%1 n&apos;est pas un identifiant PUBLIC valide.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7139,12 +6846,10 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Un attribute %1 doit avoir un %2 valide, %3 ne l&apos;a pas.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/api/qiodevicedelegate.cpp" line="+84"/>
         <source>Network timeout.</source>
         <translation>Le réseau ne répond pas.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/api/qxmlserializer.cpp" line="+320"/>
         <source>Element %1 can&apos;t be serialized because it appears outside the document element.</source>
         <translation>L&apos;élément %1 ne peut pas être sérialisé parce qu&apos;il est hors de l&apos;élément document.</translation>
     </message>
@@ -7153,53 +6858,42 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">L&apos;élément attribute %1 ne peut pas être sérialisé parce qu&apos;il apparaît comme racine.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qabstractdatetime.cpp" line="+80"/>
         <source>Year %1 is invalid because it begins with %2.</source>
         <translation>L&apos;année %1 est invalide parce qu&apos;elle commence par %2.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>Day %1 is outside the range %2..%3.</source>
         <translation>Le jour %1 est hors de l&apos;intervalle %2..%3.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Month %1 is outside the range %2..%3.</source>
         <translation>Le mois %1 est hors de l&apos;intervalle %2..%3.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Overflow: Can&apos;t represent date %1.</source>
         <translation>Overflow: ne peut pas représenter la date %1.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Day %1 is invalid for month %2.</source>
         <translation>Jour %1 est invalide pour le mois %2.</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source>
         <translation>L&apos;heure 24:%1:%2.%3 est invalide. L&apos;heure est 24 mais les minutes, seconndes et millisecondes ne sont pas à 0;</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Time %1:%2:%3.%4 is invalid.</source>
         <translation>L&apos;heure %1:%2:%3.%4 est invalide.</translation>
     </message>
     <message>
-        <location line="+115"/>
         <source>Overflow: Date can&apos;t be represented.</source>
         <translation>Overflow : la date ne peut pas être représentée.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qabstractduration.cpp" line="+99"/>
-        <location line="+15"/>
         <source>At least one component must be present.</source>
         <translation>Au moins un composant doit être présent.</translation>
     </message>
     <message>
-        <location line="-7"/>
         <source>At least one time component must appear after the %1-delimiter.</source>
         <translation>Au moins un composant doit apparaître après le délimiteur %1.</translation>
     </message>
@@ -7219,103 +6913,82 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Le second opérande dans une division, %1, ne peut être nul (%2).</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qanyuri_p.h" line="+132"/>
         <source>%1 is not a valid value of type %2.</source>
         <translation>%1 n&apos;est pas une valeur valide du type %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomiccasters_p.h" line="+223"/>
         <source>When casting to %1 from %2, the source value cannot be %3.</source>
         <translation>En castant de %2 vers %1, la valeur source ne peut pas être %3.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomicmathematicians.cpp" line="+65"/>
         <source>Integer division (%1) by zero (%2) is undefined.</source>
         <translation>Division entière (%1) par zéro (%2) indéfinie.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Division (%1) by zero (%2) is undefined.</source>
         <translation>Division (%1) par zéro (%2) indéfinie.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Modulus division (%1) by zero (%2) is undefined.</source>
         <translation>Module division (%1) par zéro (%2) indéfinie.</translation>
     </message>
     <message>
-        <location line="+122"/>
-        <location line="+32"/>
         <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source>
         <translation>Diviser une valeur du type %1 par %2 (not-a-number) est interdit.</translation>
     </message>
     <message>
-        <location line="-20"/>
         <source>Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.</source>
         <translation>Diviser une valeur de type %1 par %2 ou %3 (plus ou moins zéro) est interdit.</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.</source>
         <translation>La multiplication d&apos;une valeur du type %1 par %2 ou %3 (plus ou moins infini) est interdite.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qatomicvalue.cpp" line="+79"/>
         <source>A value of type %1 cannot have an Effective Boolean Value.</source>
         <translation>Une valeur de type %1 ne peut pas avoir une Effective Boolean Value.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qboolean.cpp" line="+78"/>
         <source>Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.</source>
         <translation>Effective Boolean Value ne peut être calculée pour une séquence contenant deux ou plus valeurs atomiques.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qderivedinteger_p.h" line="+402"/>
         <source>Value %1 of type %2 exceeds maximum (%3).</source>
         <translation>La valeur %1 de type %2 excède le maximum (%3).</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Value %1 of type %2 is below minimum (%3).</source>
         <translation>La valeur %1 de type %2 est inférieur au minimum (%3).</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/data/qhexbinary.cpp" line="+91"/>
         <source>A value of type %1 must contain an even number of digits. The value %2 does not.</source>
         <translation>Une valeur de type %1 doit contenir un nombre pair de chiffre. La valeur %2 n&apos;est pas conforme.</translation>
     </message>
     <message>
-        <location line="+19"/>
         <source>%1 is not valid as a value of type %2.</source>
         <translation>%1 n&apos;est pas une valeur valide de type %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qarithmeticexpression.cpp" line="+207"/>
         <source>Operator %1 cannot be used on type %2.</source>
         <translation>L&apos;opérateur %1 ne peut pas être utilisé pour le type %2.</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
         <translation>L&apos;opérateur %1 ne peut pas être utilisé pour des valeurs atomiques de type %2 ou %3.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qattributenamevalidator.cpp" line="+66"/>
         <source>The namespace URI in the name for a computed attribute cannot be %1.</source>
         <translation>L&apos;URI de namespace dans le nom d&apos;un attribut calculé ne peut pas être %1.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The name for a computed attribute cannot have the namespace URI %1 with the local name %2.</source>
         <translation>Le nom d&apos;un attribut calculé ne peut pas avoir l&apos;URI de namespace %1 avec le nom local %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcastas.cpp" line="+88"/>
         <source>Type error in cast, expected %1, received %2.</source>
         <translation>Erreur de type lors du cast, attendu %1 mais reçu %2.</translation>
     </message>
     <message>
-        <location line="+29"/>
         <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>En castant vers %1 ou des types dérivés, la valeur source doit être du même type ou une chaîne. Le type %2 n&apos;est pas autorisé.</translation>
     </message>
@@ -7345,12 +7018,10 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Echec en castant de %1 ver %2 : %3</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcommentconstructor.cpp" line="+67"/>
         <source>A comment cannot contain %1</source>
         <translation>Un commentaire ne peut pas contenir %1</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>A comment cannot end with a %1.</source>
         <translation>Un commentaire ne peut pas finir par %1.</translation>
     </message>
@@ -7365,27 +7036,22 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>L&apos;opérateur %1 n&apos;est pas disponible entre valeurs atomiques de type %2 et %3.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qdocumentcontentvalidator.cpp" line="+86"/>
         <source>An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.</source>
         <translation>Un noeuds attribut ne peut être un fils d&apos;un noeuds document. C&apos;est pourquoi l&apos;attribut %1 est mal placé.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qexpressionfactory.cpp" line="+169"/>
         <source>A library module cannot be evaluated directly. It must be imported from a main module.</source>
         <translation>Un module de bibliothèque ne peut pas être évalué directement. Il doit être importé d&apos;un module principal.</translation>
     </message>
     <message>
-        <location line="+40"/>
         <source>No template by name %1 exists.</source>
         <translation>Aucun template nommé %1 n&apos;existe.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qgenericpredicate.cpp" line="+106"/>
         <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>Une valeur de type %1 ne peut être un prédicat. Un prédicat doit être de type numérique ou un Effective Boolean Value.</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>A positional predicate must evaluate to a single numeric value.</source>
         <translation>Un prédicat de position doit être évalué en une unique valeur numérique.</translation>
     </message>
@@ -7395,38 +7061,30 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.</source>
         <translation>%1 n&apos;est pas un nom de destination valide dans une instruction de traitement. Ce doit être une valeur %2, par ex. %3.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qpath.cpp" line="+109"/>
         <source>The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.</source>
         <translation>La dernière étape dans un chemin doit contenir soit des noeuds soit des valeurs atomiques. Cela ne peut pas être un mélange des deux.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp" line="+84"/>
         <source>The data of a processing instruction cannot contain the string %1</source>
         <translation>Les données d&apos;une instruction de traitement ne peut contenir la chaîne %1</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qqnameconstructor.cpp" line="+82"/>
         <source>No namespace binding exists for the prefix %1</source>
         <translation>Aucun lien de namespace n&apos;existe pour le préfixe %1</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qqnameconstructor_p.h" line="+156"/>
         <source>No namespace binding exists for the prefix %1 in %2</source>
         <translation>Aucun lien de namespace n&apos;existe pour le préfixe %1 dans %2</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location filename="../src/xmlpatterns/functions/qqnamefns.cpp" line="+69"/>
         <source>%1 is an invalid %2</source>
         <translation>%1 est un ivalide %2</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/xmlpatterns/functions/qabstractfunctionfactory.cpp" line="+77"/>
         <source>%1 takes at most %n argument(s). %2 is therefore invalid.</source>
         <translation>
             <numerusform>%1 prend au maximum %n argument. %2 est donc invalide.</numerusform>
@@ -7434,7 +7092,6 @@ Veuillez choisir un nom de fichier différent.</translation>
         </translation>
     </message>
     <message numerus="yes">
-        <location line="+11"/>
         <source>%1 requires at least %n argument(s). %2 is therefore invalid.</source>
         <translation>
             <numerusform>%1 requiert au moins %n argument. %2 est donc invalide.</numerusform>
@@ -7442,22 +7099,18 @@ Veuillez choisir un nom de fichier différent.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qaggregatefns.cpp" line="+120"/>
         <source>The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.</source>
         <translation>Le premier argument de %1 ne peut être du type %2. Il doit être de type numérique, xs:yearMonthDuration ou xs:dayTimeDuration.</translation>
     </message>
     <message>
-        <location line="+74"/>
         <source>The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source>
         <translation>Le premier argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5.</translation>
     </message>
     <message>
-        <location line="+91"/>
         <source>The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source>
         <translation>Le deuxième argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qassemblestringfns.cpp" line="+88"/>
         <source>%1 is not a valid XML 1.0 character.</source>
         <translation>%1 n&apos;est pas un caractère XML 1.0 valide.</translation>
     </message>
@@ -7467,92 +7120,74 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Le premier argument de %1 ne peut être du type %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qdatetimefn.cpp" line="+86"/>
         <source>If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.</source>
         <translation>Si les deux valeurs ont des décalages de zone, elle doivent avoir le même. %1 et %2 sont différents.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qerrorfn.cpp" line="+61"/>
         <source>%1 was called.</source>
         <translation>%1 a été appelé.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternmatchingfns.cpp" line="+94"/>
         <source>%1 must be followed by %2 or %3, not at the end of the replacement string.</source>
         <translation>%1 doit être suivi par %2 ou %3, et non à la fin de la chaîne de remplacement.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>In the replacement string, %1 must be followed by at least one digit when not escaped.</source>
         <translation>Dans la chaîne de remplacement, %1 doit être suivi par au moins un chiffre s&apos;il n&apos;est pas échappé.</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>In the replacement string, %1 can only be used to escape itself or %2, not %3</source>
         <translation>Dans la chaîne de remplacement, %1 peut seulement être utilisé pour échapper lui-même ou %2 mais pas %3</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qpatternplatform.cpp" line="+92"/>
         <source>%1 matches newline characters</source>
         <translation>%1 correspond à des caractères de saut de ligne</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>%1 and %2 match the start and end of a line.</source>
         <translation>%1 et %2 correspondent au début et à la fin d&apos;une ligne.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>Matches are case insensitive</source>
         <translation>Les correspondances ne sont pas sensibles à la casse</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Whitespace characters are removed, except when they appear in character classes</source>
         <translation>Les blancs sont supprimés excepté quand ils apparaissent dans les classes de caractère</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>%1 is an invalid regular expression pattern: %2</source>
         <translation>%1 est un modèle d&apos;expression régulière invalide: %2</translation>
     </message>
     <message>
-        <location line="+30"/>
         <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
         <translation>%1 est un flag invalide pour des expressions régulières. Les flags valides sont :</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qqnamefns.cpp" line="+17"/>
         <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>Si le premier argument est une sequence vide ou un chaîne vide (sans namespace), un préfixe ne peut être spécifié. Le préfixe %1 a été spécifié.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qsequencefns.cpp" line="+347"/>
         <source>It will not be possible to retrieve %1.</source>
         <translation>Il sera impossible de récupérer %1.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qcontextnodechecker.cpp" line="+54"/>
         <source>The root node of the second argument to function %1 must be a document node. %2 is not a document node.</source>
         <translation>Le noeuds racine du deuxième argument à la fonction %1 doit être un noeuds document. %2 n&apos;est pas un document.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qsequencegeneratingfns.cpp" line="+279"/>
         <source>The default collection is undefined</source>
         <translation>I&apos;l n&apos;y a pas de collection par défaut</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>%1 cannot be retrieved</source>
         <translation>%1 ne peut pas être récupéré</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qstringvaluefns.cpp" line="+252"/>
         <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>Le forme de normalisation %1 n&apos;est pas supportée. Les formes supportées sont %2, %3, %4 et %5, et aucun, ie. une chaîne vide (pas de normalisation).</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qtimezonefns.cpp" line="+87"/>
         <source>A zone offset must be in the range %1..%2 inclusive. %3 is out of range.</source>
         <translation>Un décalage de zone doit être dans l&apos;intervalle %1..%2 inclus. %3 est hors de l&apos;intervalle.</translation>
     </message>
@@ -7561,74 +7196,59 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">%1 n&apos;est pas un nombre complet de minutes.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/janitors/qcardinalityverifier.cpp" line="+58"/>
         <source>Required cardinality is %1; got cardinality %2.</source>
         <translation>La cardinalité requise est %1; reçu %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/janitors/qitemverifier.cpp" line="+67"/>
         <source>The item %1 did not match the required type %2.</source>
         <translation>L&apos;item %1 ne correspond pas au type requis %2.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+379"/>
-        <location line="+7253"/>
         <source>%1 is an unknown schema type.</source>
         <translation>%1 est un type de schema inconnu.</translation>
     </message>
     <message>
-        <location line="-6971"/>
         <source>Only one %1 declaration can occur in the query prolog.</source>
         <translation>Seulement une déclaration %1 peut intervenir lors du prologue de la requête.</translation>
     </message>
     <message>
-        <location line="+188"/>
         <source>The initialization of variable %1 depends on itself</source>
         <translation>L&apos;initialisation de la variable %1 dépend d&apos;elle-même</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+912"/>
         <source>No variable by name %1 exists</source>
         <translation>Aucun variable nommée %1 existe</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qparsercontext.cpp" line="+93"/>
         <source>The variable %1 is unused</source>
         <translation>La variable %1 est inutilisée</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qquerytransformparser.cpp" line="+2841"/>
         <source>Version %1 is not supported. The supported XQuery version is 1.0.</source>
         <translation>La version %1 n&apos;est pas supportée. La version de XQuery supportée est 1.0.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <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>L&apos;encodage %1 est invalide. Il doit contenir uniquement des caractères latins, sans blanc et doit être conforme à l&apos;expression régulière %2.</translation>
     </message>
     <message>
-        <location line="+55"/>
         <source>No function with signature %1 is available</source>
         <translation>Aucune fonction avec la signature %1 n&apos;est disponible</translation>
     </message>
     <message>
-        <location line="+72"/>
-        <location line="+10"/>
         <source>A default namespace declaration must occur before function, variable, and option declarations.</source>
         <translation>Un déclaration de namespace par défaut doit être placée avant toute fonction, variable ou declaration d&apos;option.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Namespace declarations must occur before function, variable, and option declarations.</source>
         <translation>Les declarations de namespace doivent être placées avant tout fonction, variable ou déclaration d&apos;option.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Module imports must occur before function, variable, and option declarations.</source>
         <translation>Les imports de module doivent être placés avant tout fonction, variable ou déclaration d&apos;option.</translation>
     </message>
     <message>
-        <location line="+200"/>
         <source>It is not possible to redeclare prefix %1.</source>
         <translation>Il est impossible de redéclarer le préfixe %1.</translation>
     </message>
@@ -7637,27 +7257,22 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">Seul le préfixe %1 peut être déclaré pour lié le namespace %2. Par défaut, il est déjà lié au préfixe %1.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>Prefix %1 is already declared in the prolog.</source>
         <translation>Le préfixe %1 est déjà déclaré dans le prologue.</translation>
     </message>
     <message>
-        <location line="+95"/>
         <source>The name of an option must have a prefix. There is no default namespace for options.</source>
         <translation>Le nom d&apos;une option doit avoir un préfixe. Il n&apos;y a pas de namespace par défaut pour les options.</translation>
     </message>
     <message>
-        <location line="+171"/>
         <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
         <translation>La fonctionnalité &quot;Schema Import&quot; n&apos;est pas supportée et les déclarations %1 ne peuvent donc intervenir.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>The target namespace of a %1 cannot be empty.</source>
         <translation>Le namespace cible d&apos;un %1 ne peut être vide.</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>The module import feature is not supported</source>
         <translation>La fonctionnalité &quot;module import&quot; n&apos;est pas supportée</translation>
     </message>
@@ -7666,7 +7281,7 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">Une variable du nom %1 a déjà été déclarée dans le prologue.</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+3572"/>
         <source>No value is available for the external variable by name %1.</source>
         <translation>Aucune valeur n&apos;est disponible pour la variable externe %1.</translation>
     </message>
@@ -7685,12 +7300,11 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Un template nommé %1 a déjà été déclaré.</translation>
     </message>
     <message>
-        <location line="+3581"/>
         <source>The keyword %1 cannot occur with any other mode name.</source>
         <translation>Le mot-clé %1 ne peut pas apparaître avec un autre nom de mode.</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+3610"/>
         <source>The value of attribute %1 must of type %2, which %3 isn&apos;t.</source>
         <translation>La valeur de l&apos;attribut %1 doit être du type %2, %3 n&apos;en est pas.</translation>
     </message>
@@ -7705,172 +7319,141 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Une variable nommée %1 a déjà été déclarée.</translation>
     </message>
     <message>
-        <location line="+135"/>
         <source>A stylesheet function must have a prefixed name.</source>
         <translation>Une fonction de feuille de style doit avoir un nom préfixé.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)</source>
         <translation>Le namespace d&apos;une fonction utilisateur ne peut pas être vide (essayez le préfixe prédéfini %1 qui existe pour ce genre de cas)</translation>
     </message>
     <message>
-        <location line="+9"/>
         <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>Le namespace %1 est réservé; c&apos;est pourquoi les fonctions définies par l&apos;utilisateur ne peuvent l&apos;utiliser. Essayez le préfixe prédéfini %2 qui existe pour ces cas.</translation>
     </message>
     <message>
-        <location line="+12"/>
         <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>Le namespace d&apos;une fonction utilisateur dans un module de bibliothèque doit être équivalent au namespace du module. En d&apos;autres mots, il devrait être %1 au lieu de %2</translation>
     </message>
     <message>
-        <location line="+34"/>
         <source>A function already exists with the signature %1.</source>
         <translation>Une fonction avec la signature %1 existe déjà.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>No external functions are supported. All supported functions can be used directly, without first declaring them as external</source>
         <translation>Les fonctions externes ne sont pas supportées. Toutes les fonctions supportées peuvent êter utilisées directement sans les déclarer préalablement comme externes</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+259"/>
         <source>An argument by name %1 has already been declared. Every argument name must be unique.</source>
         <translation>Un argument nommé %1 a déjà été déclaré. Chaque nom d&apos;argument doit être unique.</translation>
     </message>
     <message>
-        <location line="+179"/>
         <source>When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.</source>
         <translation>Quand la fonction %1 est utilisée pour vérifier la correspondance dans un pattern, l&apos;argument doit être une référence de variable ou une chaîne de caractères.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.</source>
         <translation>Dans un pattern XSL-T, le premier argument à la fonction %1 doit être une chaîne de caractères quand utilisé pour correspondance.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <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>Dans un pattern XSL-T, le premier argument à la fonction %1 doit être un litéral ou une référence de variable.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>In an XSL-T pattern, function %1 cannot have a third argument.</source>
         <translation>Dans un pattern XSL-T, la fonction %1 ne peut pas avoir de 3e argument.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.</source>
         <translation>Dans un pattern XSL-T, seules les fonctions %1 et %2 (pas %3) peuvent être utilisées pour le matching.</translation>
     </message>
     <message>
-        <location line="+63"/>
         <source>In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.</source>
         <translation>Dans un pattern XSL-T, l&apos;axe %1 ne peut pas être utilisé, seulement %2 ou %3 le peuvent.</translation>
     </message>
     <message>
-        <location line="+126"/>
         <source>%1 is an invalid template mode name.</source>
         <translation>%1 est un nom de mode de template invalide.</translation>
     </message>
     <message>
-        <location line="+44"/>
         <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>Le nom d&apos;une variable liée dans un expression for doit être different de la variable positionnelle. Les deux variables appelées %1 sont en conflit.</translation>
     </message>
     <message>
-        <location line="+758"/>
         <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
         <translation>La fonctionnalité &quot;Schema Validation&quot; n&apos;est pas supportée. Les expressions %1 ne seront pas utilisées.</translation>
     </message>
     <message>
-        <location line="+39"/>
         <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
         <translation>Aucune des expressions pragma n&apos;est supportée. Une expression par défault doit être présente</translation>
     </message>
     <message>
-        <location line="+267"/>
         <source>Each name of a template parameter must be unique; %1 is duplicated.</source>
         <translation>Chaque nom d&apos;un paramètre ede template doit être unique; %1 est dupliqué.</translation>
     </message>
     <message>
-        <location line="+129"/>
         <source>The %1-axis is unsupported in XQuery</source>
         <translation>L&apos;axe %1 n&apos;est pas supporté dans XQuery</translation>
     </message>
     <message>
-        <location line="+1150"/>
         <source>%1 is not a valid name for a processing-instruction.</source>
         <translation>%1 n&apos;est pas un nom valide pour une instruction de traitement.</translation>
     </message>
     <message>
-        <location line="-7029"/>
         <source>%1 is not a valid numeric literal.</source>
         <translation>%1 n&apos;est pas une valeur numérique valide.</translation>
     </message>
     <message>
-        <location line="+6165"/>
+        <location line="+1935"/>
         <source>No function by name %1 is available.</source>
         <translation>La fonction %1 n&apos;est pas disponible.</translation>
     </message>
     <message>
-        <location line="+102"/>
         <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
         <translation>L&apos;URI de namespace ne peut être une chaîne vide quand on le lie à un préfixe, %1.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>%1 is an invalid namespace URI.</source>
         <translation>%1 est un URI de namespace invalide.</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>It is not possible to bind to the prefix %1</source>
         <translation>Il est impossible de se lier au préfixe %1</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
         <translation>Le namespace %1 peut seulement être lié à %2 (et doit être pré-déclaré).</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
         <translation>Le préfixe %1 peut seulement être lié à %2 (et doit être prédéclaré).</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>Two namespace declaration attributes have the same name: %1.</source>
         <translation>Deux attributs de déclarations de namespace ont le même nom : %1.</translation>
     </message>
     <message>
-        <location line="+89"/>
         <source>The namespace URI must be a constant and cannot use enclosed expressions.</source>
         <translation>L&apos;URI de namespace doit être une constante et ne peut contenir d&apos;expressions.</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+250"/>
         <source>An attribute by name %1 has already appeared on this element.</source>
         <translation>Un attribute nommé %1 existe déjà pour cet élément.</translation>
     </message>
     <message>
-        <location line="+61"/>
         <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
         <translation>Un constructeur direct d&apos;élément est mal-formé. %1 est terminé par %2.</translation>
     </message>
     <message>
-        <location line="+458"/>
         <source>The name %1 does not refer to any schema type.</source>
         <translation>Le nom %1 ne se réfère à aucun type de schema.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.</source>
         <translation>%1 est une type complexe. Caster vers des types complexes n&apos;est pas possible. Cependant, caster vers des types atomiques comme %2 marche.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
         <translation>%1 n&apos;est pas un type atomique. Il est uniquement possible de caster vers des types atomiques.</translation>
     </message>
@@ -7879,98 +7462,78 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">%1 n&apos;est pas un nom valide pour une instruction de traitement. C&apos;est pourquoi ce test de nom ne réussira jamais.</translation>
     </message>
     <message>
-        <location line="+145"/>
-        <location line="+71"/>
         <source>%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.</source>
         <translation>%1 n&apos;est pas dans les déclaration d&apos;attribut in-scope. La fonctionnalité d&apos;inport de schéma n&apos;est pas supportée.</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>The name of an extension expression must be in a namespace.</source>
         <translation>Le nom d&apos;une expression d&apos;extension doit être dans un namespace.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qcardinality.cpp" line="+55"/>
         <source>empty</source>
         <translation>vide</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>zero or one</source>
         <translation>zéro ou un</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>exactly one</source>
         <translation>exactement un</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>one or more</source>
         <translation>un ou plus</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>zero or more</source>
         <translation>zéro ou plus</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/type/qtypechecker.cpp" line="+63"/>
         <source>Required type is %1, but %2 was found.</source>
         <translation>Le type requis est %1, mais %2 a été reçu.</translation>
     </message>
     <message>
-        <location line="+44"/>
         <source>Promoting %1 to %2 may cause loss of precision.</source>
         <translation>La Promotion de %1 vers %2 peut causer un perte de précision.</translation>
     </message>
     <message>
-        <location line="+49"/>
         <source>The focus is undefined.</source>
         <translation>Le focus est indéfini.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/utils/qoutputvalidator.cpp" line="+86"/>
         <source>It&apos;s not possible to add attributes after any other kind of node.</source>
         <translation>Il est impossible d&apos;ajouter des attributs après un autre type de noeuds.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>An attribute by name %1 has already been created.</source>
         <translation>Un attribute de nom %1 a déjà été créé.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/utils/qxpathhelper_p.h" line="+120"/>
         <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source>
         <translation>Seule le Unicode CodepointCollation est supporté (%1), %2 n&apos;est pas supporté.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qtimezonefns.cpp" line="+12"/>
         <source>%1 is not a whole number of minutes.</source>
         <translation>%1 n&apos;est pas un nombre entier de minutes.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/api/qxmlserializer.cpp" line="+60"/>
         <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
         <translation>L&apos;attribut %1 ne peut pas être sérialisé car il apparaît à la racine.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp" line="+314"/>
         <source>%1 is an unsupported encoding.</source>
         <translation>%1 est un encodage non supporté.</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>%1 contains octets which are disallowed in the requested encoding %2.</source>
         <translation>%1 contient &apos;octets&apos;, qui n&apos;est pas autorisé pour l&apos;encodage %2.</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.</source>
         <translation>Le codepoint %1 dans %2 et utilisant l&apos;encodage %3 est un caractère XML invalide.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qapplytemplate.cpp" line="+119"/>
         <source>Ambiguous rule match.</source>
         <translation>Corresonpdance aux règles ambigüe.</translation>
     </message>
@@ -7979,22 +7542,18 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">Dans un cosntructeur de namespace, la valeur pour un namespace ne peut pas être une chaîne vide.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp" line="+69"/>
         <source>In a namespace constructor, the value for a namespace cannot be an empty string.</source>
         <translation>Dans un constructeur d&apos;espace de noms, la valeur pour un espace de noms ne peut pas être une chaîne vide.</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>The prefix must be a valid %1, which %2 is not.</source>
         <translation>Le préfixe doit être un valide %1; %2 n&apos;e l&apos;est pas.</translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>The prefix %1 cannot be bound.</source>
         <translation>Le préfixe %1 ne peut être lié.</translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>Only the prefix %1 can be bound to %2 and vice versa.</source>
         <translation>Seul le préfixe %1 peut être lié à %2, et vice versa.</translation>
     </message>
@@ -8004,72 +7563,58 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>Circularité détectée</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/expr/qtemplate.cpp" line="+145"/>
         <source>The parameter %1 is required, but no corresponding %2 is supplied.</source>
         <translation>Le paramètre %1 est requis, mais aucun %2 correspondant n&apos;est fourni.</translation>
     </message>
     <message>
-        <location line="-71"/>
         <source>The parameter %1 is passed, but no corresponding %2 exists.</source>
         <translation>Le paramètre %1 est passé mais aucun %2 correspondant n&apos;existe.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/functions/qunparsedtextfn.cpp" line="+65"/>
         <source>The URI cannot have a fragment</source>
         <translation>L&apos;URI ne peut pas avoir de fragments</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qxslttokenizer.cpp" line="+519"/>
         <source>Element %1 is not allowed at this location.</source>
         <translation>L&apos;élément %1 n&apos;est pas autorisé à cet emplacement.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Text nodes are not allowed at this location.</source>
         <translation>Les noeuds de texte ne sont pas autorisés à cet emplacement.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Parse error: %1</source>
         <translation>Erreur: %1</translation>
     </message>
     <message>
-        <location line="+62"/>
         <source>The value of the XSL-T version attribute must be a value of type %1, which %2 isn&apos;t.</source>
         <translation>La valeur de l&apos;attribut de version XSL-T doit être du type %1, et non %2.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Running an XSL-T 1.0 stylesheet with a 2.0 processor.</source>
         <translation>Lancement d&apos;une feuille de style XSL-T 1.0 avec un processeur 2.0.</translation>
     </message>
     <message>
-        <location line="+108"/>
         <source>Unknown XSL-T attribute %1.</source>
         <translation>Attribut XSL-T inconnu : %1.</translation>
     </message>
     <message>
-        <location line="+23"/>
         <source>Attribute %1 and %2 are mutually exclusive.</source>
         <translation>Les attributs %1 et %2 sont mutuellement exclusifs.</translation>
     </message>
     <message>
-        <location line="+166"/>
         <source>In a simplified stylesheet module, attribute %1 must be present.</source>
         <translation>Dans un module de feuille de style simplifié, l&apos;attribut %1 doit être présent.</translation>
     </message>
     <message>
-        <location line="+72"/>
         <source>If element %1 has no attribute %2, it cannot have attribute %3 or %4.</source>
         <translation>Si l&apos;élément %1 n&apos;a pas d&apos;attribut %2, il ne peut pas avoir d&apos;attribut %3 ou %4.</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>Element %1 must have at least one of the attributes %2 or %3.</source>
         <translation>L&apos;élement %1 doit avoir au moins un des attributs %2 ou %3.</translation>
     </message>
     <message>
-        <location line="+28"/>
         <source>At least one mode must be specified in the %1-attribute on element %2.</source>
         <translation>Au moins un mode doit être spécifié dans l&apos;attribut %1 sur l&apos;élément %2.</translation>
     </message>
@@ -8109,96 +7654,1202 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation>L&apos;élément avec le nom local %1 n&apos;existe pas dans XSL-T.</translation>
     </message>
     <message>
-        <location filename="../src/xmlpatterns/parser/qxslttokenizer.cpp" line="+123"/>
         <source>Element %1 must come last.</source>
         <translation>L&apos;élément %1 doit être le dernier.</translation>
     </message>
     <message>
-        <location line="+24"/>
         <source>At least one %1-element must occur before %2.</source>
         <translation>Au moins un élément %1 doit être placé avant %2.</translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>Only one %1-element can appear.</source>
         <translation>Seulement un élément %1 peut apparaître.</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>At least one %1-element must occur inside %2.</source>
         <translation>Au moins un élément %1 doit apparaître dans %2.</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>When attribute %1 is present on %2, a sequence constructor cannot be used.</source>
         <translation>Quand l&apos;attribut %1 est présent sur %2, un constructeur de séquence ne peut pas être utilisé.</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>Element %1 must have either a %2-attribute or a sequence constructor.</source>
         <translation>L&apos;élément %1 doit avoir un attribut %2 ou un constructeur de séquence.</translation>
     </message>
     <message>
-        <location line="+125"/>
         <source>When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.</source>
         <translation>Quand un paramètre est requis, un valeur par défault ne peut pas être fournie par un attribute %1 ou un constructeur de séquence.</translation>
     </message>
     <message>
-        <location line="+270"/>
         <source>Element %1 cannot have children.</source>
         <translation>L&apos;élément %1 ne peut pas avoir de fils.</translation>
     </message>
     <message>
-        <location line="+434"/>
         <source>Element %1 cannot have a sequence constructor.</source>
         <translation>L&apos;élément %1 ne peut pas avoir un constructuer de séquence.</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location line="+9"/>
         <source>The attribute %1 cannot appear on %2, when it is a child of %3.</source>
         <translation>L&apos;attribut %1 ne peut pas apparaître sur %2 quand il est fils de %3.</translation>
     </message>
     <message>
-        <location line="+15"/>
         <source>A parameter in a function cannot be declared to be a tunnel.</source>
         <translation>Un paramètre de fonction ne peut pas être déclaré comme un tunnel.</translation>
     </message>
     <message>
-        <location line="+149"/>
         <source>This processor is not Schema-aware and therefore %1 cannot be used.</source>
         <translation>Ce processeur ne comprend pas les Schemas. C&apos;est pourquoi %1 ne peut pas être utilisé.</translation>
     </message>
     <message>
-        <location line="+57"/>
         <source>Top level stylesheet elements must be in a non-null namespace, which %1 isn&apos;t.</source>
         <translation>Les élément d&apos;une feuille de style de haut niveau doivent être dans un namespace non nul; %1 ne l&apos;est pas.</translation>
     </message>
     <message>
-        <location line="+48"/>
         <source>The value for attribute %1 on element %2 must either be %3 or %4, not %5.</source>
         <translation>La valeur de l&apos;attribut %1 de l&apos;élement %2 doit être %3 ou %4, et pas %5.</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>Attribute %1 cannot have the value %2.</source>
         <translation>L&apos;attribut %1 ne peut avoir la valeur %2.</translation>
     </message>
     <message>
-        <location line="+58"/>
         <source>The attribute %1 can only appear on the first %2 element.</source>
         <translation>L&apos;attribute %1 peut seulement apparaître sur le premier élément %2.</translation>
     </message>
     <message>
-        <location line="+99"/>
         <source>At least one %1 element must appear as child of %2.</source>
         <translation>Au moins un élément %1 doit apparaître comme fils de %2.</translation>
     </message>
+    <message>
+        <source>A template with name %1 has already been declared.</source>
+        <translation>Un template nommé %1 a déjà été déclaré.</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>Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide.</translation>
+    </message>
+    <message>
+        <source>No variable with name %1 exists</source>
+        <translation>Aucune variable nommée %1 n&apos;existe</translation>
+    </message>
+    <message>
+        <source>The value of attribute %1 must be of type %2, which %3 isn&apos;t.</source>
+        <translation>La valeur de l&apos;attribut %1 doit être du type %2, %3 n&apos;en est pas.</translation>
+    </message>
+    <message>
+        <source>The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.</source>
+        <translation>Le préfixe %1 ne peut être lié. Par défault, il est déjà lié au namespace %2.</translation>
+    </message>
+    <message>
+        <source>A variable with name %1 has already been declared.</source>
+        <translation>Une variable nommée %1 a déjà été déclarée.</translation>
+    </message>
+    <message>
+        <source>No value is available for the external variable with name %1.</source>
+        <translation>Aucune valeur n&apos;est disponible pour la variable externe %1.</translation>
+    </message>
+    <message>
+        <source>An argument with name %1 has already been declared. Every argument name must be unique.</source>
+        <translation>Un argument nommé %1 a déjà été déclaré. Chaque nom d&apos;argument doit être unique.</translation>
+    </message>
+    <message>
+        <source>No function with name %1 is available.</source>
+        <translation>Aucune fonction nommée %1 n&apos;est disponible.</translation>
+    </message>
+    <message>
+        <source>W3C XML Schema identity constraint selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>W3C XML Schema identity constraint field</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A construct was encountered which is disallowed in the current language(%1).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An attribute with name %1 has already appeared on this element.</source>
+        <translation>Un attribute nommé %1 existe déjà pour cet élément.</translation>
+    </message>
+    <message>
+        <source>%1 has inheritance loop in its base type %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Circular inheritance of base type %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Circular inheritance of union %1.</source>
+        <translation type="unfinished"></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"></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"></translation>
+    </message>
+    <message>
+        <source>Base type of simple type %1 cannot be complex type %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple type %1 cannot have direct base type %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple type %1 is not allowed to have base type %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple type %1 can only have simple atomic type as base type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple type %1 cannot derive from %2 as the latter defines restriction as final.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Variety of item type of %1 must be either atomic or union.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Variety of member types of %1 must be atomic.</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <source>Simple type %1 is only allowed to have %2 facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base type of simple type %1 must have variety of type list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base type of simple type %1 has defined derivation by restriction as final.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item type of base type does not match item type of %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple type %1 contains not allowed facet type %2.</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <source>%1 is not allowed to have any facets.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base type %1 of simple type %2 must have variety of union.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Member type %1 cannot be derived from member type %2 of %3&apos;s base type %4.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Derivation method of %1 must be extension because the base type %2 is a simple type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 has duplicated element %2 in its content model.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 has non-deterministic content.</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <source>Content model of complex type %1 is not a valid extension of content model of %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 must have simple content.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 must have the same simple type as its base class %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 cannot be derived from base type %2%3.</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 with simple content cannot be derived from complex base type %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item type of simple type %1 cannot be a complex type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Member type of simple type %1 cannot be a complex type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is not allowed to have a member type with the same name as itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet collides with %2 facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet must have the same value as %2 facet of base type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet must be equal or greater than %2 facet of base type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet must be less than or equal to %2 facet of base type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet contains invalid regular expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown notation %1 used in %2 facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet contains invalid value %2: %3.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet cannot be %2 or %3 if %4 facet of base type is %5.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet cannot be %2 if %3 facet of base type is %4.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet must be less than or equal to %2 facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet must be less than %2 facet of base type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet and %2 facet cannot appear together.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet must be greater than %2 facet of base type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet must be less than %2 facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 facet must be greater than or equal to %2 facet of base type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple type contains not allowed facet %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only %1 and %2 facets are allowed when derived by union.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 contains %2 facet with invalid data: %3.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute group %1 contains attribute %2 twice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute group %1 contains two different attributes that both have types derived from %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 contains attribute %2 twice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 contains two different attributes that both have types derived from %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Element %1 is not allowed to have a value constraint if its base type is complex.</source>
+        <translation type="unfinished"></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"></translation>
+    </message>
+    <message>
+        <source>Value constraint of element %1 is not of elements type: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Element %1 is not allowed to have substitution group affiliation as it is no global element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type of element %1 cannot be derived from type of substitution group affiliation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value constraint of attribute %1 is not of attributes type: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute %1 has value constraint but has type derived from %2.</source>
+        <translation type="unfinished"></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"></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>%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>Empty particle cannot be derived from non-empty particle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Derived particle is missing element %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Derived element %1 is missing value constraint as defined in base particle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Derived element %1 has weaker value constraint than base particle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed value constraint of element %1 differs from value constraint in base particle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Derived element %1 cannot be nillable as base element is not nillable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block constraints of derived element %1 must not be more weaker than in the base element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple type of derived element %1 cannot be validly derived from base element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complex type of derived element %1 cannot be validly derived from base element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Element %1 is missing in derived particle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Element %1 does not match namespace constraint of wildcard in base particle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wildcard in derived particle is not a valid subset of wildcard in base particle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>processContent of wildcard in derived particle is weaker than wildcard in base particle.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Derived particle allows content that is not allowed in the base particle.</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"></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"></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"></translation>
+    </message>
+    <message>
+        <source>%1 attribute of %2 element must have a value of %3.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 attribute of %2 element must have a value of %3 or %4.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 element must not have %2 and %3 attribute together.</source>
+        <translation type="unfinished"></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"></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=&apos;prohibited&apos; inside an attribute group has no effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 element must have either %2 or %3 attribute.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 element must have either %2 attribute or %3 or %4 as child element.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 element requires either %2 or %3 attribute.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text or entity references not allowed inside %1 element</source>
+        <translation type="unfinished"></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 is not valid according to %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String content does not match the length facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String content does not match the minLength facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String content does not match the maxLength facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String content does not match pattern facet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String content is not listed in the enumeration facet.</source>
+        <translation type="unfinished"></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>Element %1 cannot contain other elements, as it has a fixed content.</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 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"></translation>
+    </message>
+    <message>
+        <source>Field %1 has no simple type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID value &apos;%1&apos; is not unique.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; attribute contains invalid QName content: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VolumeSlider</name>
     <message>
-        <location filename="../src/3rdparty/phonon/phonon/volumeslider.cpp" line="+67"/>
+        <location filename="../src/3rdparty/phonon/phonon/volumeslider.cpp" line="+184"/>
         <source>Muted</source>
         <translation>Muet</translation>
     </message>
@@ -8206,7 +8857,7 @@ Veuillez choisir un nom de fichier différent.</translation>
         <location line="+5"/>
         <location line="+15"/>
         <source>Volume: %1%</source>
-        <translation></translation>
+        <translation>Volume : %1%</translation>
     </message>
 </context>
 <context>
@@ -8264,4 +8915,655 @@ Veuillez choisir un nom de fichier différent.</translation>
         <translation type="obsolete">Défiler vers le bas</translation>
     </message>
 </context>
+<context>
+    <name>FakeReply</name>
+    <message>
+        <source>Fake error !</source>
+        <translation>Fausse erreur!</translation>
+    </message>
+    <message>
+        <source>Invalid URL</source>
+        <translation>URL non valide</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::AudioOutput</name>
+    <message>
+        <source>&lt;html&gt;The audio playback device &lt;b&gt;%1&lt;/b&gt; does not work.&lt;br/&gt;Falling back to &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</source>
+        <translation>&lt;html&gt;Le périphérique audio &lt;b&gt;%1&lt;/b&gt; ne fonctionne pas.&lt;br/&gt;Repli sur &lt;b&gt;%2&lt;/b&gt;.&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;Switching to the audio playback device &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;which just became available and has higher preference.&lt;/html&gt;</source>
+        <translation>&lt;html&gt;Basculement vers le périphérique audio &lt;b&gt;%1&lt;/b&gt;&lt;br/&gt;qui vient juste d&apos;être disponible et dont le niveau de préférence est plus élevé.&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Revert back to device &apos;%1&apos;</source>
+        <translation>Revenir au périphérique &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF</name>
+    <message>
+        <source>Audio Output</source>
+        <translation>Sortie audio</translation>
+    </message>
+    <message>
+        <source>The audio output device</source>
+        <translation>Périphérique audio de sortie</translation>
+    </message>
+    <message>
+        <source>No error</source>
+        <translation>Aucune erreur</translation>
+    </message>
+    <message>
+        <source>Not found</source>
+        <translation>Introuvable</translation>
+    </message>
+    <message>
+        <source>Out of memory</source>
+        <translation>Mémoire insuffisante</translation>
+    </message>
+    <message>
+        <source>Not supported</source>
+        <translation>Non supporté</translation>
+    </message>
+    <message>
+        <source>Overflow</source>
+        <translation>Dépassement</translation>
+    </message>
+    <message>
+        <source>Underflow</source>
+        <translation>Soupassement</translation>
+    </message>
+    <message>
+        <source>Already exists</source>
+        <translation>Existe déjà</translation>
+    </message>
+    <message>
+        <source>Path not found</source>
+        <translation>Chemin introuvable</translation>
+    </message>
+    <message>
+        <source>In use</source>
+        <translation>Utilisé</translation>
+    </message>
+    <message>
+        <source>Not ready</source>
+        <translation>Pas prêt</translation>
+    </message>
+    <message>
+        <source>Access denied</source>
+        <translation>Accès refusé</translation>
+    </message>
+    <message>
+        <source>Could not connect</source>
+        <translation>Connexion impossible</translation>
+    </message>
+    <message>
+        <source>Disconnected</source>
+        <translation>Déconnecté</translation>
+    </message>
+    <message>
+        <source>Permission denied</source>
+        <translation>Autorisation refusée</translation>
+    </message>
+    <message>
+        <source>Insufficient bandwidth</source>
+        <translation>Bande passante insuffisante</translation>
+    </message>
+    <message>
+        <source>Network unavailable</source>
+        <translation>Réseau non disponible</translation>
+    </message>
+    <message>
+        <source>Network communication error</source>
+        <translation>Erreur de communication réseau</translation>
+    </message>
+    <message>
+        <source>Streaming not supported</source>
+        <translation>Streaming non supporté</translation>
+    </message>
+    <message>
+        <source>Server alert</source>
+        <translation>Alerte serveur</translation>
+    </message>
+    <message>
+        <source>Invalid protocol</source>
+        <translation>Protocole non valide</translation>
+    </message>
+    <message>
+        <source>Invalid URL</source>
+        <translation>URL non valide</translation>
+    </message>
+    <message>
+        <source>Multicast error</source>
+        <translation>Erreur multicast</translation>
+    </message>
+    <message>
+        <source>Proxy server error</source>
+        <translation>Erreur du serveur proxy</translation>
+    </message>
+    <message>
+        <source>Proxy server not supported</source>
+        <translation>Serveur proxy non supporté</translation>
+    </message>
+    <message>
+        <source>Audio output error</source>
+        <translation>Erreur de sortie audio</translation>
+    </message>
+    <message>
+        <source>Video output error</source>
+        <translation>Erreur de sortie vidéo</translation>
+    </message>
+    <message>
+        <source>Decoder error</source>
+        <translation>Erreur du décodeur</translation>
+    </message>
+    <message>
+        <source>Audio or video components could not be played</source>
+        <translation>Les composants audio ou vidéo n&apos;ont pas pu être lus</translation>
+    </message>
+    <message>
+        <source>DRM error</source>
+        <translation>Erreur GDN</translation>
+    </message>
+    <message>
+        <source>Unknown error (%1)</source>
+        <translation>Erreur inconnue (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::AbstractMediaPlayer</name>
+    <message>
+        <source>Not ready to play</source>
+        <translation>Pas prêt pour lecture</translation>
+    </message>
+    <message>
+        <source>Error opening file</source>
+        <translation>Erreur lors de l&apos;ouverture du fichier</translation>
+    </message>
+    <message>
+        <source>Error opening URL</source>
+        <translation>Erreur lors de l&apos;ouverture de l&apos;URL</translation>
+    </message>
+    <message>
+        <source>Setting volume failed</source>
+        <translation>Le réglage du volume a échoué</translation>
+    </message>
+    <message>
+        <source>Playback complete</source>
+        <translation>Lecture terminée</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>L&apos;obtention de la position a échoué</translation>
+    </message>
+    <message>
+        <source>Opening clip failed</source>
+        <translation>L&apos;ouverture du clip a échoué</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::EffectFactory</name>
+    <message>
+        <source>Enabled</source>
+        <translation>Activé</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::EnvironmentalReverb</name>
+    <message>
+        <source>Decay HF ratio (%)</source>
+        <translation>Ratio HF du déclin (%)</translation>
+    </message>
+    <message>
+        <source>Decay time (ms)</source>
+        <translation>Temps de déclin (ms)</translation>
+    </message>
+    <message>
+        <source>Density (%)</source>
+        <translation>Densité (%)</translation>
+    </message>
+    <message>
+        <source>Diffusion (%)</source>
+        <translation>Diffusion (%)</translation>
+    </message>
+    <message>
+        <source>Reflections delay (ms)</source>
+        <translation>Délai réflexions (ms)</translation>
+    </message>
+    <message>
+        <source>Reflections level (mB)</source>
+        <translation>Niveau réflexions (mB)</translation>
+    </message>
+    <message>
+        <source>Reverb delay (ms)</source>
+        <translation>Délai de réverbération (ms)</translation>
+    </message>
+    <message>
+        <source>Reverb level (mB)</source>
+        <translation>Niveau de réverbération (mB)</translation>
+    </message>
+    <message>
+        <source>Room HF level</source>
+        <translation>Niveau HF pièce</translation>
+    </message>
+    <message>
+        <source>Room level (mB)</source>
+        <translation>Niveau pièce (mB)</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::MediaObject</name>
+    <message>
+        <source>Error opening source: type not supported</source>
+        <translation>Erreur lors de l&apos;ouverture de la source: type non supporté</translation>
+    </message>
+    <message>
+        <source>Error opening source: media type could not be determined</source>
+        <translation>Erreur lors de l&apos;ouverture de la source: type de média non déterminé</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::StereoWidening</name>
+    <message>
+        <source>Level (%)</source>
+        <translation>Niveau (%)</translation>
+    </message>
+</context>
+<context>
+    <name>Phonon::MMF::VideoPlayer</name>
+    <message>
+        <source>Pause failed</source>
+        <translation>La mise en pause a échoué</translation>
+    </message>
+    <message>
+        <source>Seek failed</source>
+        <translation>La recherche a échoué</translation>
+    </message>
+    <message>
+        <source>Getting position failed</source>
+        <translation>L&apos;obtention de la position a échoué</translation>
+    </message>
+    <message>
+        <source>Opening clip failed</source>
+        <translation>L&apos;ouverture du clip a échoué</translation>
+    </message>
+    <message>
+        <source>Buffering clip failed</source>
+        <translation>La mise en mémoire tampon du clip a échoué</translation>
+    </message>
+    <message>
+        <source>Video display error</source>
+        <translation>Erreur de l&apos;affichage vidéo</translation>
+    </message>
+</context>
+<context>
+    <name>QAccessibleButton</name>
+    <message>
+        <source>Press</source>
+        <translation>Appuyer</translation>
+    </message>
+</context>
+<context>
+    <name>QNetworkAccessDebugPipeBackend</name>
+    <message>
+        <source>Write error writing to %1: %2</source>
+        <translation>Erreur lors de l&apos;écriture dans %1: %2</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptBreakpointsModel</name>
+    <message>
+        <source>ID</source>
+        <translation>Identifiant</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Lieu</translation>
+    </message>
+    <message>
+        <source>Condition</source>
+        <translation>Condition</translation>
+    </message>
+    <message>
+        <source>Ignore-count</source>
+        <translation>Comptes d&apos;ignorés</translation>
+    </message>
+    <message>
+        <source>Single-shot</source>
+        <translation>Un seul tir</translation>
+    </message>
+    <message>
+        <source>Hit-count</source>
+        <translation>Compte de coups</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptBreakpointsWidget</name>
+    <message>
+        <source>New</source>
+        <translation>Créer</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptDebugger</name>
+    <message>
+        <source>Go to Line</source>
+        <translation>Aller à la ligne</translation>
+    </message>
+    <message>
+        <source>Line:</source>
+        <translation>Ligne:</translation>
+    </message>
+    <message>
+        <source>Interrupt</source>
+        <translation>Interrompre</translation>
+    </message>
+    <message>
+        <source>Shift+F5</source>
+        <translation>Shift+F5</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation>Continuer</translation>
+    </message>
+    <message>
+        <source>F5</source>
+        <translation>F5</translation>
+    </message>
+    <message>
+        <source>Step Into</source>
+        <translation>Pas à pas détaillé</translation>
+    </message>
+    <message>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <source>Step Over</source>
+        <translation>Pas à pas principal</translation>
+    </message>
+    <message>
+        <source>F10</source>
+        <translation>F10</translation>
+    </message>
+    <message>
+        <source>Step Out</source>
+        <translation>Pas à pas sortant</translation>
+    </message>
+    <message>
+        <source>Shift+F11</source>
+        <translation>Shift+F11</translation>
+    </message>
+    <message>
+        <source>Run to Cursor</source>
+        <translation>Exécuter au curseur</translation>
+    </message>
+    <message>
+        <source>Ctrl+F10</source>
+        <translation>Ctrl+F10</translation>
+    </message>
+    <message>
+        <source>Run to New Script</source>
+        <translation>Exécuter au nouveau script</translation>
+    </message>
+    <message>
+        <source>Toggle Breakpoint</source>
+        <translation>Basculer le point d&apos;arrêt</translation>
+    </message>
+    <message>
+        <source>F9</source>
+        <translation>F9</translation>
+    </message>
+    <message>
+        <source>Clear Debug Output</source>
+        <translation>Effacer les résultats du débogage</translation>
+    </message>
+    <message>
+        <source>Clear Error Log</source>
+        <translation>Effacer le journal d&apos;erreurs</translation>
+    </message>
+    <message>
+        <source>Clear Console</source>
+        <translation>Effacer la console</translation>
+    </message>
+    <message>
+        <source>&amp;Find in Script...</source>
+        <translation>&amp;Chercher dans le script...</translation>
+    </message>
+    <message>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <source>Find &amp;Next</source>
+        <translation>Résultat &amp;suivant</translation>
+    </message>
+    <message>
+        <source>F3</source>
+        <translation>F3</translation>
+    </message>
+    <message>
+        <source>Find &amp;Previous</source>
+        <translation>Chercher &amp;précédent</translation>
+    </message>
+    <message>
+        <source>Shift+F3</source>
+        <translation>Shift+F3</translation>
+    </message>
+    <message>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation>Déboguer</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptDebuggerCodeFinderWidget</name>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation>Précédent</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Suivant</translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation>Sensible à la casse</translation>
+    </message>
+    <message>
+        <source>Whole words</source>
+        <translation>Mots entiers</translation>
+    </message>
+    <message>
+        <source>&lt;img src=&quot;:/qt/scripttools/debugging/images/wrap.png&quot;&gt;&amp;nbsp;Search wrapped</source>
+        <translation>&lt;img src=&quot;:/qt/scripttools/debugging/images/wrap.png&quot;&gt;&amp;nbsp;La recherche est revenue au début</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptDebuggerLocalsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation>Valeur</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptDebuggerStackModel</name>
+    <message>
+        <source>Level</source>
+        <translation>Niveau</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Lieu</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptEdit</name>
+    <message>
+        <source>Toggle Breakpoint</source>
+        <translation>Basculer le point d&apos;arrêt</translation>
+    </message>
+    <message>
+        <source>Disable Breakpoint</source>
+        <translation>Désactiver le point d&apos;arrêt</translation>
+    </message>
+    <message>
+        <source>Enable Breakpoint</source>
+        <translation>Activer le point d&apos;arrêt</translation>
+    </message>
+    <message>
+        <source>Breakpoint Condition:</source>
+        <translation>Condition du point d&apos;arrêt:</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptEngineDebugger</name>
+    <message>
+        <source>Loaded Scripts</source>
+        <translation>Scripts chargés</translation>
+    </message>
+    <message>
+        <source>Breakpoints</source>
+        <translation>Points d&apos;arrêt</translation>
+    </message>
+    <message>
+        <source>Stack</source>
+        <translation>Empiler</translation>
+    </message>
+    <message>
+        <source>Locals</source>
+        <translation>Locaux</translation>
+    </message>
+    <message>
+        <source>Console</source>
+        <translation>Console</translation>
+    </message>
+    <message>
+        <source>Debug Output</source>
+        <translation>Résultats du débogage</translation>
+    </message>
+    <message>
+        <source>Error Log</source>
+        <translation>Journal d&apos;erreurs</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Chercher</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Afficher</translation>
+    </message>
+    <message>
+        <source>Qt Script Debugger</source>
+        <translation>Débogueur de script Qt</translation>
+    </message>
+</context>
+<context>
+    <name>QScriptNewBreakpointWidget</name>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>QSoftKeyManager</name>
+    <message>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation>Sélectionner</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Terminer</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>Exit</source>
+        <translation>Quitter</translation>
+    </message>
+</context>
+<context>
+    <name>QStateMachine</name>
+    <message>
+        <source>Missing initial state in compound state &apos;%1&apos;</source>
+        <translation>État initial manquant dans l&apos;état composé &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Missing default state in history state &apos;%1&apos;</source>
+        <translation>État par défaut manquant dans l&apos;état de l&apos;historique &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>No common ancestor for targets and source of transition from state &apos;%1&apos;</source>
+        <translation>Aucun ancêtre commun pour les cibles et la source de transition de l&apos;état &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Erreur inconnue</translation>
+    </message>
+</context>
+<context>
+    <name>QXmlPatternistCLI</name>
+    <message>
+        <source>Warning in %1, at line %2, column %3: %4</source>
+        <translation>Avertissement dans %1, à la ligne %2, colonne %3: %4</translation>
+    </message>
+    <message>
+        <source>Warning in %1: %2</source>
+        <translation>Avertissement dans %1: %2</translation>
+    </message>
+    <message>
+        <source>Unknown location</source>
+        <translation>Lieu inconnu</translation>
+    </message>
+    <message>
+        <source>Error %1 in %2, at line %3, column %4: %5</source>
+        <translation>Erreur %1 dans %2, à la ligne %3, colonne %4: %5</translation>
+    </message>
+    <message>
+        <source>Error %1 in %2: %3</source>
+        <translation>Erreur %1 dans %2: %3</translation>
+    </message>
+</context>
 </TS>
diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts
index ef5e9a2..a089cb6 100644
--- a/translations/qt_pl.ts
+++ b/translations/qt_pl.ts
@@ -4,7 +4,7 @@
 <context>
     <name>CloseButton</name>
     <message>
-        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2266"/>
+        <location filename="../src/gui/widgets/qtabbar.cpp" line="+2274"/>
         <source>Close Tab</source>
         <translation>Zamknij kartę</translation>
     </message>
@@ -156,7 +156,7 @@ zainstalowałeś libgstreamer-plugins-base.</translation>
     <message>
         <location line="+2"/>
         <source>Plugin codec installation failed for codec: %0</source>
-        <translation type="unfinished"></translation>
+        <translation>Błąd podczas instalacji wtyczki dla kodeka: %0</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -1616,7 +1616,7 @@ na
 <context>
     <name>QDeclarativeAnchorAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+2540"/>
+        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+2542"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Nie można ustawić ujemnego czasu trwania</translation>
     </message>
@@ -1700,7 +1700,7 @@ na
 <context>
     <name>QDeclarativeBehavior</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativebehavior.cpp" line="+122"/>
+        <location filename="../src/declarative/util/qdeclarativebehavior.cpp" line="+124"/>
         <source>Cannot change the animation assigned to a Behavior.</source>
         <translation>Nie można zmienić animacji przypisanej do &quot;Zachowania&quot;.</translation>
     </message>
@@ -1821,17 +1821,17 @@ na
     <message>
         <location line="+271"/>
         <source>Element is not creatable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można utworzyć elementu (&quot;creatable&quot; wyłączone).</translation>
     </message>
     <message>
         <location line="+592"/>
         <source>Component elements may not contain properties other than id</source>
-        <translation type="unfinished"></translation>
+        <translation>Elementy komponentu nie mogą posiadać właściwości innych niż &quot;id&quot;</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Invalid component id specification</source>
-        <translation>Niepoprawna specyfikacja &quot;id&quot; componentu</translation>
+        <translation>Niepoprawna specyfikacja &quot;id&quot; komponentu</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1842,70 +1842,70 @@ na
     <message>
         <location line="-467"/>
         <source>Invalid component body specification</source>
-        <translation type="unfinished"></translation>
+        <translation>Niepoprawna specyfikacja &quot;body&quot; komponentu</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Component objects cannot declare new properties.</source>
-        <translation type="unfinished"></translation>
+        <translation>Instancje komponentu nie mogą deklarować nowych właściwości.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Component objects cannot declare new signals.</source>
-        <translation type="unfinished"></translation>
+        <translation>Instancje komponentu nie mogą deklarować nowych sygnałów.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Component objects cannot declare new functions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Instancje komponentu nie mogą deklarować nowych funkcji.</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cannot create empty component specification</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można utworzyć pustej specyfikacji komponentu</translation>
     </message>
     <message>
         <location line="+89"/>
         <source>Incorrectly specified signal assignment</source>
-        <translation type="unfinished"></translation>
+        <translation>Przypisanie sygnału błędnie podane</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Empty signal assignment</source>
-        <translation type="unfinished"></translation>
+        <translation>Przypisanie pustego sygnału</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Empty property assignment</source>
-        <translation type="unfinished"></translation>
+        <translation>Przypisanie pustej właściwości</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Attached properties cannot be used here</source>
-        <translation type="unfinished"></translation>
+        <translation>Dołączone właściwości nie mogą być tutaj użyte</translation>
     </message>
     <message>
         <location line="+15"/>
         <location line="+104"/>
         <source>Non-existent attached object</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieistniejący dołączony obiekt</translation>
     </message>
     <message>
         <location line="-100"/>
         <location line="+103"/>
         <source>Invalid attached object assignment</source>
-        <translation type="unfinished"></translation>
+        <translation>Niepoprawne przypisanie dołączonego obiektu</translation>
     </message>
     <message>
         <location line="-50"/>
         <source>Cannot assign to non-existent default property</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można przypisać wartości do nieistniejącej domyślnej właściwości</translation>
     </message>
     <message>
         <location line="+2"/>
         <location line="+355"/>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można przypisać wartości do nieistniejącej właściwości &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="-324"/>
@@ -1915,7 +1915,7 @@ na
     <message>
         <location line="+5"/>
         <source>Not an attached property name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie jest to nazwa dołączonej właściwości</translation>
     </message>
     <message>
         <location line="+183"/>
@@ -1926,18 +1926,18 @@ na
         <location line="+89"/>
         <location line="+2"/>
         <source>Property has already been assigned a value</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartość została już przypisana do właściwości</translation>
     </message>
     <message>
         <location line="+12"/>
         <location line="+8"/>
         <source>Invalid grouped property access</source>
-        <translation type="unfinished"></translation>
+        <translation>Błędny dostęp do zgrupowanej właściwości</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cannot assign a value directly to a grouped property</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można bezpośrednio przypisać wartości do zgrupowanej właściwości</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -1967,22 +1967,22 @@ na
     <message>
         <location line="+6"/>
         <source>Can only assign one binding to lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Tylko jedno powiązanie może być przypisane do listy</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Cannot assign primitives to lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można przypisać elementu do listy</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Cannot assign multiple values to a script property</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można przypisać wielu wartości do skryptowej właściwości</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Invalid property assignment: script expected</source>
-        <translation type="unfinished"></translation>
+        <translation>Niepoprawne przypisanie wartości: oczekiwano skryptu</translation>
     </message>
     <message>
         <location line="+106"/>
@@ -1992,7 +1992,7 @@ na
     <message>
         <location line="+50"/>
         <source>&quot;%1&quot; cannot operate on &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; nie może operować na &quot;%2&quot;</translation>
     </message>
     <message>
         <location line="+117"/>
@@ -2100,7 +2100,7 @@ na
 <context>
     <name>QDeclarativeComponent</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativecomponent.cpp" line="+454"/>
+        <location filename="../src/declarative/qml/qdeclarativecomponent.cpp" line="+508"/>
         <source>Invalid empty URL</source>
         <translation>Niepoprawny pusty URL</translation>
     </message>
@@ -2109,22 +2109,22 @@ na
     <name>QDeclarativeCompositeTypeManager</name>
     <message>
         <location filename="../src/declarative/qml/qdeclarativecompositetypemanager.cpp" line="+482"/>
-        <location line="+268"/>
+        <location line="+270"/>
         <source>Resource %1 unavailable</source>
         <translation>Zasób %1 nie jest dostępny</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-120"/>
         <source>Namespace %1 cannot be used as a type</source>
         <translation>Przestrzeń nazw %1 nie może być użyta jako typ</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>%1 is not a type</source>
-        <translation>%1 nie jest typem</translation>
+        <source>%1 %2</source>
+        <translation>%1 %2</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>Type %1 unavailable</source>
         <translation>Typ %1 nie jest dostępny</translation>
     </message>
@@ -2132,7 +2132,7 @@ na
 <context>
     <name>QDeclarativeConnections</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeconnections.cpp" line="+178"/>
+        <location filename="../src/declarative/util/qdeclarativeconnections.cpp" line="+180"/>
         <location line="+54"/>
         <location line="+7"/>
         <source>Cannot assign to non-existent property &quot;%1&quot;</source>
@@ -2157,7 +2157,33 @@ na
 <context>
     <name>QDeclarativeEngine</name>
     <message>
-        <location filename="../src/declarative/qml/qdeclarativeengine.cpp" line="+1633"/>
+        <location filename="../src/declarative/qml/qdeclarativeengine.cpp" line="+1636"/>
+        <location line="+4"/>
+        <source>local directory</source>
+        <translation>lokalny katalog</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>is ambiguous. Found in %1 and in %2</source>
+        <translation>jest niejednoznaczny. Znaleziono w %1 i w %2</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>is ambiguous. Found in %1 in version %2.%3 and %4.%5</source>
+        <translation>jest niejednoznaczny. Znaleziono w %1 w wersji %2.%3 i %4.%5</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>is instantiated recursively</source>
+        <translation>jest zinstancjonowany rekurencyjnie</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>is not a type</source>
+        <translation>nie jest typem</translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>module &quot;%1&quot; definition &quot;%2&quot; not readable</source>
         <translation>definicja &quot;%2&quot; modułu &quot;%1&quot; nie może zostać odczytana</translation>
     </message>
@@ -2194,6 +2220,16 @@ na
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+46"/>
+        <source>- %1 is not a namespace</source>
+        <translation>- %1 nie jest przestrzenią nazw</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>- nested namespaces not allowed</source>
+        <translation>- zagnieżdżone przestrzenie nazw nie są dozwolone</translation>
+    </message>
+    <message>
         <location filename="../src/declarative/qml/qdeclarativesqldatabase.cpp" line="+204"/>
         <source>executeSql called outside transaction()</source>
         <translation>&quot;executeSql&quot; zawołane na zewnątrz &quot;transation()&quot;</translation>
@@ -2222,7 +2258,7 @@ na
         <location line="+57"/>
         <location line="+16"/>
         <source>SQL: database version mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>SQL: niezgodność wersji bazy danych</translation>
     </message>
 </context>
 <context>
@@ -2243,7 +2279,7 @@ na
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp" line="+62"/>
         <source>KeyNavigation is only available via attached properties</source>
-        <translation>&quot;KeyNavigation&quot; jest dostępny jedynie poprzez właściwości dołączone</translation>
+        <translation>&quot;KeyNavigation&quot; jest dostępny jedynie poprzez dołączone właściwości</translation>
     </message>
 </context>
 <context>
@@ -2251,7 +2287,7 @@ na
     <message>
         <location line="+1"/>
         <source>Keys is only available via attached properties</source>
-        <translation>&quot;Keys&quot; jest dostępny jedynie poprzez właściwości dołączone</translation>
+        <translation>&quot;Keys&quot; jest dostępny jedynie poprzez dołączone właściwości</translation>
     </message>
 </context>
 <context>
@@ -2324,7 +2360,7 @@ na
     <message>
         <location filename="../src/declarative/graphicsitems/qdeclarativeloader.cpp" line="+317"/>
         <source>Loader does not support loading non-visual elements.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ładowanie elementów niewizualnych nie jest obsługiwane.</translation>
     </message>
 </context>
 <context>
@@ -2397,22 +2433,22 @@ na
     <message>
         <location line="+102"/>
         <source>Illegal syntax for exponential number</source>
-        <translation type="unfinished"></translation>
+        <translation>Niepoprawna składnia liczby o postaci wykładniczej</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Identifier cannot start with numeric literal</source>
-        <translation type="unfinished"></translation>
+        <translation>Identyfikator nie może rozpoczynać się stałą liczbową</translation>
     </message>
     <message>
         <location line="+338"/>
         <source>Unterminated regular expression literal</source>
-        <translation type="unfinished"></translation>
+        <translation>Niedokończone wyrażenie regularne</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Invalid regular expression flag &apos;%0&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Niepoprawna flaga &quot;%0&quot; w wyrażeniu regularnym</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -2423,7 +2459,7 @@ na
     <message>
         <location line="+13"/>
         <source>Unterminated regular expression class</source>
-        <translation type="unfinished"></translation>
+        <translation>Niedokończona klasa wyrażenia regularnego</translation>
     </message>
     <message>
         <location filename="../src/declarative/qml/parser/qdeclarativejsparser.cpp" line="+1828"/>
@@ -2440,19 +2476,19 @@ na
         <location line="+28"/>
         <location line="+24"/>
         <source>Expected token `%1&apos;</source>
-        <translation>Oczekiwano znaku &quot;%1&quot;</translation>
+        <translation>Oczekiwany znak &quot;%1&quot;</translation>
     </message>
     <message>
         <location filename="../src/declarative/qml/qdeclarativescriptparser.cpp" line="+264"/>
-        <location line="+456"/>
+        <location line="+464"/>
         <location line="+59"/>
         <source>Property value set multiple times</source>
         <translation>Wartość właściwości ustawiona wielokrotnie</translation>
     </message>
     <message>
-        <location line="-504"/>
+        <location line="-512"/>
         <source>Expected type name</source>
-        <translation>Oczekiwano nazwy typu</translation>
+        <translation>Oczekiwana nazwa typu</translation>
     </message>
     <message>
         <location line="+171"/>
@@ -2460,55 +2496,60 @@ na
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+8"/>
+        <source>Reserved name &quot;Qt&quot; cannot be used as an qualifier</source>
+        <translation>&quot;Qt&quot; jest nazwą zarezerwowaną i nie może być użyta jako kwalifikator</translation>
+    </message>
+    <message>
         <location line="+15"/>
         <source>Script import qualifiers must be unique.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kwalifikator importu skryptu musi być unikatowy.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Script import requires a qualifier</source>
-        <translation type="unfinished"></translation>
+        <translation>Import skryptu wymaga użycia kwalifikatora</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Library import requires a version</source>
-        <translation type="unfinished"></translation>
+        <translation>Import biblioteki wymaga podania wersji</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Expected parameter type</source>
-        <translation type="unfinished"></translation>
+        <translation>Oczekiwany typ parametru</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Invalid property type modifier</source>
-        <translation type="unfinished"></translation>
+        <translation>Niepoprawny modyfikator typu właściwości</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Unexpected property type modifier</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieoczekiwany modyfikator typu właściwości</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Expected property type</source>
-        <translation type="unfinished"></translation>
+        <translation>Oczekiwany typ właściwości</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Readonly not yet supported</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;Tylko do odczytu&quot; nie jest jeszcze obsługiwane</translation>
     </message>
     <message>
         <location line="+213"/>
         <source>JavaScript declaration outside Script element</source>
-        <translation type="unfinished"></translation>
+        <translation>Deklaracja &quot;JavaScript&quot; na zewnątrz elementu &quot;Script&quot;</translation>
     </message>
 </context>
 <context>
     <name>QDeclarativePauseAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="-1973"/>
+        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="-1975"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Nie można ustawić ujemnego czasu trwania</translation>
     </message>
@@ -2540,7 +2581,7 @@ na
 <context>
     <name>QDeclarativePropertyAnimation</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+1100"/>
+        <location filename="../src/declarative/util/qdeclarativeanimation.cpp" line="+1102"/>
         <source>Cannot set a duration of &lt; 0</source>
         <translation>Nie można ustawić ujemnego czasu trwania</translation>
     </message>
@@ -2548,7 +2589,7 @@ na
 <context>
     <name>QDeclarativePropertyChanges</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativepropertychanges.cpp" line="+231"/>
+        <location filename="../src/declarative/util/qdeclarativepropertychanges.cpp" line="+232"/>
         <source>PropertyChanges does not support creating state-specific objects.</source>
         <translation>&quot;PropertyChanges&quot; nie obsługuje tworzenia obiektów charakterystycznych dla stanów.</translation>
     </message>
@@ -2566,7 +2607,7 @@ na
 <context>
     <name>QDeclarativeTextInput</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativetextinput.cpp" line="+783"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativetextinput.cpp" line="+793"/>
         <location line="+8"/>
         <source>Could not load cursor delegate</source>
         <translation type="unfinished"></translation>
@@ -2597,7 +2638,7 @@ na
     <message>
         <location line="+3"/>
         <source>Cannot connect mismatched signal/slot %1 %vs. %2</source>
-        <translation>Nie można podłączyć niepasujących sygnałów / slotów (%1 i %2)</translation>
+        <translation>Nie można podłączyć niezgodnych sygnałów / slotów (%1 i %2)</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2622,13 +2663,13 @@ na
     <message>
         <location line="+32"/>
         <source>Cannot set properties on %1 as it is null</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można ustawić właściwości dla %1 ponieważ jest on zerowy</translation>
     </message>
 </context>
 <context>
     <name>QDeclarativeVisualDataModel</name>
     <message>
-        <location filename="../src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp" line="+1061"/>
+        <location filename="../src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp" line="+1070"/>
         <source>Delegate component must be Item type.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2653,7 +2694,7 @@ na
 <context>
     <name>QDeclarativeXmlRoleList</name>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+638"/>
+        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="+642"/>
         <source>An XmlListModel query must start with &apos;/&apos; or &quot;//&quot;</source>
         <translation>Zapytanie XmlListModel nie może rozpoczynać się od &quot;/&quot; ani od &quot;//&quot;</translation>
     </message>
@@ -2679,7 +2720,7 @@ na
 <context>
     <name>QDialog</name>
     <message>
-        <location filename="../src/gui/dialogs/qdialog.cpp" line="+647"/>
+        <location filename="../src/gui/dialogs/qdialog.cpp" line="+645"/>
         <source>What&apos;s This?</source>
         <translation>Co to jest?</translation>
     </message>
@@ -3857,7 +3898,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <location line="+747"/>
         <location filename="../src/qt3support/network/q3http.cpp" line="+441"/>
         <source>Server closed connection unexpectedly</source>
-        <translation>Serwer niespodziewanie zakończył połączenie</translation>
+        <translation>Serwer nieoczekiwanie zakończył połączenie</translation>
     </message>
     <message>
         <location line="-999"/>
@@ -4174,7 +4215,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
     <message>
         <location line="-6"/>
         <source>Plugin verification data mismatch in &apos;%1&apos;</source>
-        <translation>Błąd podczas weryfikacji danych we wtyczce &apos;%1&apos;</translation>
+        <translation>Niezgodność podczas weryfikacji danych we wtyczce &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+381"/>
@@ -4553,7 +4594,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMediaPlayer</name>
     <message>
-        <location filename="../src/multimedia/playback/qmediaplayer.cpp" line="+496"/>
+        <location filename="../src/multimedia/mediaservices/playback/qmediaplayer.cpp" line="+496"/>
         <source>The QMediaPlayer object does not have a valid service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4561,7 +4602,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
 <context>
     <name>QMediaPlaylist</name>
     <message>
-        <location filename="../src/multimedia/base/qmediaplaylist.cpp" line="+455"/>
+        <location filename="../src/multimedia/mediaservices/base/qmediaplaylist.cpp" line="+455"/>
         <location line="+46"/>
         <source>Could not add items to read only playlist.</source>
         <translation>Nie można dodać elementów do listy odtwarzania (tylko do odczytu).</translation>
@@ -4937,7 +4978,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
     <message>
         <location line="+192"/>
         <source>Network session error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Błąd sesji sieciowej.</translation>
     </message>
     <message>
         <location line="+329"/>
@@ -5178,7 +5219,7 @@ Proszę o sprawdzenie podanej nazwy pliku.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-194"/>
+        <location filename="../src/declarative/util/qdeclarativexmllistmodel.cpp" line="-196"/>
         <source>&quot;%1&quot; duplicates a previous role name and will be disabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6852,7 +6893,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QShortcut</name>
     <message>
-        <location filename="../src/gui/kernel/qkeysequence.cpp" line="+1312"/>
+        <location filename="../src/gui/kernel/qkeysequence.cpp" line="+1315"/>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -7375,152 +7416,152 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+7"/>
         <source>Kanji</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanji</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Muhenkan</source>
-        <translation type="unfinished"></translation>
+        <translation>Muhenkan</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Henkan</source>
-        <translation type="unfinished"></translation>
+        <translation>Henkan</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Romaji</source>
-        <translation type="unfinished"></translation>
+        <translation>Romaji</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hiragana</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiragana</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Katakana</source>
-        <translation type="unfinished"></translation>
+        <translation>Katakana</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hiragana Katakana</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiragana Katakana</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zenkaku</source>
-        <translation type="unfinished"></translation>
+        <translation>Zenkaku</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hankaku</source>
-        <translation type="unfinished"></translation>
+        <translation>Hankaku</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Zenkaku Hankaku</source>
-        <translation type="unfinished"></translation>
+        <translation>Zenkaku Hankaku</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Touroku</source>
-        <translation type="unfinished"></translation>
+        <translation>Touroku</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Massyo</source>
-        <translation type="unfinished"></translation>
+        <translation>Massyo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Kana Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Kana Lock</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Kana Shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Kana Shift</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Eisu Shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Eisu Shift</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Eisu toggle</source>
-        <translation type="unfinished"></translation>
+        <translation>Eisu toggle</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Code input</source>
-        <translation type="unfinished"></translation>
+        <translation>Wprowadzanie kodu</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Multiple Candidate</source>
-        <translation type="unfinished"></translation>
+        <translation>Kandydat wielokrotny</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Previous Candidate</source>
-        <translation type="unfinished"></translation>
+        <translation>Poprzedni kandydat</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Hangul</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Start</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul End</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul End</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul Hanja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Hanja</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul Jamo</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Jamo</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul Romaja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Romaja</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul Jeonja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Jeonja</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul Banja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Banja</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul PreHanja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul PreHanja</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul PostHanja</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul PostHanja</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hangul Special</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangul Special</translation>
     </message>
     <message>
         <location line="+602"/>
@@ -7849,6 +7890,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="-965"/>
         <source>Space</source>
+        <extracomment>This and all following &quot;incomprehensible&quot; strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used.</extracomment>
         <translation>Spacja</translation>
     </message>
     <message>
@@ -9441,7 +9483,7 @@ Proszę wybrać inną nazwę pliku.</translation>
 <context>
     <name>QWidget</name>
     <message>
-        <location filename="../src/gui/kernel/qwidget.cpp" line="+5809"/>
+        <location filename="../src/gui/kernel/qwidget.cpp" line="+5814"/>
         <source>*</source>
         <translation>*</translation>
     </message>
@@ -9664,7 +9706,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="-7"/>
         <source>tag mismatch</source>
-        <translation>niepoprawny tag</translation>
+        <translation>niezgodny tag</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9684,7 +9726,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="-11"/>
         <source>version expected while reading the XML declaration</source>
-        <translation>oczekiwana wersja podczas czytania deklaracji XML</translation>
+        <translation>oczekiwano wersji podczas czytania deklaracji XML</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9826,7 +9868,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+516"/>
         <source>Start tag expected.</source>
-        <translation>Oczekiwano tagu start.</translation>
+        <translation>Oczekiwano rozpoczęcia tagu.</translation>
     </message>
     <message>
         <location line="+222"/>
@@ -10052,12 +10094,12 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location filename="../src/xmlpatterns/expr/qcastas.cpp" line="+88"/>
         <source>Type error in cast, expected %1, received %2.</source>
-        <translation>Błąd typów w rzutowaniu: spodziewano się %1, otrzymano %2.</translation>
+        <translation>Błąd typów w rzutowaniu: oczekiwano %1, otrzymano %2.</translation>
     </message>
     <message>
         <location line="+29"/>
         <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>Podczas rzutowania na %1 lub na typ pochodny, wartość źródłowa musi być tego samego typu lub musi być zapisem tekstowym. Typ %2 nie jest dozwolony.</translation>
+        <translation>Podczas rzutowania na %1 lub na typ pochodny, wartość źródłowa musi być tego samego typu lub musi być stałą znakową. Typ %2 nie jest dozwolony.</translation>
     </message>
     <message>
         <location filename="../src/xmlpatterns/expr/qcommentconstructor.cpp" line="+67"/>
@@ -10354,7 +10396,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="-5902"/>
         <source>%1 is not a valid numeric literal.</source>
-        <translation>%1 nie jest poprawnym zapisem liczbowym.</translation>
+        <translation>%1 nie jest poprawną stałą liczbową.</translation>
     </message>
     <message>
         <location line="-152"/>
@@ -10419,7 +10461,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location line="+179"/>
         <source>When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.</source>
-        <translation>Gdy funkcja %1 jest wykorzystana do dopasowania wewnątrz wzorca, jej argument musi być referencją do zmiennej lub napisem.</translation>
+        <translation>Gdy funkcja %1 jest wykorzystana do dopasowania wewnątrz wzorca, jej argument musi być referencją do zmiennej lub stałą znakową.</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -11541,7 +11583,7 @@ Proszę wybrać inną nazwę pliku.</translation>
     <message>
         <location filename="../src/xmlpatterns/schema/qxsdschemaparser.cpp" line="+170"/>
         <source>Can not process unknown element %1, expected elements are: %2.</source>
-        <translation>Nie można przetworzyć nieznanego elementu %1, spodziewanymi elementami są: %2.</translation>
+        <translation>Nie można przetworzyć nieznanego elementu %1, oczekiwanymi elementami są: %2.</translation>
     </message>
     <message>
         <location line="+13"/>
author	Qt Continuous Integration System <qt-info@nokia.com>	2010-04-30 23:11:37 (GMT)
committer	Qt Continuous Integration System <qt-info@nokia.com>	2010-04-30 23:11:37 (GMT)
commit	0da9aa430240cefc7486efb3a68421423bc4fb76 (patch)
tree	e09cae283a652c5b926a059570f9f403356528af
parent	3e6a12e90d05d24bca68128d60215c207a416ef6 (diff)
parent	c693b4f8f38c435beffe1deb6186912123cd05f9 (diff)
download	Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.zip Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.tar.gz Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.tar.bz2