beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

setup: Fix grammar, punctuation and inconsistencies

Browse source
This commit is contained in:
Hylke Bons 2013-07-06 16:49:41 +01:00
parent 84954bab2e
commit a0677e753b
4 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -718,15 +718,16 @@ namespace SparkleLib.Git {
line.StartsWith ("ssh_exchange_identification: Connection closed by remote host")) {
Error = ErrorStatus.AuthenticationFailed;
} else if (line.EndsWith ("does not appear to be a git repository")) {
Error = ErrorStatus.NotFound;
} else if (line.StartsWith ("error: Disk space exceeded") ||
line.EndsWith ("No space left on device")) {
Error = ErrorStatus.DiskSpaceExceeded;
} else if (line.EndsWith ("does not appear to be a git repository")) {
Error = ErrorStatus.NotFound;
}
if (Error != ErrorStatus.None) {
SparkleLogger.LogInfo ("Git", Name + " | Error status changed to " + Error);
return true;

28
SparkleShare/Linux/SparkleSetup.cs
View file

@ -55,7 +55,7 @@ namespace SparkleShare {
{
if (type == PageType.Setup) {
Header = "Welcome to SparkleShare!";
Description = "First off, what's your name and email?\nThis information is only visible to team members.";
Description = "First off, what’s your name and email?\n(Visible only to team members)";
Table table = new Table (2, 3, true) {
RowSpacing = 6,
@ -120,7 +120,7 @@ namespace SparkleShare {
}
if (type == PageType.Add) {
Header = "Where's your project hosted?";
Header = "Where’s your project hosted?";
VBox layout_vertical = new VBox (false, 12);
HBox layout_fields = new HBox (true, 12);
@ -307,7 +307,7 @@ namespace SparkleShare {
}
if (type == PageType.Invite) {
Header = "You've received an invite!";
Header = "You’ve received an invite!";
Description = "Do you want to add this project to SparkleShare?";
Table table = new Table (2, 3, true) {
@ -351,7 +351,7 @@ namespace SparkleShare {
if (type == PageType.Syncing) {
Header = String.Format ("Adding project ‘{0}’…", Controller.SyncingFolder);
Description = "This may take a while for large projects.\nIsn't it coffee-o'clock?";
Description = "This may take a while for large projects.\nIsn’t it coffee-o’clock?";
ProgressBar progress_bar = new ProgressBar ();
progress_bar.Fraction = Controller.ProgressBarPercentage / 100;
@ -384,14 +384,14 @@ namespace SparkleShare {
Image list_point_three = new Image (SparkleUIHelpers.GetIcon ("list-point", 16));
Label label_one = new Label () {
Markup = "<b>" + Controller.PreviousUrl + "</b> is the address we've compiled. " +
Markup = "<b>" + Controller.PreviousUrl + "</b> is the address we’ve compiled. " +
"Does this look alright?",
Wrap = true,
Xalign = 0
};
Label label_two = new Label () {
Text = "Is this computer's Client ID known by the host?",
Text = "Is this computer’s Client ID known by the host?",
Wrap = true,
Xalign = 0
};
@ -415,7 +415,7 @@ namespace SparkleShare {
warnings_markup += "\n<b>" + warning + "</b>";
Label label_three = new Label () {
Markup = "Here's the raw error message:" + warnings_markup,
Markup = "Here’s the raw error message:" + warnings_markup,
Wrap = true,
Xalign = 0
};
@ -444,7 +444,7 @@ namespace SparkleShare {
if (type == PageType.CryptoSetup || type == PageType.CryptoPassword) {
if (type == PageType.CryptoSetup) {
Header = "Set up file encryption";
Description = "Please a provide a strong password that you don't use elsewhere below:";
Description = "Please a provide a strong password that you don’t use elsewhere.";
} else {
Header = "This project contains encrypted files";
@ -486,7 +486,7 @@ namespace SparkleShare {
Label warning_label = new Label () {
Xalign = 0,
Wrap = true,
Text = "This password can't be changed later, and your files can't be recovered if it's forgotten."
Text = "This password can’t be changed later, and your files can’t be recovered if it’s forgotten."
};
HBox warning_layout = new HBox (false, 0);
@ -540,7 +540,7 @@ namespace SparkleShare {
if (type == PageType.Finished) {
Header = "Your shared project is ready!";
Description = "You can find it in your SparkleShare folder";
Description = "You can find the files in your SparkleShare folder.";
UrgencyHint = true;
@ -580,7 +580,7 @@ namespace SparkleShare {
if (type == PageType.Tutorial) {
switch (Controller.TutorialPageNumber) {
case 1: {
Header = "What's happening next?";
Header = "What’s happening next?";
Description = "SparkleShare creates a special folder on your computer " +
"that will keep track of your projects.";
@ -611,7 +611,7 @@ namespace SparkleShare {
case 3: {
Header = "The status icon helps you";
Description = "It shows the syncing progress, provides easy access to " +
"your projects and let's you view recent changes.";
"your projects, and lets you view recent changes.";
Button continue_button = new Button ("Continue");
continue_button.Clicked += delegate { Controller.TutorialPageCompleted (); };
@ -621,8 +621,8 @@ namespace SparkleShare {
}
case 4: {
Header = "Here's your unique client ID";
Description = "You'll need it whenever you want to link this computer to a host. " +
Header = "Here’s your unique Client ID";
Description = "You’ll need it whenever you want to link this computer to a host. " +
"You can also find it in the status icon menu.";
Button finish_button = new Button ("Finish");

28
SparkleShare/Mac/SparkleSetup.cs
View file

@ -73,7 +73,7 @@ namespace SparkleShare {
{
if (type == PageType.Setup) {
Header = "Welcome to SparkleShare!";
Description = "First off, what's your name and email?\n(visible only to team members)";
Description = "First off, what’s your name and email?\n(visible only to team members)";
FullNameLabel = new SparkleLabel ("Full Name:", NSTextAlignment.Right);
FullNameLabel.Frame = new RectangleF (165, Frame.Height - 234, 160, 17);
@ -136,7 +136,7 @@ namespace SparkleShare {
}
if (type == PageType.Invite) {
Header = "You've received an invite!";
Header = "You’ve received an invite!";
Description = "Do you want to add this project to SparkleShare?";
AddressLabel = new SparkleLabel ("Address:", NSTextAlignment.Right);
@ -173,7 +173,7 @@ namespace SparkleShare {
}
if (type == PageType.Add) {
Header = "Where's your project hosted?";
Header = "Where’s your project hosted?";
Description = "";
AddressLabel = new SparkleLabel ("Address:", NSTextAlignment.Left) {
@ -348,7 +348,7 @@ namespace SparkleShare {
if (type == PageType.Syncing) {
Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
Description = "This may take a while for large projects.\nIsn't it coffee-o'clock?";
Description = "This may take a while for large projects.\nIsn’t it coffee-o’clock?";
ProgressIndicator = new NSProgressIndicator () {
Frame = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20),
@ -415,8 +415,8 @@ namespace SparkleShare {
"}" +
"</style>" +
"<ul>" +
" <li><b>" + Controller.PreviousUrl + "</b> is the address we've compiled. Does this look alright?</li>" +
" <li>Is this computer's Client ID known by the host?</li>" +
" <li><b>" + Controller.PreviousUrl + "</b> is the address we’ve compiled. Does this look alright?</li>" +
" <li>Is this computer’s Client ID known by the host?</li>" +
"</ul>";
if (warnings.Length > 0) {
@ -425,7 +425,7 @@ namespace SparkleShare {
foreach (string warning in warnings)
warnings_markup += "<br><b>" + warning + "</b>";
html = html.Replace ("</ul>", "<li>Here's the raw error message: " + warnings_markup + "</li></ul>");
html = html.Replace ("</ul>", "<li>Here’s the raw error message: " + warnings_markup + "</li></ul>");
}
web_view.MainFrame.LoadHtmlString (html, new NSUrl (""));
@ -448,7 +448,7 @@ namespace SparkleShare {
if (type == PageType.CryptoSetup || type == PageType.CryptoPassword) {
if (type == PageType.CryptoSetup) {
Header = "Set up file encryption";
Description = "Please a provide a strong password that you don't use elsewhere below:";
Description = "Please a provide a strong password that you don’t use elsewhere.";
} else {
Header = "This project contains encrypted files";
@ -491,7 +491,7 @@ namespace SparkleShare {
Frame = new RectangleF (200, Frame.Height - 320, 24, 24)
};
WarningTextField = new SparkleLabel ("This password can't be changed later, and your files can't be recovered if it's forgotten.", NSTextAlignment.Left) {
WarningTextField = new SparkleLabel ("This password can’t be changed later, and your files can’t be recovered if it’s forgotten.", NSTextAlignment.Left) {
Frame = new RectangleF (235, Frame.Height - 390, 325, 100),
};
@ -615,7 +615,7 @@ namespace SparkleShare {
switch (Controller.TutorialPageNumber) {
case 1: {
Header = "What's happening next?";
Header = "What’s happening next?";
Description = "SparkleShare creates a special folder on your computer " +
"that will keep track of your projects.";
@ -650,7 +650,7 @@ namespace SparkleShare {
case 3: {
Header = "The status icon helps you";
Description = "It shows the syncing progress, provides easy access to " +
"your projects and let's you view recent changes.";
"your projects, and lets you view recent changes.";
ContinueButton = new NSButton () { Title = "Continue" };
ContinueButton.Activated += delegate { Controller.TutorialPageCompleted (); };
@ -660,9 +660,9 @@ namespace SparkleShare {
}
case 4: {
Header = "Here's your unique client ID";
Description = "You'll need it whenever you want to link this computer to a host. " +
" You can also find it in the status icon menu.";
Header = "Here’s your unique Client ID";
Description = "You’ll need it whenever you want to link this computer to a host. " +
"You can also find it in the status icon menu.";
LinkCodeTextField = new NSTextField () {
StringValue = Program.Controller.CurrentUser.PublicKey,

26
SparkleShare/Windows/SparkleSetup.cs
View file

@ -64,7 +64,7 @@ namespace SparkleShare {
switch (type) {
case PageType.Setup: {
Header = "Welcome to SparkleShare!";
Description = "First off, what's your name and email?\nThis information is only visible to team members.";
Description = "First off, what’s your name and email?\n(Visible only to team members)";
TextBlock name_label = new TextBlock () {
Text = "Full Name:",
@ -156,7 +156,7 @@ namespace SparkleShare {
}
case PageType.Invite: {
Header = "You've received an invite!";
Header = "You’ve received an invite!";
Description = "Do you want to add this project to SparkleShare?";
@ -228,7 +228,7 @@ namespace SparkleShare {
}
case PageType.Add: {
Header = "Where's your project hosted?";
Header = "Where’s your project hosted?";
ListView list_view = new ListView () {
@ -437,7 +437,7 @@ namespace SparkleShare {
case PageType.Syncing: {
Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
Description = "This may take a while for large projects.\nIsn't it coffee-o'clock?";
Description = "This may take a while for large projects.\nIsn’t it coffee-o’clock?";
Button finish_button = new Button () {
Content = "Finish",
@ -494,12 +494,12 @@ namespace SparkleShare {
};
help_block.Inlines.Add (new Bold (new Run (Controller.PreviousUrl)));
help_block.Inlines.Add (" is the address we've compiled. Does this look alright?\n\n");
help_block.Inlines.Add ("Is this computer's Client ID known by the host??");
help_block.Inlines.Add (" is the address we’ve compiled. Does this look alright?\n\n");
help_block.Inlines.Add ("Is this computer’s Client ID known by the host??");
if (warnings.Length > 0) {
bullets_block.Text += "\n\n•";
help_block.Inlines.Add ("\n\nHere's the raw error message:");
help_block.Inlines.Add ("\n\nHere’s the raw error message:");
foreach (string warning in warnings) {
help_block.Inlines.Add ("\n");
@ -544,7 +544,7 @@ namespace SparkleShare {
case PageType.CryptoSetup: {
Header = "Set up file encryption";
Description = "Please a provide a strong password that you don't use elsewhere below:";
Description = "Please a provide a strong password that you don’t use elsewhere.";
TextBlock password_label = new TextBlock () {
Text = "Password:",
@ -566,7 +566,7 @@ namespace SparkleShare {
};
TextBlock info_label = new TextBlock () {
Text = "This password can't be changed later, and your files can't be recovered if it's forgotten.",
Text = "This password can’t be changed later, and your files can’t be recovered if it’s forgotten.",
TextWrapping = TextWrapping.Wrap,
Width = 315
};
@ -799,7 +799,7 @@ namespace SparkleShare {
case PageType.Tutorial: {
switch (Controller.TutorialPageNumber) {
case 1: {
Header = "What's happening next?";
Header = "What’s happening next?";
Description = "SparkleShare creates a special folder on your computer " +
"that will keep track of your projects.";
@ -874,7 +874,7 @@ namespace SparkleShare {
case 3: {
Header = "The status icon helps you";
Description = "It shows the syncing progress, provides easy access to " +
"your projects and lets you view recent changes.";
"your projects, and lets you view recent changes.";
Button continue_button = new Button () {
Content = "Continue"
@ -903,8 +903,8 @@ namespace SparkleShare {
}
case 4: {
Header = "Here's your unique client ID";
Description = "You'll need it whenever you want to link this computer to a host. " +
Header = "Here’s your unique Client ID";
Description = "You’ll need it whenever you want to link this computer to a host. " +
"You can also find it in the status icon menu.";