Skip to content

Commit 9d434b7

Browse files
committed
Cleaned up some more strings and changes in MoveError Text alignment
1 parent c5e4896 commit 9d434b7

File tree

4 files changed

+71
-9
lines changed

4 files changed

+71
-9
lines changed

FreeMove/Form1.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private void Reset()
205205

206206
public static void Unauthorized(Exception ex)
207207
{
208-
MessageBox.Show("The error was caused by a file which couldn't be moved, it may be in use or you may not have the required permissions.\n\nTry running this program as administrator and/or close any program that is using the file specified in the details\n\nDETAILS: " + ex.Message, "Error details");
208+
MessageBox.Show(Properties.Resources.ErrorUnauthorizedMoveDetails + ex.Message, "Error details");
209209
}
210210
#endregion
211211

@@ -268,7 +268,7 @@ private void Button_Move_Click(object sender, EventArgs e)
268268
else
269269
{
270270
//Handle linking error
271-
var result = MessageBox.Show("ERROR creating symbolic link.\nThe folder is in the new position but the link could not be created.\nTry running as administrator\n\nDo you want to move the files back?", "ERROR, could not create a directory junction", MessageBoxButtons.YesNo);
271+
var result = MessageBox.Show(Properties.Resources.ErrorUnauthorizedLink, "ERROR, could not create a directory junction", MessageBoxButtons.YesNo);
272272
if (result == DialogResult.Yes)
273273
{
274274
StartMoving(destination, source, true, "Wait, moving files back...");

FreeMove/ProgressDialog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private bool MoveFolder(string source, string destination, bool doNotReplace)
6262
catch (UnauthorizedAccessException ex)
6363
{
6464
switch((DialogResult)Invoke(new Func<DialogResult>
65-
(() => MessageBox.Show(this, String.Format(Properties.Resources.ErrorUnauthorizedMoveMessage , ex.Message),"Error while moving contents", MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Error,MessageBoxDefaultButton.Button2,MessageBoxOptions.RightAlign))))
65+
(() => MessageBox.Show(this, String.Format(Properties.Resources.ErrorUnauthorizedMoveMessage , ex.Message),"Error while moving contents", MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Error,MessageBoxDefaultButton.Button2))))
6666
{
6767
default:
6868
case DialogResult.Abort:

FreeMove/Properties/Resources.Designer.cs

Lines changed: 40 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FreeMove/Properties/Resources.resx

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,43 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<data name="ErrorUnauthorizedLink" xml:space="preserve">
121+
<value>ERROR creating symbolic link.
122+
The folder is in the new position but the link could not be created.
123+
Try running as administrator
124+
125+
Do you want to move the files back?</value>
126+
</data>
127+
<data name="ErrorUnauthorizedMoveDetails" xml:space="preserve">
128+
<value>The error was caused by a file which couldn't be moved, it may be in use or you may not have the required permissions.
129+
130+
Try running this program as administrator and/or close any program that is using the file specified in the details
131+
132+
DETAILS:</value>
133+
</data>
120134
<data name="ErrorUnauthorizedMoveMessage" xml:space="preserve">
121-
<value>Error: {0}\n\nHow do you want to proceed?\n\"Abort\" to revert changes\n\"Ignore\" to stop the program</value>
135+
<value>Error: {0}
136+
137+
How do you want to proceed?
138+
"Abort" to revert changes
139+
"Ignore" to stop the program</value>
122140
</data>
123141
<data name="GitHubErrorMessage" xml:space="preserve">
124142
<value>Could not retrieve the version information
125143
from the GitHub server</value>
126144
</data>
127145
<data name="IgnoreMessage" xml:space="preserve">
128-
<value>Are you sure you want to proceed?\n\nBy ignoring you will leave all the files as they are now: part of the files will already be in the new location and missing from the old one!</value>
146+
<value>Are you sure you want to proceed?
147+
148+
By ignoring you will leave all the files as they are now: part of the files will already be in the new location and missing from the old one!</value>
129149
</data>
130150
<data name="IgnoreTextFile" xml:space="preserve">
131-
<value>There was an error when moving the files using FreeMove on {0} and you chose to ignore it.\nThe rest of the contents of this directory can be found at \"{1}\" unless they were moved.\nNext time use \"Abort\" in case of an error to move the files back or \"Retry\" to try again.\n\nIf this text file was useful or if you would have preferred it wasn't created let me know.\n</value>
151+
<value>There was an error when moving the files using FreeMove on {0} and you chose to ignore it.
152+
The rest of the contents of this directory can be found at "{1}" unless they were moved.
153+
Next time use "Abort" in case of an error to move the files back or "Retry" to try again.
154+
155+
If this text file was useful or if you would have preferred it wasn't created let me know.
156+
</value>
132157
</data>
133158
<data name="UserAgent" xml:space="preserve">
134159
<value>ImDema-FreeMove-Updater</value>

0 commit comments

Comments
 (0)