From 6d1b810ca0e8c0d37cf4126a9db87e2d91e043db Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Tue, 26 Jun 2012 18:46:28 +0100 Subject: [PATCH] windows: update README --- SparkleShare/Linux/SparkleSetup.cs | 2 +- SparkleShare/Mac/SparkleSetup.cs | 2 +- SparkleShare/Windows/README.md | 7 ++++--- SparkleShare/Windows/SparkleSetup.cs | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/SparkleShare/Linux/SparkleSetup.cs b/SparkleShare/Linux/SparkleSetup.cs index ad525d90..695e8a39 100755 --- a/SparkleShare/Linux/SparkleSetup.cs +++ b/SparkleShare/Linux/SparkleSetup.cs @@ -448,7 +448,7 @@ namespace SparkleShare { case PageType.Error: { - Header = _("Something went wrong") + "…"; + Header = _("Oops! Something went wrong") + "…"; VBox points = new VBox (false, 0); Image list_point_one = new Image (SparkleUIHelpers.GetIcon ("go-next", 16)); diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs index ed23fbc9..285d4f29 100755 --- a/SparkleShare/Mac/SparkleSetup.cs +++ b/SparkleShare/Mac/SparkleSetup.cs @@ -543,7 +543,7 @@ namespace SparkleShare { case PageType.Error: { - Header = "Something went wrong…"; + Header = "Oops! Something went wrong…"; Description = "Please check the following:"; // Displaying marked up text with Cocoa is diff --git a/SparkleShare/Windows/README.md b/SparkleShare/Windows/README.md index 7a884ded..10dd441d 100644 --- a/SparkleShare/Windows/README.md +++ b/SparkleShare/Windows/README.md @@ -6,17 +6,18 @@ You can choose to build SparkleShare from source or to run the Windows installer Install version 4.0 of the [.NET Framework](http://www.microsoft.com/download/en/details.aspx?id=17851) if you haven't already. -Install [msysGit](http://code.google.com/p/msysgit/downloads/detail?name=Git-1.7.8-preview20111206.exe). Change the install location to `C:\msysgit` and use the default settings for the other settings during the installation. Copy the `C:\msysgit` directory to `bin\msysgit` (in the SparkleShare source directory). +Install [msysGit](http://code.google.com/p/msysgit/downloads/) and copy the contents of the install folder +(`C:\Program Files (x86)\Git` by default) to `C:\path\to\SparkleShare\sources\bin\msysgit\` (in the SparkleShare source directory). Open a command prompt and execute the following: ``` -cd C:\path\to\SparkleShare\source +cd C:\path\to\SparkleShare\sources cd SparkleShare\Windows build ``` -`C:\path\to\SparkleShare\source\bin` should now contain `SparkleShare.exe`, which you can run. +`C:\path\to\SparkleShare\sources\bin` should now contain `SparkleShare.exe`, which you can run. ### Creating a Windows installer diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs index ee4a32d8..87743cb8 100644 --- a/SparkleShare/Windows/SparkleSetup.cs +++ b/SparkleShare/Windows/SparkleSetup.cs @@ -481,7 +481,7 @@ namespace SparkleShare { case PageType.Error: { - Header = "Something went wrong…"; + Header = "Oops! Something went wrong…"; Description = "Please check the following:"; TextBlock help_block = new TextBlock () {