Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_apps_error.c e_fdo_menu_to_order.c e_fm.c 
        e_int_config_exebuf.c e_int_config_intl.c e_int_config_shelf.c 
        e_int_config_wallpaper_import.c e_int_menus.c e_sys.c 


Log Message:


patches from people (see mail list) and stuff.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps_error.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_apps_error.c      4 Nov 2006 06:15:59 -0000       1.19
+++ e_apps_error.c      19 Nov 2006 08:58:05 -0000      1.20
@@ -56,41 +56,41 @@
    if ((app->del.exited) && (!cfdata->exit))
      {
        snprintf(buf, sizeof(buf), 
-                _("An exit code of %i was returned from %s"), 
app->del.exit_code, app->app->exe);
+                _("An exit code of %i was returned from %s."), 
app->del.exit_code, app->app->exe);
        cfdata->exit = strdup(buf);
      }
    if ((app->del.signalled) && (!cfdata->signal))
      {
        if (app->del.exit_signal == SIGINT)
          snprintf(buf, sizeof(buf),
-                  _("%s was interrupted by an Interrupt Signal"), 
app->app->exe);
+                  _("%s was interrupted by an Interrupt Signal."), 
app->app->exe);
        else if (app->del.exit_signal == SIGQUIT)
-         snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal"),
+         snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal."),
                   app->app->exe);
        else if (app->del.exit_signal == SIGABRT)
          snprintf(buf, sizeof(buf),
-                  _("%s was interrupted by an Abort Signal"), app->app->exe);
+                  _("%s was interrupted by an Abort Signal."), app->app->exe);
        else if (app->del.exit_signal == SIGFPE)
          snprintf(buf, sizeof(buf),
-                  _("%s was interrupted by a Floating Point Error"), 
app->app->exe);
+                  _("%s was interrupted by a Floating Point Error."), 
app->app->exe);
        else if (app->del.exit_signal == SIGKILL)
          snprintf(buf, sizeof(buf),
-                  _("%s was interrupted by an Uninterruptable Kill Signal"), 
app->app->exe);
+                  _("%s was interrupted by an Uninterruptable Kill Signal."), 
app->app->exe);
        else if (app->del.exit_signal == SIGSEGV)
          snprintf(buf, sizeof(buf),
-                  _("%s was interrupted by a Segmentation Fault"), 
app->app->exe);
+                  _("%s was interrupted by a Segmentation Fault."), 
app->app->exe);
        else if (app->del.exit_signal == SIGPIPE)
          snprintf(buf, sizeof(buf), 
-                  _("%s was interrupted by a Broken Pipe"), app->app->exe);
+                  _("%s was interrupted by a Broken Pipe."), app->app->exe);
        else if (app->del.exit_signal == SIGTERM)
          snprintf(buf, sizeof(buf),
-                  _("%s was interrupted by a Termination Singal"), 
app->app->exe);
+                  _("%s was interrupted by a Termination Signal."), 
app->app->exe);
        else if (app->del.exit_signal == SIGBUS)
          snprintf(buf, sizeof(buf), 
-                  _("%s was interrupted by a Bus Error"), app->app->exe);
+                  _("%s was interrupted by a Bus Error."), app->app->exe);
        else
          snprintf(buf, sizeof(buf),
-                  _("%s was interrupted by the signal number %i"),
+                  _("%s was interrupted by the signal number %i."),
                   app->app->exe, app->del.exit_signal);
        cfdata->signal = strdup(buf);
        /* FIXME: Add  sigchld_info stuff
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fdo_menu_to_order.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_fdo_menu_to_order.c       15 Nov 2006 00:15:05 -0000      1.26
+++ e_fdo_menu_to_order.c       19 Nov 2006 08:58:05 -0000      1.27
@@ -333,60 +333,60 @@
                       {
                          if (strstr(token, "Development") != NULL)
                            {
-                              cat = "Programming";
+                              cat = _("Programming");
                            }
                          else if (strstr(token, "Game") != NULL)
                            {
-                              cat = "Games";
+                              cat = _("Games");
                            }
                          else if ((strstr(token, "AudioVideo") != NULL) ||
                                   (strstr(token, "Sound") != NULL) || 
(strstr(token, "Video") != NULL) || (strstr(token, "Multimedia") != NULL))
                            {
-                              cat = "Multimedia";
+                              cat = _("Multimedia");
                            }
                          else if (strstr(token, "Net") != NULL)
                            {
-                              cat = "Internet";
+                              cat = _("Internet");
                            }
                          else if (strstr(token, "Education") != NULL)
                            {
-                              cat = "Edutainment";
+                              cat = _("Edutainment");
                            }
                          else if (strstr(token, "Amusement") != NULL)
                            {
-                              cat = "Toys";
+                              cat = _("Toys");
                            }
                          else if (strstr(token, "System") != NULL)
                            {
-                              cat = "System";
+                              cat = _("System");
                            }
                          else if ((strstr(token, "Shells") != NULL) || 
(strstr(token, "Utility") != NULL) || (strstr(token, "Tools") != NULL))
                            {
-                              cat = "Utilities";
+                              cat = _("Utilities");
                            }
                          else if ((strstr(token, "Viewers") != NULL) || 
(strstr(token, "Editors") != NULL) || (strstr(token, "Text") != NULL))
                            {
-                              cat = "Editors";
+                              cat = _("Editors");
                            }
                          else if (strstr(token, "Graphics") != NULL)
                            {
-                              cat = "Graphics";
+                              cat = _("Graphics");
                            }
                          else if ((strstr(token, "WindowManagers") != NULL) || 
(strstr(token, "Core") != NULL))
                            {
-                              cat = "Core";
+                              cat = _("Core");
                            }
                          else if ((strstr(token, "Settings") != NULL) || 
(strstr(token, "Accessibility") != NULL))
                            {
-                              cat = "Settings";
+                              cat = _("Settings");
                            }
                          else if (strstr(token, "Office") != NULL)
                            {
-                              cat = "Office";
+                              cat = _("Office");
                            }
                          else
                            {
-                              cat = "Core";
+                              cat = _("Core");
                            }
                       }
                     token = strtok(NULL, ":");
@@ -397,7 +397,7 @@
            }
       }
    if (!cat)
-      cat = "Core";
+      cat = _("Core");
    return strdup(cat);
 }
 
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- e_fm.c      19 Nov 2006 03:43:18 -0000      1.113
+++ e_fm.c      19 Nov 2006 08:58:05 -0000      1.114
@@ -413,6 +413,7 @@
    _e_fm2_queue_free(obj);
    _e_fm2_regions_free(obj);
    _e_fm2_icons_free(obj);
+   edje_object_part_text_set(sd->overlay, "e.text.busy_label", "");
    
    _e_fm2_scan_start(obj);
    evas_object_smart_callback_call(obj, "dir_changed", NULL);
@@ -4923,8 +4924,9 @@
      {
        snprintf(text, sizeof(text), 
                 _("Are you sure you want to delete<br>"
-                  "the selected files in:<br>"
+                  "the %d selected files in:<br>"
                   "<hilight>%s</hilight> ?"),
+                evas_list_count(sel),
                 ic->sd->realpath);
      }
    if (sel) evas_list_free(sel);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_exebuf.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_int_config_exebuf.c       4 Nov 2006 13:03:13 -0000       1.9
+++ e_int_config_exebuf.c       19 Nov 2006 08:58:05 -0000      1.10
@@ -108,7 +108,7 @@
    o = e_widget_list_add(evas, 0, 0);
 
    of = e_widget_framelist_add(evas, _("General Settings"), 0);
-   ob = e_widget_label_add(evas, _("Maximum Number of Matched Eaps to List"));
+   ob = e_widget_label_add(evas, _("Maximum Number of Matched Apps to List"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, 
&(cfdata->max_eap_list), 200);
    e_widget_framelist_object_append(of, ob);   
@@ -164,7 +164,7 @@
    ot = e_widget_table_add(evas, 0);
 
    of = e_widget_framelist_add(evas, _("General Settings"), 0);
-   ob = e_widget_label_add(evas, _("Maximum Number of Matched Eaps to List"));
+   ob = e_widget_label_add(evas, _("Maximum Number of Matched Apps to List"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, 
&(cfdata->max_eap_list), 200);
    e_widget_framelist_object_append(of, ob);   
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_intl.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_int_config_intl.c 16 Nov 2006 14:25:22 -0000      1.16
+++ e_int_config_intl.c 19 Nov 2006 08:58:05 -0000      1.17
@@ -319,7 +319,7 @@
        { "CD", N_("Congo")},
        { "CK", N_("Cook Islands")},
        { "CR", N_("Costa Rica")},
-       { "CI", N_("Cote D'ivoire")},
+       { "CI", N_("Cote d'Ivoire")},
        { "HR", N_("Croatia")},
        { "CU", N_("Cuba")},
        { "CY", N_("Cyprus")},
@@ -357,11 +357,11 @@
        { "GT", N_("Guatemala")},
        { "GG", N_("Guernsey")},
        { "GN", N_("Guinea")},
-       { "GW", N_("Guinea-bissau")},
+       { "GW", N_("Guinea-Bissau")},
        { "GY", N_("Guyana")},
        { "HT", N_("Haiti")},
        { "HM", N_("Heard Island and Mcdonald Islands")},
-       { "VA", N_("Holy See (vatican City State)")},
+       { "VA", N_("Holy See (Vatican City State)")},
        { "HN", N_("Honduras")},
        { "HK", N_("Hong Kong")},
        { "HU", N_("Hungary")},
@@ -481,7 +481,7 @@
        { "TJ", N_("Tajikistan")},
        { "TZ", N_("Tanzania")},
        { "TH", N_("Thailand")},
-       { "TL", N_("Timor-leste")},
+       { "TL", N_("Timor-Leste")},
        { "TG", N_("Togo")},
        { "TK", N_("Tokelau")},
        { "TO", N_("Tonga")},
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_shelf.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_int_config_shelf.c        30 Oct 2006 10:42:23 -0000      1.26
+++ e_int_config_shelf.c        19 Nov 2006 08:58:05 -0000      1.27
@@ -125,8 +125,8 @@
        if (!es) continue;
        
        label = es->name;
-       if (!label) label = "shelf";
-       snprintf(buf, sizeof(buf), "%s #%i", label, es->id);
+       if (!label) label = _("Shelf #");
+       snprintf(buf, sizeof(buf), "%s %i", label, es->id);
        
        ob = edje_object_add(evas);
         switch(es->cfg->orient)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_int_config_wallpaper_import.c     17 Nov 2006 15:04:52 -0000      1.28
+++ e_int_config_wallpaper_import.c     19 Nov 2006 08:58:05 -0000      1.29
@@ -547,7 +547,7 @@
                       e_util_dialog_show(_("Wallpaper Import Error"),
                                          _("Enlightenment was unable to "
                                            "import the wallpaper<br>due to a "
-                                           "copy error"));
+                                           "copy error."));
                       return;
                    }
                  else 
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -3 -r1.185 -r1.186
--- e_int_menus.c       16 Nov 2006 17:44:20 -0000      1.185
+++ e_int_menus.c       19 Nov 2006 08:58:05 -0000      1.186
@@ -1213,8 +1213,8 @@
        if (s->cfg->container != con->num) continue;
        
        name = s->name;
-       if (!name) name = "shelf";      
-       snprintf(buf, sizeof(buf), "%s #%i", name, s->id);
+       if (!name) name = _("Shelf #"); 
+       snprintf(buf, sizeof(buf), "%s %i", name, s->id);
 
        mi = e_menu_item_new(m);
        e_menu_item_label_set(mi, buf);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_sys.c     28 Oct 2006 01:30:31 -0000      1.7
+++ e_sys.c     19 Nov 2006 08:58:05 -0000      1.8
@@ -350,7 +350,7 @@
      {
       case E_SYS_LOGOUT:
        e_dialog_text_set(dia, 
-                         _("Enlightenment is busy logging out<br>"
+                         _("Enlightenment is busy logging out.<br>"
                            "You cannot perform other system actions<br>"
                            "once a logout has begun.")
                          );



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to