From 0212e277da295e333dc861cd544f2fd195704a13 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 3 Jun 2014 20:20:59 +0200 Subject: [PATCH] Update texts of EndSessionDialog and distinguish between shutdown/logout --- po/gala.pot | 30 ++++++++++++++---------------- src/EndSessionDialog.vala | 7 +++++-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/po/gala.pot b/po/gala.pot index 6490adf6..d368b16d 100644 --- a/po/gala.pot +++ b/po/gala.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-08 09:38+0200\n" +"POT-Creation-Date: 2014-06-03 20:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,39 +17,37 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. the restart type is currently used by the indicator for what is -#. labelled shutdown because of unity's implementation of it -#. apparently. So we got to adjust to that until they fix this. -#. logout -#: ../src/EndSessionDialog.vala:117 +#: ../src/EndSessionDialog.vala:76 msgid "Are you sure you want to Log Out?" msgstr "" -#: ../src/EndSessionDialog.vala:118 +#: ../src/EndSessionDialog.vala:77 +msgid "This will close all open applications." +msgstr "" + +#: ../src/EndSessionDialog.vala:78 msgid "Log Out" msgstr "" -#. shutdown -#. restart -#: ../src/EndSessionDialog.vala:123 +#: ../src/EndSessionDialog.vala:83 msgid "Are you sure you want to Shut Down?" msgstr "" -#: ../src/EndSessionDialog.vala:124 -msgid "Shut Down" +#: ../src/EndSessionDialog.vala:84 +msgid "This will close all open applications and turn off this device." msgstr "" -#: ../src/EndSessionDialog.vala:147 -msgid "This will close any open app and turn off your device." +#: ../src/EndSessionDialog.vala:85 +msgid "Shut Down" msgstr "" #. the indicator does not have a separate item for restart, that's #. why we show both shutdown and restart for the restart action #. (which is sent for shutdown as described above) -#: ../src/EndSessionDialog.vala:153 +#: ../src/EndSessionDialog.vala:118 msgid "Restart" msgstr "" -#: ../src/EndSessionDialog.vala:160 +#: ../src/EndSessionDialog.vala:125 msgid "Cancel" msgstr "" diff --git a/src/EndSessionDialog.vala b/src/EndSessionDialog.vala index eaa9f35b..de27b85f 100644 --- a/src/EndSessionDialog.vala +++ b/src/EndSessionDialog.vala @@ -65,7 +65,7 @@ namespace Gala construct { - string icon_name, heading_text, button_text; + string icon_name, heading_text, button_text, content_text; // the restart type is currently used by the indicator for what is // labelled shutdown because of unity's implementation of it @@ -74,17 +74,20 @@ namespace Gala case EndSessionDialogType.LOGOUT: icon_name = "system-log-out"; heading_text = _("Are you sure you want to Log Out?"); + content_text = _("This will close all open applications."); button_text = _("Log Out"); break; case EndSessionDialogType.SHUTDOWN: case EndSessionDialogType.RESTART: icon_name = "system-shutdown"; heading_text = _("Are you sure you want to Shut Down?"); + content_text = _("This will close all open applications and turn off this device."); button_text = _("Shut Down"); break; /*case EndSessionDialogType.RESTART: icon_name = "system-reboot"; heading_text = _("Are you sure you want to Restart?"); + content_text = _("This will close all open applications."); button_text = _("Restart"); break;*/ default: @@ -106,7 +109,7 @@ namespace Gala grid.margin_left = grid.margin_right = grid.margin_bottom = 12; grid.attach (new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG), 0, 0, 1, 2); grid.attach (heading, 1, 0, 1, 1); - grid.attach (new Gtk.Label (_("This will close any open app and turn off your device.")), 1, 1, 1, 1); + grid.attach (new Gtk.Label (content_text), 1, 1, 1, 1); // the indicator does not have a separate item for restart, that's // why we show both shutdown and restart for the restart action