← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserInfoConflictDialog.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserInfoConflictDialog.cs
24
24
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25
25
// THE SOFTWARE.
26
26
using System;
 
27
using MonoDevelop.Core;
 
28
 
 
29
 
27
30
namespace MonoDevelop.VersionControl.Git
28
31
{
29
32
        public partial class UserInfoConflictDialog : Gtk.Dialog
31
34
                public UserInfoConflictDialog (string mdInfo, string gitInfo)
32
35
                {
33
36
                        this.Build ();
 
37
                        label1.LabelProp = BrandingService.BrandApplicationName (label1.LabelProp);
 
38
                        radioMD.Label = BrandingService.BrandApplicationName (radioMD.Label);
34
39
                        labelMD.Markup = "<b>" + GLib.Markup.EscapeText (mdInfo) + "</b>";
35
40
                        labelGit.Markup = "<b>" + GLib.Markup.EscapeText (gitInfo) + "</b>";
36
41
                }