GitLab

This is the squashed result of a team effort. Authors are:

Jonathan Courtois <jonathan.courtois@gmail.com>
Belz Guillaume <guillaume.belz@free.fr>
Cédric Bonnier <myzu69@gmail.com>
Francis Genet <francis.genet@supinfo.com>
Pierre Rossi <pierre.rossi@nokia.com>

For full history, checkout the team's repo:
http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr

See also: http://qt.developpez.com/



Merge-request: 168
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>

updated the strings. Let's try to get French back in for 2.1

Validate the strings of the French translation. The strings were fixed
when necessary.

Reviewed-by: Pierre Rossi

Merge-request: 2131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

by Ben & Pierre

Merge-request: 2131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Merge-request: 2131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change the translateable string not to contain a blank.

Task-number: QTCREATORBUG-299
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>

Reviewed-by: Oswald Buddenhagen

Merge-request: 1954
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

this is a squashed result of some major merging messups. original authors are:

Alp Mestan <alpmestan@gmail.com>
Benjamin Poulain <benjamin.poulain@nokia.com>
Pierre Rossi <pierre.rossi@nokia.com>

Merge-request: 1461
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>

Merge-request: 1461
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>

and '?' ) in the french translation.

Validation of some translations from Pierre, a few new translations in
the context of the editor.

Reviewed-by: Trust Me

Conflicts:

	src/libs/cplusplus/CppBindings.cpp
	src/libs/cplusplus/CppBindings.h
	src/libs/cplusplus/FastPreprocessor.cpp
	src/libs/cplusplus/FastPreprocessor.h
	src/plugins/cpptools/cppcurrentdocumentfilter.cpp
	src/plugins/cpptools/cppcurrentdocumentfilter.h
	src/plugins/cpptools/cppsemanticsearch.cpp
	src/plugins/cpptools/cppsemanticsearch.h
	src/plugins/duieditor/parser/qmljs.g
	src/plugins/duieditor/parser/qmljsast.cpp
	src/plugins/duieditor/parser/qmljsast_p.h
	src/plugins/duieditor/parser/qmljsastfwd_p.h
	src/plugins/duieditor/parser/qmljsastvisitor.cpp
	src/plugins/duieditor/parser/qmljsastvisitor_p.h
	src/plugins/duieditor/parser/qmljsengine_p.cpp
	src/plugins/duieditor/parser/qmljsengine_p.h
	src/plugins/duieditor/parser/qmljsgrammar.cpp
	src/plugins/duieditor/parser/qmljsgrammar_p.h
	src/plugins/duieditor/parser/qmljslexer.cpp
	src/plugins/duieditor/parser/qmljslexer_p.h
	src/plugins/duieditor/parser/qmljsmemorypool_p.h
	src/plugins/duieditor/parser/qmljsnodepool_p.h
	src/plugins/duieditor/parser/qmljsparser.cpp
	src/plugins/duieditor/parser/qmljsparser_p.h
	src/plugins/duieditor/parser/qmljsprettypretty.cpp
	src/plugins/duieditor/parser/qmljsprettypretty_p.h
	src/plugins/duieditor/rewriter/rewriter.cpp
	src/plugins/duieditor/rewriter/rewriter_p.h
	src/plugins/duieditor/rewriter/textwriter.cpp
	src/plugins/duieditor/rewriter/textwriter_p.h
	src/shared/cplusplus/ASTClone.cpp
	tests/manual/cplusplus/main.cpp

Reviewed-by: Trust Me

Updated the strings, translated the QML related ones and the new
Welcome page. Shortcuts translations are missing, Italians are/will
get used to the english Creator shortcuts.

Merge-request: 667
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Putting Help Filter settings into a GroupBox

Putting VCS settings into a GroupBox

Putting Debugging Helper settings into a GroupBox