elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-25 10:13:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update texts of EndSessionDialog and distinguish between shutdown/logout

Browse Source
This commit is contained in:
Rico Tzschichholz 2014-06-03 20:20:59 +02:00
parent ca77b5159b
commit 0212e277da
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
po/gala.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,39 +17,37 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. the restart type is currently used by the indicator for what is #: ../src/EndSessionDialog.vala:76
#. 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
msgid "Are you sure you want to Log Out?" msgid "Are you sure you want to Log Out?"
msgstr "" msgstr ""
#: ../src/EndSessionDialog.vala:118 #: ../src/EndSessionDialog.vala:77
msgid "This will close all open applications."
msgstr ""
#: ../src/EndSessionDialog.vala:78
msgid "Log Out" msgid "Log Out"
msgstr "" msgstr ""
#. shutdown #: ../src/EndSessionDialog.vala:83
#. restart
#: ../src/EndSessionDialog.vala:123
msgid "Are you sure you want to Shut Down?" msgid "Are you sure you want to Shut Down?"
msgstr "" msgstr ""
#: ../src/EndSessionDialog.vala:124 #: ../src/EndSessionDialog.vala:84
msgid "Shut Down" msgid "This will close all open applications and turn off this device."
msgstr "" msgstr ""
#: ../src/EndSessionDialog.vala:147 #: ../src/EndSessionDialog.vala:85
msgid "This will close any open app and turn off your device." msgid "Shut Down"
msgstr "" msgstr ""
#. the indicator does not have a separate item for restart, that's #. the indicator does not have a separate item for restart, that's
#. why we show both shutdown and restart for the restart action #. why we show both shutdown and restart for the restart action
#. (which is sent for shutdown as described above) #. (which is sent for shutdown as described above)
#: ../src/EndSessionDialog.vala:153 #: ../src/EndSessionDialog.vala:118
msgid "Restart" msgid "Restart"
msgstr "" msgstr ""
#: ../src/EndSessionDialog.vala:160 #: ../src/EndSessionDialog.vala:125
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""

7
src/EndSessionDialog.vala
View File

@ -65,7 +65,7 @@ namespace Gala
construct 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 // the restart type is currently used by the indicator for what is
// labelled shutdown because of unity's implementation of it // labelled shutdown because of unity's implementation of it
@ -74,17 +74,20 @@ namespace Gala
case EndSessionDialogType.LOGOUT: case EndSessionDialogType.LOGOUT:
icon_name = "system-log-out"; icon_name = "system-log-out";
heading_text = _("Are you sure you want to Log Out?"); heading_text = _("Are you sure you want to Log Out?");
content_text = _("This will close all open applications.");
button_text = _("Log Out"); button_text = _("Log Out");
break; break;
case EndSessionDialogType.SHUTDOWN: case EndSessionDialogType.SHUTDOWN:
case EndSessionDialogType.RESTART: case EndSessionDialogType.RESTART:
icon_name = "system-shutdown"; icon_name = "system-shutdown";
heading_text = _("Are you sure you want to Shut Down?"); 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"); button_text = _("Shut Down");
break; break;
/*case EndSessionDialogType.RESTART: /*case EndSessionDialogType.RESTART:
icon_name = "system-reboot"; icon_name = "system-reboot";
heading_text = _("Are you sure you want to Restart?"); heading_text = _("Are you sure you want to Restart?");
content_text = _("This will close all open applications.");
button_text = _("Restart"); button_text = _("Restart");
break;*/ break;*/
default: default:
@ -106,7 +109,7 @@ namespace Gala
grid.margin_left = grid.margin_right = grid.margin_bottom = 12; 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 (new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG), 0, 0, 1, 2);
grid.attach (heading, 1, 0, 1, 1); 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 // the indicator does not have a separate item for restart, that's
// why we show both shutdown and restart for the restart action // why we show both shutdown and restart for the restart action