Merge lp:~paolorotolo/unity/fix-for-1157927 into lp:unity

Proposed by Paolo Rotolo
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3244
Proposed branch: lp:~paolorotolo/unity/fix-for-1157927
Merge into: lp:unity
Diff against target: 29 lines (+3/-3)
1 file modified
shutdown/SessionView.cpp (+3/-3)
To merge this branch: bzr merge lp:~paolorotolo/unity/fix-for-1157927
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+154500@code.launchpad.net

Commit message

Add comma before the username in Shutdown dialog (LP #1157927).

Description of the change

Add comma before the username in Shutdown dialog (LP #1157927).

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

I'm not sure about that, please ping JohnLea on irc to have design approval.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Paolo, so design is fine with this.
Could you just do a small change by replacing the "!" with a ".", too?

Thanks

Revision history for this message
Paolo Rotolo (paolorotolo) wrote :

Done.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thank you!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'shutdown/SessionView.cpp'
--- shutdown/SessionView.cpp 2013-03-19 16:03:05 +0000
+++ shutdown/SessionView.cpp 2013-03-21 13:36:25 +0000
@@ -121,7 +121,7 @@
121 }121 }
122 else122 else
123 {123 {
124 message = _("Goodbye %s! Are you sure you want to close all programs " \124 message = _("Goodbye, %s. Are you sure you want to close all programs " \
125 "and shut down the computer?");125 "and shut down the computer?");
126 }126 }
127 }127 }
@@ -137,7 +137,7 @@
137 }137 }
138 else138 else
139 {139 {
140 message = _("Goodbye %s! Are you sure you want to close all programs " \140 message = _("Goodbye, %s. Are you sure you want to close all programs " \
141 "and log out from your account?");141 "and log out from your account?");
142 }142 }
143 }143 }
@@ -161,7 +161,7 @@
161 }161 }
162 else162 else
163 {163 {
164 message = _("Goodbye %s! Would you like to…");164 message = _("Goodbye, %s. Would you like to…");
165 }165 }
166 }166 }
167167