From e7d587f7769c8566e9c1290b6b4862277078bf80 Mon Sep 17 00:00:00 2001
From: Jeavon Leopold <jeavon@crumpled-dog.com>
Date: Wed, 6 Nov 2013 17:19:18 +0000
Subject: [PATCH] Fix for U4-3432Rollback Dialog - CreateDate/Creator
 formatting tweaks required

---
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml                   | 2 +-
 .../umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 4b0c1f42a0..b6381e89dc 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -287,7 +287,7 @@
     <key alias="alias">Alias</key>
     <key alias="areyousure">Are you sure?</key>
     <key alias="border">Border</key>
-    <key alias="by">or</key>
+    <key alias="by">by</key>
     <key alias="cancel">Cancel</key>
     <key alias="cellMargin">Cell margin</key>
     <key alias="choose">Choose</key>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
index 88e9933945..606b1caeaf 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
@@ -33,7 +33,7 @@ namespace umbraco.presentation.dialogs
                 Document rollback = new Document(currentDoc.Id, new Guid(allVersions.SelectedValue));
                 
                 propertiesCompare.Text = "<tr><th style='width: 25%;' valign='top'>" + ui.Text("general", "name") + ":</th><td>" + rollback.Text + "</td></tr>";
-                propertiesCompare.Text += "<tr><th style='width: 25%;' valign='top'>" + ui.Text("content", "createDate") + ":</th><td>" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + ui.Text("general", "by") + ": " + rollback.User.Name + "</td></tr>";
+                propertiesCompare.Text += "<tr><th style='width: 25%;' valign='top'>" + ui.Text("content", "createDate") + ":</th><td>" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + " " + ui.Text("general", "by") + ": " + rollback.User.Name + "</td></tr>";
 
                 if (rbl_mode.SelectedValue == "diff")
                     lt_notice.Text = ui.Text("rollback", "diffHelp");