Merge branch 'master' of git://github.com/gitextensions/gitextensions

Conflicts:
	ResourceManager/TranslationUtl.cs
Merge branch 'left-panel/-main'
Fix Settings panel crash in Mono.

flowLayoutPanel4 exceed the number of columns in tableLayoutPanel3 due to the span of 2.
Merge pull request #1597 from chrisbux/fix_1587

Fix Settings panel crash in Mono - Issue #1587.
Adjust Settings window placement of flowLayoutPanel4.

flowLayoutPanel4 was placed at location 2,2 in tableLayoutPanel3 which places it beyond the last column of tableLayoutPanel3 (2 columns).  Under Mono, this added a new column which made the Settings window look very bad.
Merge pull request #1598 from chrisbux/fix_settings_resize

Adjust Settings window placement of flowLayoutPanel4.
typo
update french translation...
Merge pull request #1600 from pmiossec/french_translation

French translation
Merge branch 'master' of git://github.com/gitextensions/gitextensions

Conflicts:
	GitUI/FormBrowse.Designer.cs
	GitUI/FormBrowse.cs
Merge branch 'master' into left-panel/-main

Conflicts:
	GitUI/FormBrowse.Designer.cs
Check if alt is not pressed.
build scripts fail within a path containing spaces;

If the main repository directory path contains a space, build scripts fail.
Fixed this issue by quoting commands which use a path.
added "" as a Title for the 'start' command;

According to http://ss64.com/nt/start.html,
it's recommended to always include a title with the 'start' command
(even if it's empty).  Also, without the "", GitEx would NOT start;
rather, a new command prompt instance would be started.
Merge branch 'left-panel/-main' of git://github.com/jbialobr/gitextensions into left-panel/-main

Conflicts:
	GitUI/FormBrowse.Designer.cs
	GitUI/FormBrowse.cs
	ResourceManager/TranslationUtl.cs
removed #Mono directive from FormBrowse;

Removed #Mono directive from FormBrowse.Designer.cs which caused build
errors. (Previous commit will fail to build! Apologies.)
Merge branch 'masterg' into left-panel/-main
added ability to build using the build scripts;

Per http://docs.nuget.org/docs/workflows/using-nuget-without-committing-packages,
added ability to build the solution's projects which have NuGet
package dependencies.
Should be equal.
added "set EnableNuGetPackageRestore=true";

"set EnableNuGetPackageRestore=true" is required for NuGet to restore
(download) packages which aren't in the \packages\ folder. Note that
some or all packages may be copied from a local cache folder
if one exists.