Better gettext usage in a few places

SVN revision: 82293

diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 87f16d0..2a6ba3d 100644 (file)
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1618,7 +1618,7 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
         if (es->zone->num != zone->num) continue;
         if (es->cfg->container != (int)con->num) continue;
 
-        snprintf(buf, sizeof(buf), "%s %s", _("Shelf"),
+        snprintf(buf, sizeof(buf), _("Shelf %s"),
                  e_shelf_orient_string_get(es));
 
         mi = e_menu_item_new(m);

diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 3de432d..1cf5080 100644 (file)
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -202,7 +202,6 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, E
 {
    E_Shelf *es;
    char buf[1024];
-   const char *locname;
 
    es = E_OBJECT_ALLOC(E_Shelf, E_SHELF_TYPE, _e_shelf_free);
    if (!es) return NULL;
@@ -263,9 +262,10 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, E
 
    es->gadcon = 
      e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content");
-   locname = es->name;
-   if (!name) locname = _("Shelf #");
-   snprintf(buf, sizeof(buf), "%s %i", locname, es->id);
+   if (es->name)
+     snprintf(buf, sizeof(buf), "%s", es->name);
+   else
+     snprintf(buf, sizeof(buf), _("Shelf #%d"), es->id);
    es->gadcon->location = 
      e_gadcon_location_new(buf, E_GADCON_SITE_SHELF, 
                            _e_shelf_gadcon_client_add, es, 
@@ -1118,7 +1118,7 @@ e_shelf_new_dialog(E_Zone *zone)
 {
    char buf[256];
 
-   snprintf(buf, sizeof(buf), "%s #%d", _("Shelf"), eina_list_count(e_config->shelves));
+   snprintf(buf, sizeof(buf), _("Shelf #%d"), eina_list_count(e_config->shelves));
    return e_entry_dialog_show(_("Add New Shelf"), "preferences-desktop-shelf",
                                _("Name:"), buf, NULL, NULL,
                                _e_shelf_new_dialog_ok, NULL, zone);
@@ -1633,7 +1633,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
    if (es->name)
      snprintf(buf, sizeof(buf), "%s", es->name);
    else
-     snprintf(buf, sizeof(buf), "%s %s", _("Shelf"), 
+     snprintf(buf, sizeof(buf), _("Shelf %s"),
               e_shelf_orient_string_get(es));
 
    e_shelf_locked_set(es, 1);

diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index 760d3f2..be3c331 100644 (file)
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -63,7 +63,7 @@ _e_startup(void)
         return;
      }
    e_exec(NULL, desktop, NULL, NULL, NULL);
-   snprintf(buf, sizeof(buf), "%s %s", _("Starting"), desktop->name);
+   snprintf(buf, sizeof(buf), _("Starting %s"), desktop->name);
    e_init_status_set(buf);
    ecore_job_add(_e_startup_next_cb, NULL);
 }

diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index 251bb5c..1058744 100644 (file)
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -124,7 +124,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    
    ol = e_widget_list_add(evas, 0, 0);
    zone = cfdata->cfd->dia->win->border ? cfdata->cfd->dia->win->border->zone : e_zone_current_get(cfdata->cfd->con);
-   snprintf(buf, sizeof(buf), "%s %d", _("Configured Shelves: Display"), zone->num);
+   snprintf(buf, sizeof(buf), _("Configured Shelves: Display %d"), zone->num);
    of = e_widget_framelist_add(evas, buf, 0);
    cfdata->o_list = e_widget_ilist_add(evas, 24, 24, &(cfdata->cur_shelf));
    e_widget_size_min_set(cfdata->o_list, (140 * e_scale), (80 * e_scale));
@@ -188,7 +188,7 @@ _ilist_item_new(E_Config_Dialog_Data *cfdata, Eina_Bool append, E_Shelf *es)
    if (es->name)
      snprintf(buf, sizeof(buf), "%s", es->name);
    else
-     snprintf(buf, sizeof(buf), "%s %s", _("Shelf"), e_shelf_orient_string_get(es));
+     snprintf(buf, sizeof(buf), _("Shelf %s"), e_shelf_orient_string_get(es));
    e_object_del_func_set(E_OBJECT(es), (E_Object_Cleanup_Func)_ilist_refresh);
 
    ob = e_icon_add(evas_object_evas_get(cfdata->o_list));