diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-24 10:25:03 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-24 10:25:03 -0500 |
| commit | 3ce500e1375736a23d59f0410f25ab832ca4c77b (patch) | |
| tree | 98136c1443036ed957dd77be3c232238255a63e1 | |
| parent | 74bbdf00b1a06372cb8326312d723e6aad880e39 (diff) | |
| parent | 69caf1c9ee63b8121e4cce8802c0c4adcf774602 (diff) | |
| download | ayatana-indicator-session-3ce500e1375736a23d59f0410f25ab832ca4c77b.tar.gz ayatana-indicator-session-3ce500e1375736a23d59f0410f25ab832ca4c77b.tar.bz2 ayatana-indicator-session-3ce500e1375736a23d59f0410f25ab832ca4c77b.zip | |
* Upstream Merge
* Fix strings to have all be "Shut Down" (LP: #545578)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/dialog.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6e3be30..230cdb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-session (0.2.6-0ubuntu3~ppa1) UNRELEASED; urgency=low + + * Upstream Merge + * Fix strings to have all be "Shut Down" (LP: #545578) + + -- Ted Gould <ted@ubuntu.com> Wed, 24 Mar 2010 10:24:00 -0500 + indicator-session (0.2.6-0ubuntu2) lucid; urgency=low * debian/control: diff --git a/src/dialog.c b/src/dialog.c index deefe0b..fba8013 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -34,7 +34,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"), /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off") + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Shut Down") }; static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = { @@ -46,7 +46,7 @@ static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = { static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"), /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off") + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Shut Down") }; /* TRANSLATORS: These strings have an ellipsis so that the user knows @@ -54,7 +54,7 @@ static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"), /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart..."), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Switch Off...") + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down...") }; /* TRANSLATORS: This button appears on the logout dialog when |