On Wed, 28 Jan 2009 21:33:15 +0100 thomasg <tho...@gstaedtner.net> said:
> Hi raster,
>
> may I ask, why you replaced "reboot" by "reset"?
i chose something more generic - why? reboot is a very computerish term. what
if you have... a phone - or a media player. do you "reboot it"? :)
> In my understanding, "reset" is the action you take when nothing works
> and you just power off without a proper shutdown procedure.
> Not only all other DE's/OS's use reboot, but also the shutdown tool
> from the widely used sysvinit (not only in most linux distros, but
> also in many other unix variants like FreeBSD) package uses "reboot"
> for shutdown -r in the help and manpage.
> It only saves 1 char to use reset and imho it's incorrect.
>
> Also I think "shutdown" hits the point more than "power off" does. The
> action shuts the system down, but if it's powered off depends on the
> system (bios/acpi/...). But however, that's not that important. :)
same as above. choosing more neutral terms :)
> Thanks,
>
> thomasg
>
> On Thu, Jan 22, 2009 at 9:54 PM, Enlightenment SVN
> <no-re...@enlightenment.org> wrote:
> > Log:
> > shorten system action text - simpler. also fix actiosn to be system.
> >
> >
> > Author: raster
> > Date: 2009-01-22 12:54:26 -0800 (Thu, 22 Jan 2009)
> > New Revision: 38698
> >
> > Modified:
> > trunk/e/src/bin/e_actions.c trunk/e/src/bin/e_sys.c
> >
> > Modified: trunk/e/src/bin/e_actions.c
> > ===================================================================
> > --- trunk/e/src/bin/e_actions.c 2009-01-22 18:33:23 UTC (rev 38697)
> > +++ trunk/e/src/bin/e_actions.c 2009-01-22 20:54:26 UTC (rev 38698)
> > @@ -2612,7 +2612,7 @@
> >
> > /* exec */
> > ACT_GO(exec);
> > - e_action_predef_name_set(_("Launch"), _("Defined Command"), "exec",
> > NULL,
> > + e_action_predef_name_set(_("Launch"), _("Command"), "exec", NULL,
> > "syntax: CommandName, example: /usr/bin/xmms",
> > 1);
> >
> > /* app */
> > @@ -2628,20 +2628,20 @@
> > e_action_predef_name_set(_("Enlightenment"), _("Exit"), "exit",
> > NULL, NULL, 0);
> >
> > + ACT_GO(exit_now);
> > + e_action_predef_name_set(_("Enlightenment"), _("Exit Now"),
> > + "exit_now", NULL, NULL, 0);
> > +
> > ACT_GO(logout);
> > - e_action_predef_name_set(_("Enlightenment"), _("Log Out"), "logout",
> > + e_action_predef_name_set(_("System"), _("Log Out"), "logout",
> > NULL, NULL, 0);
> >
> > - ACT_GO(exit_now);
> > - e_action_predef_name_set(_("Enlightenment"), _("Exit Immediately"),
> > - "exit_now", NULL, NULL, 0);
> > -
> > ACT_GO(halt_now);
> > - e_action_predef_name_set(_("Enlightenment"), _("Off Now"),
> > + e_action_predef_name_set(_("System"), _("Power Off Now"),
> > "halt_now", NULL, NULL, 0);
> >
> > ACT_GO(halt);
> > - e_action_predef_name_set(_("System"), _("Off"), "halt",
> > + e_action_predef_name_set(_("System"), _("Power Off"), "halt",
> > NULL, NULL, 0);
> >
> > ACT_GO(reboot);
> >
> > Modified: trunk/e/src/bin/e_sys.c
> > ===================================================================
> > --- trunk/e/src/bin/e_sys.c 2009-01-22 18:33:23 UTC (rev 38697)
> > +++ trunk/e/src/bin/e_sys.c 2009-01-22 20:54:26 UTC (rev 38698)
> > @@ -363,7 +363,7 @@
> > _("Logout in progress"), "E", "_sys_logout");
> > e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/logout");
> > e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
> > - _("Logout is currently in progress.<br>"
> > + _("Logout in progress.<br>"
> > "<hilight>Please wait.</hilight>"));
> > e_obj_dialog_show(od);
> > e_obj_dialog_icon_set(od, "enlightenment/logout");
> > @@ -398,7 +398,7 @@
> > {
> > case E_SYS_LOGOUT:
> > e_dialog_text_set(dia,
> > - _("Enlightenment is busy logging out.<br>"
> > + _("Logging out.<br>"
> > "You cannot perform other system actions<br>"
> > "once a logout has begun.")
> > );
> > @@ -406,28 +406,28 @@
> > case E_SYS_HALT:
> > case E_SYS_HALT_NOW:
> > e_dialog_text_set(dia,
> > - _("Enlightenment is shutting the system down.<br>"
> > + _("Powering off.<br>"
> > "You cannot do any other system actions<br>"
> > "once a shutdown has been started.")
> > );
> > break;
> > case E_SYS_REBOOT:
> > e_dialog_text_set(dia,
> > - _("Enlightenment is rebooting the system.<br>"
> > + _("Resetting.<br>"
> > "You cannot do any other system actions<br>"
> > "once a reboot has begun.")
> > );
> > break;
> > case E_SYS_SUSPEND:
> > e_dialog_text_set(dia,
> > - _("Enlightenment is suspending the system.<br>"
> > + _("Suspending.<br>"
> > "Until suspend is complete you cannot
> > perform<br>" "any other system actions.")
> > );
> > break;
> > case E_SYS_HIBERNATE:
> > e_dialog_text_set(dia,
> > - _("Enlightenment is hibernating the system.<br>"
> > + _("Hibernating.<br>"
> > "You cannot perform an other system actions<br>"
> > "until this is complete.")
> > );
> > @@ -460,22 +460,22 @@
> > case E_SYS_HALT:
> > case E_SYS_HALT_NOW:
> > e_dialog_text_set(dia,
> > - _("Shutting down of your system failed.")
> > + _("Power off failed.")
> > );
> > break;
> > case E_SYS_REBOOT:
> > e_dialog_text_set(dia,
> > - _("Rebooting your system failed.")
> > + _("Reset failed.")
> > );
> > break;
> > case E_SYS_SUSPEND:
> > e_dialog_text_set(dia,
> > - _("Suspend of your system failed.")
> > + _("Suspend failed.")
> > );
> > break;
> > case E_SYS_HIBERNATE:
> > e_dialog_text_set(dia,
> > - _("Hibernating your system failed.")
> > + _("Hibernate failed.")
> > );
> > break;
> > default:
> > @@ -526,10 +526,10 @@
> > {
> > _e_sys_exe = ecore_exe_run(buf, NULL);
> > od = e_obj_dialog_new(e_container_current_get
> > (e_manager_current_get()),
> > - _("Shutting down"), "E", "_sys_halt");
> > + _("Power off"), "E", "_sys_halt");
> > e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/halt");
> > e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
> > - _("Shutting down your
> > Computer.<br>"
> > + _("Power off.<br>"
> > "<hilight>Please
> > wait.</hilight>")); e_obj_dialog_show(od);
> > e_obj_dialog_icon_set(od, "enlightenment/halt");
> > @@ -553,10 +553,10 @@
> > {
> > _e_sys_exe = ecore_exe_run(buf, NULL);
> > od = e_obj_dialog_new(e_container_current_get
> > (e_manager_current_get()),
> > - _("Rebooting"), "E", "_sys_reboot");
> > + _("Resetting"), "E", "_sys_reboot");
> > e_obj_dialog_obj_theme_set(od, "base/theme/sys",
> > "e/sys/reboot"); e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
> > - _("Rebooting your Computer.<br>"
> > + _("Resetting.<br>"
> > "<hilight>Please
> > wait.</hilight>")); e_obj_dialog_show(od);
> > e_obj_dialog_icon_set(od, "enlightenment/reboot");
> > @@ -582,7 +582,7 @@
> > _("Suspending"), "E", "_sys_suspend");
> > e_obj_dialog_obj_theme_set(od, "base/theme/sys",
> > "e/sys/suspend"); e_obj_dialog_obj_part_text_set(od, "e.textblock.message",
> > - _("Suspending your
> > Computer.<br>"
> > + _("Suspending.<br>"
> > "<hilight>Please
> > wait.</hilight>")); e_obj_dialog_show(od);
> > e_obj_dialog_icon_set(od, "enlightenment/suspend");
> > @@ -608,7 +608,7 @@
> > _("Hibernating"), "E", "_sys_hibernate");
> > e_obj_dialog_obj_theme_set(od, "base/theme/sys",
> > "e/sys/hibernate"); e_obj_dialog_obj_part_text_set(od,
> > "e.textblock.message",
> > - _("Hibernating your
> > Computer.<br>"
> > + _("Hibernating.<br>"
> > "<hilight>Please
> > wait.</hilight>")); e_obj_dialog_show(od);
> > e_obj_dialog_icon_set(od, "enlightenment/hibernate");
> >
> >
> > ------------------------------------------------------------------------------
> > This SF.net email is sponsored by:
> > SourcForge Community
> > SourceForge wants to tell your story.
> > http://p.sf.net/sfu/sf-spreadtheword
> > _______________________________________________
> > enlightenment-svn mailing list
> > enlightenment-...@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
> >
>
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by:
> SourcForge Community
> SourceForge wants to tell your story.
> http://p.sf.net/sfu/sf-spreadtheword
> _______________________________________________
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
------------- Codito, ergo sum - "I code, therefore I am" --------------
The Rasterman (Carsten Haitzler) ras...@rasterman.com
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
