diff options
149 files changed, 1945 insertions, 2459 deletions
diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index d0219e03b5..258fcbd4bc 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/ea-minicard.c @@ -240,7 +240,7 @@ static gboolean atk_action_interface_do_action (AtkAction *iface, gint i) return FALSE; switch (i) { - // open card + /* open card */ case 0: e_minicard_activate_editor (minicard); break; diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index 16d50df9b0..e28d0f6b83 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -760,7 +760,7 @@ enum { ETI_HEADER_UNCHANGED = 0, ETI_HEADER_REORDERED, ETI_HEADER_NEW_ADDED, - ETI_HEADER_REMOVED, + ETI_HEADER_REMOVED }; /* diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 6340b999f4..c939b9cd27 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -207,7 +207,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ category->name[i][j] = '\0'; } - //find a desktop id that is not in use between 128 and 255 + /* find a desktop id that is not in use between 128 and 255 */ /* XXX desktopUniqueID should really be used for tracking * categories across renaming operations, but as Evo * doesn't have a concept of category UIDs or renaming, @@ -266,7 +266,7 @@ void e_pilot_local_category_to_remote(int * pilotCategory, } l = c_list; while(l && *pilotCategory == 0) { - //list != 0, so at least 1 category is assigned + /* list != 0, so at least 1 category is assigned */ category_string = e_pilot_utf8_to_pchar((const char *)l->data); for (i=0; i < PILOT_MAX_CATEGORIES; i++) { /* only 15 chars + nul in palm category name */ diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index 04b44cd872..6ea33f1656 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -29,7 +29,7 @@ typedef enum { ADDRESSBOOK_LDAP_AUTH_NONE, ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL, - ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN, + ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN } AddressbookLDAPAuthType; typedef enum { diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 53560e87d9..2f77fc4e50 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -479,7 +479,7 @@ set_status_message (EABView *eav, const char *message, AddressbookView *view) priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *clientid = g_strdup_printf ("%p", view); + char *clientid = g_strdup_printf ("%p", (gpointer) view); priv->activity_id = e_activity_handler_operation_started ( activity_handler, clientid, message, TRUE); diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 8fec8b315d..80fb7514a1 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -126,7 +126,7 @@ struct _EContactListEditorPrivate { #define VCARD_TYPE "text/x-vcard" enum { - TARGET_TYPE_VCARD, + TARGET_TYPE_VCARD }; static GtkTargetEntry targets[] = { diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 7273689fd1..73518fc0b2 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -47,7 +47,7 @@ enum { PROP_0, PROP_BOOK, PROP_QUERY, - PROP_EDITABLE, + PROP_EDITABLE }; enum { diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 1f2b1aad7a..d2c20722ef 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -50,7 +50,7 @@ enum { PROP_BOOK, PROP_QUERY, PROP_EDITABLE, - PROP_MODEL, + PROP_MODEL }; enum { diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 3c0c28f6ad..9fdb15eac9 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -111,7 +111,7 @@ enum { PROP_BOOK, PROP_SOURCE, PROP_QUERY, - PROP_TYPE, + PROP_TYPE }; enum { @@ -149,7 +149,7 @@ static GalViewCollection *collection = NULL; enum { ESB_FULL_NAME, ESB_EMAIL, - ESB_ANY, + ESB_ANY }; #if 0 diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index c9ac35d2fa..799e01a792 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -55,7 +55,7 @@ struct _EABMenuTargetSelect; typedef enum { EAB_VIEW_NONE, /* initialized to this */ EAB_VIEW_MINICARD, - EAB_VIEW_TABLE, + EAB_VIEW_TABLE } EABViewType; diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 59b1705764..6e593f1fb8 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -45,7 +45,7 @@ struct _EABConfigClass { }; enum _eab_config_target_t { - EAB_CONFIG_TARGET_SOURCE, + EAB_CONFIG_TARGET_SOURCE }; typedef struct _EABConfigTargetSource EABConfigTargetSource; diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 168c0bb7fa..49bcde21f6 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -839,16 +839,18 @@ eab_send_to_contact_and_email_num_list (GList *contact_list) * arrays are really the best argument type for passing a list of * destinations to the header table. */ - /* Add "To" destinations. */ + /* Set "To" destinations. */ convert.pdata = to_array->pdata; e_composer_header_table_set_destinations_to ( table, convert.destinations); g_ptr_array_free (to_array, FALSE); e_destination_freev (convert.destinations); - /* Add "Bcc" destinations. */ + /* Add "Bcc" destinations. + * Add destinations instead of setting, so we don't remove + * automatic BCC addresses that have already been added. */ convert.pdata = bcc_array->pdata; - e_composer_header_table_set_destinations_bcc ( + e_composer_header_table_add_destinations_bcc ( table, convert.destinations); g_ptr_array_free (bcc_array, FALSE); e_destination_freev (convert.destinations); diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 79dbe5493a..4cab9b36b0 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -66,7 +66,7 @@ void eab_contact_list_save (char *title, typedef enum { EAB_DISPOSITION_AS_ATTACHMENT, - EAB_DISPOSITION_AS_TO, + EAB_DISPOSITION_AS_TO } EABDisposition; void eab_send_contact (EContact *contact, diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h index 7da05c133b..380346651b 100644 --- a/addressbook/gui/widgets/eab-menu.h +++ b/addressbook/gui/widgets/eab-menu.h @@ -40,7 +40,7 @@ typedef struct _EABMenuClass EABMenuClass; /* Current target description */ enum _eab_menu_target_t { - EAB_MENU_TARGET_SELECT, + EAB_MENU_TARGET_SELECT }; /** @@ -57,7 +57,7 @@ enum _eab_menu_target_select_t { EAB_MENU_SELECT_MANY = 1<<1, EAB_MENU_SELECT_ANY = 1<<2, EAB_MENU_SELECT_EDITABLE = 1<<3, - EAB_MENU_SELECT_EMAIL = 1<<4, + EAB_MENU_SELECT_EMAIL = 1<<4 }; typedef struct _EABMenuTargetSelect EABMenuTargetSelect; diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h index 933c815af8..b86cc12a99 100644 --- a/addressbook/gui/widgets/eab-popup.h +++ b/addressbook/gui/widgets/eab-popup.h @@ -50,7 +50,7 @@ enum _eab_popup_target_t { EAB_POPUP_TARGET_SELECT, EAB_POPUP_TARGET_URI, EAB_POPUP_TARGET_SOURCE, - EAB_POPUP_TARGET_SELECT_NAMES, + EAB_POPUP_TARGET_SELECT_NAMES }; /** @@ -69,13 +69,13 @@ enum _eab_popup_target_select_t { EAB_POPUP_SELECT_EDITABLE = 1<<3, EAB_POPUP_SELECT_EMAIL = 1<<4, EAB_POPUP_LIST = 1<<5, - EAB_POPUP_CONTACT = 1<<6, + EAB_POPUP_CONTACT = 1<<6 }; enum _eab_popup_target_uri_t { EAB_POPUP_URI_HTTP = 1<<0, EAB_POPUP_URI_MAILTO = 1<<1, - EAB_POPUP_URI_NOT_MAILTO = 1<<2, + EAB_POPUP_URI_NOT_MAILTO = 1<<2 }; /** * enum _eab_popup_target_source_t - EABPopupTargetSource qualifiers. @@ -87,7 +87,7 @@ enum _eab_popup_target_uri_t { enum _eab_popup_target_source_t { EAB_POPUP_SOURCE_PRIMARY = 1<<0, EAB_POPUP_SOURCE_SYSTEM = 1<<1, /* system folder */ - EAB_POPUP_SOURCE_USER = 1<<2, /* user folder (!system) */ + EAB_POPUP_SOURCE_USER = 1<<2 /* user folder (!system) */ }; typedef struct _EABPopupTargetSelect EABPopupTargetSelect; diff --git a/autogen.sh b/autogen.sh index 4b51a10c76..267560d8a9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,9 +1,6 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - srcdir=`dirname $0` test -z "$srcdir" && srcdir=. diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index e7e5f57506..b9b6b3449c 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -1631,7 +1631,7 @@ pre_sync (GnomePilotConduit *conduit, pi_buffer_free(buffer); #endif unpack_AppointmentAppInfo (&(ctxt->ai), buf, len); - //unpack_CategoryAppInfo (&(ctxt->ai.category), buf, len); + /* unpack_CategoryAppInfo (&(ctxt->ai.category), buf, len); */ g_free (buf); check_for_slow_setting (conduit, ctxt); diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c index fbbe0278b1..59f411da69 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.c +++ b/calendar/conduits/common/libecalendar-common-conduit.c @@ -93,7 +93,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ category->name[i][j] = '\0'; } - //find a desktop id that is not in use between 128 and 255 + /* find a desktop id that is not in use between 128 and 255 */ for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) { int found = 0; for(j=0; j<PILOT_MAX_CATEGORIES; j++){ @@ -133,7 +133,7 @@ void e_pilot_local_category_to_remote(int * pilotCategory, ECalComponent *comp, int i; e_cal_component_get_categories_list (comp, &c_list); if (c_list) { - //list != 0, so at least 1 category is assigned + /* list != 0, so at least 1 category is assigned */ category_string = e_pilot_utf8_to_pchar((const char *)c_list->data); if (c_list->next != 0) { LOG (g_message ("Note: item has more categories in evolution, first chosen")); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index f40bc82eab..7639291504 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -1013,7 +1013,7 @@ pre_sync (GnomePilotConduit *conduit, /* Get the default component */ if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL)) return -1; - LOG (g_message ( " Got default component: %p", icalcomp)); + LOG (g_message (" Got default component: %p", (gpointer) icalcomp)); ctxt->default_comp = e_cal_component_new (); if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) { diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade index d65ed5efe6..e1e25bdb00 100644 --- a/calendar/gui/alarm-notify/alarm-notify.glade +++ b/calendar/gui/alarm-notify/alarm-notify.glade @@ -415,7 +415,7 @@ translatable="yes">Dismiss _All</property> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index f3167d813c..e7be5554b8 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -34,7 +34,6 @@ #include <bonobo/bonobo-main.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libgnome/gnome-exec.h> #include <libgnome/gnome-sound.h> #include <libecal/e-cal-time-util.h> @@ -1541,7 +1540,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, g_signal_connect (G_OBJECT (tray_data->query), "objects_removed", G_CALLBACK (on_dialog_objs_removed_cb), tray_data); - // FIXME: We should remove this check + /* FIXME: We should remove this check */ if (!config_data_get_notify_with_tray ()) { tray_blink_id = -1; open_alarm_dialog (tray_data); @@ -1759,7 +1758,7 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id icalattach *attach; const char *url; char *cmd; - int result; + gboolean result = TRUE; d(printf("%s:%d (procedure_notification)\n",__FILE__, __LINE__)); @@ -1793,9 +1792,8 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id else cmd = (char *) url; - result = 0; if (procedure_notification_dialog (cmd, url)) - result = gnome_execute_shell (NULL, cmd); + result = g_spawn_command_line_async (cmd, NULL); if (cmd != (char *) url) g_free (cmd); @@ -1803,7 +1801,7 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id icalattach_unref (attach); /* Fall back to display notification if we got an error */ - if (result < 0) + if (result == FALSE) goto fallback; return; @@ -1813,8 +1811,6 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id display_notification (trigger, cqa, alarm_id, FALSE); } - - static gboolean check_midnight_refresh (gpointer user_data) { diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 4d30929272..078c854b98 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -73,7 +73,7 @@ #define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade index 87e69d74c5..9f2617db04 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.glade +++ b/calendar/gui/dialogs/cal-prefs-dialog.glade @@ -114,24 +114,6 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="daylight_cb"> - <property name="label" translatable="yes">Adjust for daylight sa_ving time</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> <widget class="GtkHBox" id="hbox4"> <property name="visible">True</property> <property name="spacing">6</property> @@ -177,24 +159,6 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="daylight_cb1"> - <property name="label" translatable="yes">Adjust for daylight sa_ving time</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> <widget class="Custom" id="timezone"> <property name="visible">True</property> <property name="creation_function">make_timezone_entry</property> diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 4af998eb26..2a1513327e 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -197,7 +197,7 @@ get_attachment_list (CompEditor *editor) EAttachmentView *view; GtkTreeModel *model; GtkTreeIter iter; - GSList *parts = NULL, *list = NULL; + GSList *list = NULL; const char *comp_uid = NULL; const char *local_store = e_cal_get_local_attachment_store (editor->priv->client); gboolean valid; @@ -282,8 +282,6 @@ get_attachment_list (CompEditor *editor) g_free (filename); } - if (parts) - g_slist_free (parts); return list; } diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index dfc33fbbc4..cd54c65c08 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -209,7 +209,7 @@ static void update_end_time_combo ( EventPage *epage); static void event_page_select_organizer (EventPage *epage, const char *backend_address); static void set_subscriber_info_string (EventPage *epage, const char *backend_address); -G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE); +G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE) static void event_page_dispose (GObject *object) @@ -1885,7 +1885,7 @@ enum { ATTENDEE_CAN_DELEGATE = 1<<1, ATTENDEE_CAN_DELETE = 1<<2, ATTENDEE_CAN_ADD = 1<<3, - ATTENDEE_LAST = 1<<4, + ATTENDEE_LAST = 1<<4 }; static EPopupItem context_menu_items[] = { diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 959c275443..86a39aad24 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -77,7 +77,7 @@ typedef enum { PRIORITY_HIGH, PRIORITY_NORMAL, PRIORITY_LOW, - PRIORITY_UNDEFINED, + PRIORITY_UNDEFINED } TaskEditorPriority; static const int priority_map[] = { diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index c3a8e34ba0..fc0c2330bf 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -1195,7 +1195,7 @@ enum { ATTENDEE_CAN_DELEGATE = 1<<1, ATTENDEE_CAN_DELETE = 1<<2, ATTENDEE_CAN_ADD = 1<<3, - ATTENDEE_LAST = 1<<4, + ATTENDEE_LAST = 1<<4 }; static EPopupItem context_menu_items[] = { diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index 8af6313b5b..8f27cbd2f2 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -47,7 +47,7 @@ struct _ECalConfigClass { enum _e_cal_config_target_t { EC_CONFIG_TARGET_SOURCE, - EC_CONFIG_TARGET_PREFS, + EC_CONFIG_TARGET_PREFS }; typedef struct _ECalConfigTargetSource ECalConfigTargetSource; diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h index 4fbaa394ec..a77d2a147f 100644 --- a/calendar/gui/e-cal-event.h +++ b/calendar/gui/e-cal-event.h @@ -37,12 +37,12 @@ typedef struct _ECalEvent ECalEvent; typedef struct _ECalEventClass ECalEventClass; enum _e_cal_event_target_t { - E_CAL_EVENT_TARGET_COMPONENT, + E_CAL_EVENT_TARGET_COMPONENT }; /* Flags that describe TARGET_COMPONENT */ enum { - E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0, + E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0 }; typedef struct _ECalEventTargetComponent ECalEventTargetComponent; diff --git a/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c index efa8b9b7fb..6c930b1b61 100644 --- a/calendar/gui/e-cal-list-view-config.c +++ b/calendar/gui/e-cal-list-view-config.c @@ -32,7 +32,7 @@ struct _ECalListViewConfigPrivate { /* Property IDs */ enum props { PROP_0, - PROP_VIEW, + PROP_VIEW }; G_DEFINE_TYPE (ECalListViewConfig, e_cal_list_view_config, G_TYPE_OBJECT) diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index cc9ae353cd..0702d3a297 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -42,7 +42,6 @@ #include <table/e-cell-combo.h> #include <misc/e-popup-menu.h> #include <misc/e-cell-date-edit.h> -#include <libgnome/gnome-exec.h> #include <e-util/e-categories-config.h> #include <e-util/e-dialog-utils.h> #include <e-util/e-util-private.h> diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index 30962d9a1a..9c37a6a9ae 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -39,7 +39,7 @@ typedef struct _ECalMenuClass ECalMenuClass; /* Current target description */ /* Types of popup tagets */ enum _e_cal_menu_target_t { - E_CAL_MENU_TARGET_SELECT, + E_CAL_MENU_TARGET_SELECT }; /** @@ -73,7 +73,7 @@ enum _e_cal_menu_target_select_t { E_CAL_MENU_SELECT_ASSIGNABLE = 1<<10, E_CAL_MENU_SELECT_HASURL = 1<<11, - E_CAL_MENU_SELECT_NOTCOMPLETE = 1<<12, + E_CAL_MENU_SELECT_NOTCOMPLETE = 1<<12 }; typedef struct _ECalMenuTargetSelect ECalMenuTargetSelect; diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index 34874efdba..185e9877f0 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -50,7 +50,7 @@ struct _ECalendarView; enum _e_cal_popup_target_t { E_CAL_POPUP_TARGET_SELECT, E_CAL_POPUP_TARGET_SOURCE, - E_CAL_POPUP_TARGET_ATTACHMENTS, + E_CAL_POPUP_TARGET_ATTACHMENTS }; /** @@ -89,7 +89,7 @@ enum _e_cal_popup_target_select_t { E_CAL_POPUP_SELECT_ACCEPTABLE = 1<<14, E_CAL_POPUP_SELECT_NOTCOMPLETE = 1<<15, E_CAL_POPUP_SELECT_NOSAVESCHEDULES = 1<<16, - E_CAL_POPUP_SELECT_COMPLETE = 1<<17, + E_CAL_POPUP_SELECT_COMPLETE = 1<<17 }; /** @@ -121,7 +121,7 @@ enum _e_cal_popup_target_attachments_t { E_CAL_POPUP_ATTACHMENTS_MANY = 1<<1, /* one or more selected */ E_CAL_POPUP_ATTACHMENTS_MODIFY = 1<<2, /* check for modify operation */ E_CAL_POPUP_ATTACHMENTS_MULTIPLE = 1<<3, - E_CAL_POPUP_ATTACHMENTS_IMAGE = 1<<4, + E_CAL_POPUP_ATTACHMENTS_IMAGE = 1<<4 }; typedef struct _ECalPopupTargetSelect ECalPopupTargetSelect; diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index ddf96d00f2..d032066f86 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -1882,7 +1882,7 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes cal_table->activity_id = 0; } } else if (cal_table->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", cal_table); + char *client_id = g_strdup_printf ("%p", (gpointer) cal_table); cal_table->activity_id = e_activity_handler_operation_started ( cal_table->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 6c8e1f83ab..a99149ae2e 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -85,7 +85,7 @@ extern ECompEditorRegistry *comp_editor_registry; /* Property IDs */ enum props { PROP_0, - PROP_MODEL, + PROP_MODEL }; /* FIXME Why are we emitting these event signals here? Can't the model just be listened to? */ @@ -567,7 +567,7 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", cal_view); + char *client_id = g_strdup_printf ("%p", (gpointer) cal_view); priv->activity_id = e_activity_handler_operation_started ( priv->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c index e2a9cc6eb2..5be8569bd3 100644 --- a/calendar/gui/e-cell-date-edit-config.c +++ b/calendar/gui/e-cell-date-edit-config.c @@ -35,7 +35,7 @@ struct _ECellDateEditConfigPrivate { /* Property IDs */ enum props { PROP_0, - PROP_CELL, + PROP_CELL }; G_DEFINE_TYPE (ECellDateEditConfig, e_cell_date_edit_config, G_TYPE_OBJECT) diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c index 16732305ec..d6fd6cf675 100644 --- a/calendar/gui/e-date-edit-config.c +++ b/calendar/gui/e-date-edit-config.c @@ -32,7 +32,7 @@ struct _EDateEditConfigPrivate { /* Property IDs */ enum props { PROP_0, - PROP_EDIT, + PROP_EDIT }; G_DEFINE_TYPE (EDateEditConfig, e_date_edit_config, G_TYPE_OBJECT) diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c index b7acf6541f..44156bf18e 100644 --- a/calendar/gui/e-day-view-config.c +++ b/calendar/gui/e-day-view-config.c @@ -32,7 +32,7 @@ struct _EDayViewConfigPrivate { /* Property IDs */ enum props { PROP_0, - PROP_VIEW, + PROP_VIEW }; G_DEFINE_TYPE (EDayViewConfig, e_day_view_config, G_TYPE_OBJECT) diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index af812edb31..96bc63d592 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -38,7 +38,6 @@ #include <misc/e-unicode.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <glib/gi18n.h> -#include <libgnome/gnome-exec.h> #include <e-util/e-categories-config.h> #include <e-util/e-dialog-utils.h> diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 25c8a86b97..4bf44eb6e1 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -32,7 +32,6 @@ #include <string.h> #include <time.h> #include <gdk/gdkkeysyms.h> -#include <libgnomeui/gnome-dateedit.h> #include <glib/gi18n.h> #include <libgnomecanvas/gnome-canvas-widget.h> diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 260103ada0..067a87bf29 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -1130,7 +1130,7 @@ e_memo_table_set_status_message (EMemoTable *memo_table, const gchar *message) memo_table->activity_id = 0; } } else if (memo_table->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", memo_table); + char *client_id = g_strdup_printf ("%p", (gpointer) memo_table); memo_table->activity_id = e_activity_handler_operation_started ( memo_table->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 3e5c42725f..eaa6a3a47c 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -35,7 +35,6 @@ #include <math.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include <libgnome/gnome-exec.h> #include <libgnomecanvas/gnome-canvas-pixbuf.h> #include <text/e-text.h> #include <misc/e-canvas-utils.h> @@ -3813,10 +3812,16 @@ static gint map_right[] = {3, 4, 5, 3, 4, 5, 6}; static void e_week_view_do_cursor_key_up (EWeekView *week_view) { - if (week_view->selection_start_day <= 0) + if (week_view->selection_start_day == -1) return; week_view->selection_start_day--; + + if (week_view->selection_start_day < 0) { + e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_UP); + week_view->selection_start_day = 6; + } + week_view->selection_end_day = week_view->selection_start_day; g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); @@ -3825,11 +3830,16 @@ e_week_view_do_cursor_key_up (EWeekView *week_view) static void e_week_view_do_cursor_key_down (EWeekView *week_view) { - if (week_view->selection_start_day == -1 || - week_view->selection_start_day >= 6) + if (week_view->selection_start_day == -1) return; week_view->selection_start_day++; + + if (week_view->selection_start_day > 6) { + e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_DOWN); + week_view->selection_start_day = 0; + } + week_view->selection_end_day = week_view->selection_start_day; g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); @@ -3862,11 +3872,23 @@ e_week_view_do_cursor_key_right (EWeekView *week_view) static void e_month_view_do_cursor_key_up (EWeekView *week_view) { - if (week_view->selection_start_day < 7) + if (week_view->selection_start_day == -1) return; - week_view->selection_start_day -= 7; - week_view->selection_end_day = week_view->selection_start_day; + if (week_view->selection_start_day < 7) { + /* no easy way to calculate new selection_start_day, therefore + * calculate a time_t value and set_selected_time_range */ + time_t current; + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_week(current,-1); + e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP); + e_week_view_set_selected_time_range_visible(week_view,current,current); + } + } else { + week_view->selection_start_day -= 7; + week_view->selection_end_day = week_view->selection_start_day; + } + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3876,12 +3898,23 @@ e_month_view_do_cursor_key_down (EWeekView *week_view) { gint weeks_shown = e_week_view_get_weeks_shown (week_view); - if (week_view->selection_start_day == -1 || - week_view->selection_start_day >= (weeks_shown - 1) * 7) + if (week_view->selection_start_day == -1) return; - week_view->selection_start_day += 7; - week_view->selection_end_day = week_view->selection_start_day; + if (week_view->selection_start_day >= (weeks_shown - 1) * 7) { + /* no easy way to calculate new selection_start_day, therefore + * calculate a time_t value and set_selected_time_range */ + time_t current; + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_week(current,1); + e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN); + e_week_view_set_selected_time_range_visible(week_view,current,current); + } + } else { + week_view->selection_start_day += 7; + week_view->selection_end_day = week_view->selection_start_day; + } + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3889,11 +3922,23 @@ e_month_view_do_cursor_key_down (EWeekView *week_view) static void e_month_view_do_cursor_key_left (EWeekView *week_view) { - if (week_view->selection_start_day <= 0) + if (week_view->selection_start_day == -1) return; - week_view->selection_start_day--; - week_view->selection_end_day = week_view->selection_start_day; + if (week_view->selection_start_day == 0) { + /* no easy way to calculate new selection_start_day, therefore + * calculate a time_t value and set_selected_time_range */ + time_t current; + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_day(current,-1); + e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP); + e_week_view_set_selected_time_range_visible(week_view,current,current); + } + } else { + week_view->selection_start_day--; + week_view->selection_end_day = week_view->selection_start_day; + } + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3903,12 +3948,23 @@ e_month_view_do_cursor_key_right (EWeekView *week_view) { gint weeks_shown = e_week_view_get_weeks_shown (week_view); - if (week_view->selection_start_day == -1 || - week_view->selection_start_day >= weeks_shown * 7 - 1) + if (week_view->selection_start_day == -1) return; - week_view->selection_start_day++; - week_view->selection_end_day = week_view->selection_start_day; + if (week_view->selection_start_day == weeks_shown * 7 - 1) { + /* no easy way to calculate new selection_start_day, therefore + * calculate a time_t value and set_selected_time_range */ + time_t current; + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_day(current,1); + e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN); + e_week_view_set_selected_time_range_visible(week_view,current,current); + } + } else { + week_view->selection_start_day++; + week_view->selection_end_day = week_view->selection_start_day; + } + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 0e422d548d..66b6f6a2ec 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -59,7 +59,7 @@ #define CREATE_MEMO_LIST_ID "memo-list" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 9ed21d5186..25bf06bda1 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -58,7 +58,7 @@ #define CREATE_TASK_LIST_ID "task-list" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 56ec7c5db1..247ac7794f 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -308,104 +308,6 @@ action_smime_sign_cb (GtkToggleAction *action, gtkhtml_editor_set_changed (editor, TRUE); } -static void -action_view_bcc_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_BCC, active); -} - -static void -action_view_cc_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_CC, active); -} - -static void -action_view_from_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_FROM, active); -} - -static void -action_view_post_to_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_POST_TO, active); -} - -static void -action_view_reply_to_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_REPLY_TO, active); -} - -static void -action_view_subject_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_SUBJECT, active); -} - -static void -action_view_to_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_TO, active); -} - static GtkActionEntry entries[] = { { "attach", @@ -542,7 +444,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("S/MIME Sig_n"), NULL, N_("Sign this message with your S/MIME Signature Certificate"), - G_CALLBACK (action_smime_sign_cb), + NULL, /* Handled by property bindings */ FALSE }, { "view-bcc", @@ -550,7 +452,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("_Bcc Field"), NULL, N_("Toggles whether the BCC field is displayed"), - G_CALLBACK (action_view_bcc_cb), + NULL, /* Handled by property bindings */ FALSE }, { "view-cc", @@ -558,7 +460,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("_Cc Field"), NULL, N_("Toggles whether the CC field is displayed"), - G_CALLBACK (action_view_cc_cb), + NULL, /* Handled by property bindings */ FALSE }, { "view-from", @@ -566,15 +468,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("_From Field"), NULL, N_("Toggles whether the From chooser is displayed"), - G_CALLBACK (action_view_from_cb), - FALSE }, - - { "view-post-to", - NULL, - N_("_Post-To Field"), - NULL, - N_("Toggles whether the Post-To field is displayed"), - G_CALLBACK (action_view_post_to_cb), + NULL, /* Handled by property bindings */ FALSE }, { "view-reply-to", @@ -582,24 +476,8 @@ static GtkToggleActionEntry toggle_entries[] = { N_("_Reply-To Field"), NULL, N_("Toggles whether the Reply-To field is displayed"), - G_CALLBACK (action_view_reply_to_cb), + NULL, /* Handled by property bindings */ FALSE }, - - { "view-subject", - NULL, - N_("_Subject Field"), - NULL, - N_("Toggles whether the Subject field is displayed"), - G_CALLBACK (action_view_subject_cb), - FALSE }, - - { "view-to", - NULL, - N_("_To Field"), - NULL, - N_("Toggles whether the To field is displayed"), - G_CALLBACK (action_view_to_cb), - FALSE } }; void diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h index c17f3ebc32..da3e470d81 100644 --- a/composer/e-composer-actions.h +++ b/composer/e-composer-actions.h @@ -61,13 +61,7 @@ E_COMPOSER_ACTION ((composer), "view-cc") #define E_COMPOSER_ACTION_VIEW_FROM(composer) \ E_COMPOSER_ACTION ((composer), "view-from") -#define E_COMPOSER_ACTION_VIEW_POST_TO(composer) \ - E_COMPOSER_ACTION ((composer), "view-post-to") #define E_COMPOSER_ACTION_VIEW_REPLY_TO(composer) \ E_COMPOSER_ACTION ((composer), "view-reply-to") -#define E_COMPOSER_ACTION_VIEW_SUBJECT(composer) \ - E_COMPOSER_ACTION ((composer), "view-subject") -#define E_COMPOSER_ACTION_VIEW_TO(composer) \ - E_COMPOSER_ACTION ((composer), "view-to") #endif /* E_COMPOSER_ACTIONS_H */ diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 461c11efa1..267bfbf1e7 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -19,9 +19,12 @@ #include <string.h> #include <glib/gi18n-lib.h> +#include <camel/camel-internet-address.h> #include <libedataserverui/e-name-selector.h> -#include "e-signature-combo-box.h" +#include "e-util/e-binding.h" +#include "e-util/gconf-bridge.h" +#include "widgets/misc/e-signature-combo-box.h" #include "e-composer-from-header.h" #include "e-composer-name-header.h" @@ -32,34 +35,6 @@ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate)) -#define E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER(table) \ - (E_COMPOSER_FROM_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_FROM))) - -#define E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER(table) \ - (E_COMPOSER_TEXT_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_REPLY_TO))) - -#define E_COMPOSER_HEADER_TABLE_GET_TO_HEADER(table) \ - (E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_TO))) - -#define E_COMPOSER_HEADER_TABLE_GET_CC_HEADER(table) \ - (E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_CC))) - -#define E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER(table) \ - (E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_BCC))) - -#define E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER(table) \ - (E_COMPOSER_POST_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_POST_TO))) - -#define E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER(table) \ - (E_COMPOSER_TEXT_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_SUBJECT))) - #define HEADER_TOOLTIP_TO \ _("Enter the recipients of the message") #define HEADER_TOOLTIP_CC \ @@ -70,6 +45,8 @@ "carbon copy of the message without appearing " \ "in the recipient list of the message") +#define GCONF_KEY_PREFIX "/apps/evolution/mail/composer" + enum { PROP_0, PROP_ACCOUNT, @@ -87,6 +64,7 @@ enum { struct _EComposerHeaderTablePrivate { EComposerHeader *headers[E_COMPOSER_NUM_HEADERS]; + guint gconf_bindings[E_COMPOSER_NUM_HEADERS]; GtkWidget *signature_label; GtkWidget *signature_combo_box; ENameSelector *name_selector; @@ -221,24 +199,277 @@ composer_header_table_bind_widget (const gchar *property_name, (gpointer) property_name); } +static EDestination ** +composer_header_table_update_destinations (EDestination **old_destinations, + const gchar *auto_addresses) +{ + CamelAddress *address; + CamelInternetAddress *inet_address; + EDestination **new_destinations; + EDestination *destination; + GList *list = NULL; + guint length; + gint ii; + + /* Include automatic recipients for the selected account. */ + + if (auto_addresses == NULL) + goto skip_auto; + + inet_address = camel_internet_address_new (); + address = CAMEL_ADDRESS (inet_address); + + if (camel_address_decode (address, auto_addresses) != -1) { + for (ii = 0; ii < camel_address_length (address); ii++) { + const gchar *name, *email; + + if (!camel_internet_address_get ( + inet_address, ii, &name, &email)) + continue; + + destination = e_destination_new (); + e_destination_set_auto_recipient (destination, TRUE); + + if (name != NULL) + e_destination_set_name (destination, name); + + if (email != NULL) + e_destination_set_email (destination, email); + + list = g_list_prepend (list, destination); + } + } + + camel_object_unref (inet_address); + +skip_auto: + + /* Include custom recipients for this message. */ + + if (old_destinations == NULL) + goto skip_custom; + + for (ii = 0; old_destinations[ii] != NULL; ii++) { + if (e_destination_is_auto_recipient (old_destinations[ii])) + continue; + + destination = e_destination_copy (old_destinations[ii]); + list = g_list_prepend (list, destination); + } + +skip_custom: + + list = g_list_reverse (list); + length = g_list_length (list); + + new_destinations = g_new0 (EDestination *, length + 1); + + for (ii = 0; list != NULL; ii++) { + new_destinations[ii] = E_DESTINATION (list->data); + list = g_list_delete_link (list, list); + } + + return new_destinations; +} + +static void +composer_header_table_setup_mail_headers (EComposerHeaderTable *table) +{ + GConfBridge *bridge; + gint ii; + + bridge = gconf_bridge_get (); + + for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { + EComposerHeader *header; + const gchar *key; + guint binding_id; + + binding_id = table->priv->gconf_bindings[ii]; + header = e_composer_header_table_get_header (table, ii); + + if (binding_id > 0) + gconf_bridge_unbind (bridge, binding_id); + + switch (ii) { + case E_COMPOSER_HEADER_BCC: + key = GCONF_KEY_PREFIX "/show_mail_bcc"; + break; + + case E_COMPOSER_HEADER_CC: + key = GCONF_KEY_PREFIX "/show_mail_cc"; + break; + + case E_COMPOSER_HEADER_FROM: + key = GCONF_KEY_PREFIX "/show_mail_from"; + break; + + case E_COMPOSER_HEADER_REPLY_TO: + key = GCONF_KEY_PREFIX "/show_mail_reply_to"; + break; + + default: + key = NULL; + break; + } + + switch (ii) { + case E_COMPOSER_HEADER_BCC: + case E_COMPOSER_HEADER_CC: + case E_COMPOSER_HEADER_FROM: + case E_COMPOSER_HEADER_REPLY_TO: + case E_COMPOSER_HEADER_SUBJECT: + case E_COMPOSER_HEADER_TO: + e_composer_header_set_sensitive (header, TRUE); + e_composer_header_set_visible (header, TRUE); + break; + + default: + e_composer_header_set_sensitive (header, FALSE); + e_composer_header_set_visible (header, FALSE); + break; + } + + if (key != NULL) + binding_id = gconf_bridge_bind_property ( + bridge, key, G_OBJECT (header), "visible"); + else + binding_id = 0; + + table->priv->gconf_bindings[ii] = binding_id; + } +} + +static void +composer_header_table_setup_post_headers (EComposerHeaderTable *table) +{ + GConfBridge *bridge; + gint ii; + + bridge = gconf_bridge_get (); + + for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { + EComposerHeader *header; + const gchar *key; + guint binding_id; + + binding_id = table->priv->gconf_bindings[ii]; + header = e_composer_header_table_get_header (table, ii); + + if (binding_id > 0) + gconf_bridge_unbind (bridge, binding_id); + + switch (ii) { + case E_COMPOSER_HEADER_FROM: + key = GCONF_KEY_PREFIX "/show_post_from"; + break; + + case E_COMPOSER_HEADER_REPLY_TO: + key = GCONF_KEY_PREFIX "/show_post_reply_to"; + break; + + default: + key = NULL; + break; + } + + switch (ii) { + case E_COMPOSER_HEADER_FROM: + case E_COMPOSER_HEADER_POST_TO: + case E_COMPOSER_HEADER_REPLY_TO: + case E_COMPOSER_HEADER_SUBJECT: + e_composer_header_set_sensitive (header, TRUE); + e_composer_header_set_visible (header, TRUE); + break; + + default: /* this includes TO, CC and BCC */ + e_composer_header_set_sensitive (header, FALSE); + e_composer_header_set_visible (header, FALSE); + break; + } + + if (key != NULL) + binding_id = gconf_bridge_bind_property ( + bridge, key, G_OBJECT (header), "visible"); + else + binding_id = 0; + + table->priv->gconf_bindings[ii] = binding_id; + } +} + static void composer_header_table_from_changed_cb (EComposerHeaderTable *table) { EAccount *account; + EComposerHeader *header; + EComposerHeaderType type; EComposerPostHeader *post_header; EComposerTextHeader *text_header; + EDestination **old_destinations; + EDestination **new_destinations; const gchar *reply_to; + const gchar *source_url; + gboolean always_cc; + gboolean always_bcc; /* Keep "Post-To" and "Reply-To" synchronized with "From" */ account = e_composer_header_table_get_account (table); + source_url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL); - post_header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table); + type = E_COMPOSER_HEADER_POST_TO; + header = e_composer_header_table_get_header (table, type); + post_header = E_COMPOSER_POST_HEADER (header); e_composer_post_header_set_account (post_header, account); + type = E_COMPOSER_HEADER_REPLY_TO; + header = e_composer_header_table_get_header (table, type); reply_to = (account != NULL) ? account->id->reply_to : NULL; - text_header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table); + text_header = E_COMPOSER_TEXT_HEADER (header); e_composer_text_header_set_text (text_header, reply_to); + + always_cc = (account != NULL && account->always_cc); + always_bcc = (account != NULL && account->always_bcc); + + /* Update automatic CC destinations. */ + old_destinations = + e_composer_header_table_get_destinations_cc (table); + new_destinations = + composer_header_table_update_destinations ( + old_destinations, always_cc ? account->cc_addrs : NULL); + e_composer_header_table_set_destinations_cc (table, new_destinations); + e_destination_freev (new_destinations); + + /* Update automatic BCC destinations. */ + old_destinations = + e_composer_header_table_get_destinations_bcc (table); + new_destinations = + composer_header_table_update_destinations ( + old_destinations, always_bcc ? account->bcc_addrs : NULL); + e_composer_header_table_set_destinations_bcc (table, new_destinations); + e_destination_freev (new_destinations); + + /* XXX We should NOT be checking specific account types here. + * Would prefer EAccount have a "send_method" enum item: + * + * E_ACCOUNT_SEND_METHOD_MAIL + * E_ACCOUNT_SEND_METHOD_POST + * + * And that would dictate which set of headers we show + * in the composer when an account is selected. Alas, + * EAccount has no private storage, so it would require + * an ABI break and I don't want to deal with that now. + * (But would anything besides Evolution be affected?) + * + * Currently only NNTP accounts use the "POST" fields. + */ + if (source_url == NULL) + composer_header_table_setup_mail_headers (table); + else if (g_ascii_strncasecmp (source_url, "nntp:", 5) == 0) + composer_header_table_setup_post_headers (table); + else + composer_header_table_setup_mail_headers (table); } static GObject * @@ -281,6 +512,14 @@ composer_header_table_constructor (GType type, priv->headers[ii]->input_widget, "right-attach", 2, NULL); + e_binding_new ( + G_OBJECT (priv->headers[ii]->input_widget), "visible", + G_OBJECT (priv->signature_label), "visible"); + + e_binding_new ( + G_OBJECT (priv->headers[ii]->input_widget), "visible", + G_OBJECT (priv->signature_combo_box), "visible"); + /* Now add the signature stuff. */ gtk_table_attach ( GTK_TABLE (object), priv->signature_label, @@ -587,6 +826,24 @@ composer_header_table_class_init (EComposerHeaderTableClass *class) element_spec, G_PARAM_READWRITE)); + /* floating reference */ + element_spec = g_param_spec_string ( + "value-array-element", + NULL, + NULL, + NULL, + G_PARAM_READWRITE); + + g_object_class_install_property ( + object_class, + PROP_POST_TO, + g_param_spec_value_array ( + "post-to", + NULL, + NULL, + element_spec, + G_PARAM_READWRITE)); + g_object_class_install_property ( object_class, PROP_REPLY_TO, @@ -634,6 +891,7 @@ composer_header_table_init (EComposerHeaderTable *table) EComposerHeader *header; ENameSelector *name_selector; GtkWidget *widget; + gint ii; table->priv = E_COMPOSER_HEADER_TABLE_GET_PRIVATE (table); @@ -685,6 +943,22 @@ composer_header_table_init (EComposerHeaderTable *table) gtk_label_set_mnemonic_widget ( GTK_LABEL (widget), table->priv->signature_combo_box); table->priv->signature_label = g_object_ref_sink (widget); + + /* XXX EComposerHeader ought to do this itself, but I need to + * make the title_widget and input_widget members private. */ + for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { + GObject *src_object; + GObject *dst_object; + + header = table->priv->headers[ii]; + src_object = G_OBJECT (header); + + dst_object = G_OBJECT (header->title_widget); + e_binding_new (src_object, "visible", dst_object, "visible"); + + dst_object = G_OBJECT (header->input_widget); + e_binding_new (src_object, "visible", dst_object, "visible"); + } } GType @@ -730,126 +1004,103 @@ e_composer_header_table_get_header (EComposerHeaderTable *table, return table->priv->headers[type]; } -gboolean -e_composer_header_table_get_header_visible (EComposerHeaderTable *table, - EComposerHeaderType type) -{ - EComposerHeader *header; - - header = e_composer_header_table_get_header (table, type); - return e_composer_header_get_visible (header); -} - -void -e_composer_header_table_set_header_visible (EComposerHeaderTable *table, - EComposerHeaderType type, - gboolean visible) -{ - EComposerHeader *header; - - header = e_composer_header_table_get_header (table, type); - e_composer_header_set_visible (header, visible); - - /* Signature widgets track the "From" header. */ - if (type == E_COMPOSER_HEADER_FROM) { - if (visible) { - gtk_widget_show (table->priv->signature_label); - gtk_widget_show (table->priv->signature_combo_box); - } else { - gtk_widget_hide (table->priv->signature_label); - gtk_widget_hide (table->priv->signature_combo_box); - } - } -} - -gboolean -e_composer_header_table_get_header_sensitive (EComposerHeaderTable *table, - EComposerHeaderType type) -{ - EComposerHeader *header; - - header = e_composer_header_table_get_header (table, type); - return e_composer_header_get_sensitive (header); -} - -void -e_composer_header_table_set_header_sensitive (EComposerHeaderTable *table, - EComposerHeaderType type, - gboolean sensitive) -{ - EComposerHeader *header; - - header = e_composer_header_table_get_header (table, type); - e_composer_header_set_sensitive (header, sensitive); -} - EAccount * e_composer_header_table_get_account (EComposerHeaderTable *table) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_get_active (header); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_get_active (from_header); } gboolean e_composer_header_table_set_account (EComposerHeaderTable *table, EAccount *account) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), FALSE); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_set_active (header, account); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_set_active (from_header, account); } EAccountList * e_composer_header_table_get_account_list (EComposerHeaderTable *table) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_get_account_list (header); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_get_account_list (from_header); } void e_composer_header_table_set_account_list (EComposerHeaderTable *table, EAccountList *account_list) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - e_composer_from_header_set_account_list (header, account_list); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + e_composer_from_header_set_account_list (from_header, account_list); } const gchar * e_composer_header_table_get_account_name (EComposerHeaderTable *table) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_get_active_name (header); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_get_active_name (from_header); } gboolean e_composer_header_table_set_account_name (EComposerHeaderTable *table, const gchar *account_name) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), FALSE); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_set_active_name (header, account_name); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_set_active_name (from_header, account_name); } EDestination ** @@ -895,89 +1146,179 @@ e_composer_header_table_get_destinations (EComposerHeaderTable *table) EDestination ** e_composer_header_table_get_destinations_bcc (EComposerHeaderTable *table) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table); - return e_composer_name_header_get_destinations (header); + type = E_COMPOSER_HEADER_BCC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + return e_composer_name_header_get_destinations (name_header); +} + +void +e_composer_header_table_add_destinations_bcc (EComposerHeaderTable *table, + EDestination **destinations) +{ + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; + + g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); + + type = E_COMPOSER_HEADER_BCC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_add_destinations (name_header, destinations); + + if (destinations != NULL && *destinations != NULL) + e_composer_header_set_visible (header, TRUE); } void e_composer_header_table_set_destinations_bcc (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table); - e_composer_name_header_set_destinations (header, destinations); + type = E_COMPOSER_HEADER_BCC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_set_destinations (name_header, destinations); if (destinations != NULL && *destinations != NULL) - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_BCC, TRUE); + e_composer_header_set_visible (header, TRUE); } EDestination ** e_composer_header_table_get_destinations_cc (EComposerHeaderTable *table) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table); - return e_composer_name_header_get_destinations (header); + type = E_COMPOSER_HEADER_CC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + return e_composer_name_header_get_destinations (name_header); +} + +void +e_composer_header_table_add_destinations_cc (EComposerHeaderTable *table, + EDestination **destinations) +{ + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; + + g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); + + type = E_COMPOSER_HEADER_CC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_add_destinations (name_header, destinations); + + if (destinations != NULL && *destinations != NULL) + e_composer_header_set_visible (header, TRUE); } void e_composer_header_table_set_destinations_cc (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table); - e_composer_name_header_set_destinations (header, destinations); + type = E_COMPOSER_HEADER_CC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_set_destinations (name_header, destinations); if (destinations != NULL && *destinations != NULL) - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_CC, TRUE); + e_composer_header_set_visible (header, TRUE); } EDestination ** e_composer_header_table_get_destinations_to (EComposerHeaderTable *table) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table); - return e_composer_name_header_get_destinations (header); + type = E_COMPOSER_HEADER_TO; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + return e_composer_name_header_get_destinations (name_header); +} + +void +e_composer_header_table_add_destinations_to (EComposerHeaderTable *table, + EDestination **destinations) +{ + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; + + g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); + + type = E_COMPOSER_HEADER_TO; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_add_destinations (name_header, destinations); } void e_composer_header_table_set_destinations_to (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table); - e_composer_name_header_set_destinations (header, destinations); + type = E_COMPOSER_HEADER_TO; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_set_destinations (name_header, destinations); } GList * e_composer_header_table_get_post_to (EComposerHeaderTable *table) { - EComposerPostHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerPostHeader *post_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table); - return e_composer_post_header_get_folders (header); + type = E_COMPOSER_HEADER_POST_TO; + header = e_composer_header_table_get_header (table, type); + post_header = E_COMPOSER_POST_HEADER (header); + + return e_composer_post_header_get_folders (post_header); } void @@ -985,51 +1326,70 @@ e_composer_header_table_set_post_to_base (EComposerHeaderTable *table, const gchar *base_url, const gchar *folders) { - EComposerPostHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerPostHeader *post_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table); - e_composer_post_header_set_folders_base (header, base_url, folders); + type = E_COMPOSER_HEADER_POST_TO; + header = e_composer_header_table_get_header (table, type); + post_header = E_COMPOSER_POST_HEADER (header); + + e_composer_post_header_set_folders_base (post_header, base_url, folders); } void e_composer_header_table_set_post_to_list (EComposerHeaderTable *table, GList *folders) { - EComposerPostHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerPostHeader *post_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table); - e_composer_post_header_set_folders (header, folders); + type = E_COMPOSER_HEADER_POST_TO; + header = e_composer_header_table_get_header (table, type); + post_header = E_COMPOSER_POST_HEADER (header); + + e_composer_post_header_set_folders (post_header, folders); } const gchar * e_composer_header_table_get_reply_to (EComposerHeaderTable *table) { - EComposerTextHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerTextHeader *text_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table); - return e_composer_text_header_get_text (header); + type = E_COMPOSER_HEADER_REPLY_TO; + header = e_composer_header_table_get_header (table, type); + text_header = E_COMPOSER_TEXT_HEADER (header); + + return e_composer_text_header_get_text (text_header); } void e_composer_header_table_set_reply_to (EComposerHeaderTable *table, const gchar *reply_to) { - EComposerTextHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerTextHeader *text_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table); - e_composer_text_header_set_text (header, reply_to); + type = E_COMPOSER_HEADER_REPLY_TO; + header = e_composer_header_table_get_header (table, type); + text_header = E_COMPOSER_TEXT_HEADER (header); + + e_composer_text_header_set_text (text_header, reply_to); if (reply_to != NULL && *reply_to != '\0') - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_REPLY_TO, TRUE); + e_composer_header_set_visible (header, TRUE); } ESignature * @@ -1081,22 +1441,32 @@ e_composer_header_table_set_signature_list (EComposerHeaderTable *table, const gchar * e_composer_header_table_get_subject (EComposerHeaderTable *table) { - EComposerTextHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerTextHeader *text_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER (table); - return e_composer_text_header_get_text (header); + type = E_COMPOSER_HEADER_SUBJECT; + header = e_composer_header_table_get_header (table, type); + text_header = E_COMPOSER_TEXT_HEADER (header); + + return e_composer_text_header_get_text (text_header); } void e_composer_header_table_set_subject (EComposerHeaderTable *table, const gchar *subject) { - EComposerTextHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerTextHeader *text_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER (table); - e_composer_text_header_set_text (header, subject); + type = E_COMPOSER_HEADER_SUBJECT; + header = e_composer_header_table_get_header (table, type); + text_header = E_COMPOSER_TEXT_HEADER (header); + + e_composer_text_header_set_text (text_header, subject); } diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h index b3150c409a..817863031c 100644 --- a/composer/e-composer-header-table.h +++ b/composer/e-composer-header-table.h @@ -79,20 +79,6 @@ GtkWidget * e_composer_header_table_new (void); EComposerHeader * e_composer_header_table_get_header (EComposerHeaderTable *table, EComposerHeaderType type); -gboolean e_composer_header_table_get_header_sensitive - (EComposerHeaderTable *table, - EComposerHeaderType type); -void e_composer_header_table_set_header_sensitive - (EComposerHeaderTable *table, - EComposerHeaderType type, - gboolean sensitive); -gboolean e_composer_header_table_get_header_visible - (EComposerHeaderTable *table, - EComposerHeaderType type); -void e_composer_header_table_set_header_visible - (EComposerHeaderTable *table, - EComposerHeaderType type, - gboolean visible); EAccount * e_composer_header_table_get_account (EComposerHeaderTable *table); gboolean e_composer_header_table_set_account @@ -112,16 +98,25 @@ EDestination ** e_composer_header_table_get_destinations (EComposerHeaderTable *table); EDestination ** e_composer_header_table_get_destinations_bcc (EComposerHeaderTable *table); +void e_composer_header_table_add_destinations_bcc + (EComposerHeaderTable *table, + EDestination **destination); void e_composer_header_table_set_destinations_bcc (EComposerHeaderTable *table, EDestination **destinations); EDestination ** e_composer_header_table_get_destinations_cc (EComposerHeaderTable *table); +void e_composer_header_table_add_destinations_cc + (EComposerHeaderTable *table, + EDestination **destination); void e_composer_header_table_set_destinations_cc (EComposerHeaderTable *table, EDestination **destinations); EDestination ** e_composer_header_table_get_destinations_to (EComposerHeaderTable *table); +void e_composer_header_table_add_destinations_to + (EComposerHeaderTable *table, + EDestination **destinations); void e_composer_header_table_set_destinations_to (EComposerHeaderTable *table, EDestination **destinations); diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index 8cbcf64f1f..272556969d 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -41,6 +41,9 @@ enum { struct _EComposerHeaderPrivate { gchar *label; gboolean button; + + guint sensitive : 1; + guint visible : 1; }; static gpointer parent_class; @@ -302,15 +305,9 @@ e_composer_header_get_label (EComposerHeader *header) gboolean e_composer_header_get_sensitive (EComposerHeader *header) { - gboolean sensitive; - g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), FALSE); - sensitive = GTK_WIDGET_SENSITIVE (header->title_widget); - if (GTK_WIDGET_SENSITIVE (header->input_widget) != sensitive) - g_warning ("%s: Sensitivity is out of sync", G_STRFUNC); - - return sensitive; + return header->priv->sensitive; } void @@ -319,8 +316,7 @@ e_composer_header_set_sensitive (EComposerHeader *header, { g_return_if_fail (E_IS_COMPOSER_HEADER (header)); - gtk_widget_set_sensitive (header->title_widget, sensitive); - gtk_widget_set_sensitive (header->input_widget, sensitive); + header->priv->sensitive = sensitive; g_object_notify (G_OBJECT (header), "sensitive"); } @@ -328,15 +324,9 @@ e_composer_header_set_sensitive (EComposerHeader *header, gboolean e_composer_header_get_visible (EComposerHeader *header) { - gboolean visible; - g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), FALSE); - visible = GTK_WIDGET_VISIBLE (header->title_widget); - if (GTK_WIDGET_VISIBLE (header->input_widget) != visible) - g_warning ("%s: Visibility is out of sync", G_STRFUNC); - - return visible; + return header->priv->visible; } void @@ -345,13 +335,7 @@ e_composer_header_set_visible (EComposerHeader *header, { g_return_if_fail (E_IS_COMPOSER_HEADER (header)); - if (visible) { - gtk_widget_show (header->title_widget); - gtk_widget_show (header->input_widget); - } else { - gtk_widget_hide (header->title_widget); - gtk_widget_hide (header->input_widget); - } + header->priv->visible = visible; g_object_notify (G_OBJECT (header), "visible"); } diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h index d1edd110fe..db9582dc3f 100644 --- a/composer/e-composer-header.h +++ b/composer/e-composer-header.h @@ -59,7 +59,7 @@ struct _EComposerHeaderClass { GType e_composer_header_get_type (void); gchar * e_composer_header_get_label (EComposerHeader *header); gboolean e_composer_header_get_sensitive (EComposerHeader *header); -void e_composer_header_set_sensitive (EComposerHeader *header, +void e_composer_header_set_sensitive (EComposerHeader *header, gboolean sensitive); gboolean e_composer_header_get_visible (EComposerHeader *header); void e_composer_header_set_visible (EComposerHeader *header, diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c index 70a126b1e0..5aab95d776 100644 --- a/composer/e-composer-name-header.c +++ b/composer/e-composer-name-header.c @@ -295,13 +295,33 @@ e_composer_name_header_get_destinations (EComposerNameHeader *header) } void +e_composer_name_header_add_destinations (EComposerNameHeader *header, + EDestination **destinations) +{ + EDestinationStore *store; + ENameSelectorEntry *entry; + gint ii; + + g_return_if_fail (E_IS_COMPOSER_NAME_HEADER (header)); + + entry = E_COMPOSER_NAME_HEADER_GET_ENTRY (header); + store = e_name_selector_entry_peek_destination_store (entry); + + if (destinations == NULL) + return; + + for (ii = 0; destinations[ii] != NULL; ii++) + e_destination_store_append_destination ( + store, destinations[ii]); +} + +void e_composer_name_header_set_destinations (EComposerNameHeader *header, EDestination **destinations) { EDestinationStore *store; ENameSelectorEntry *entry; GList *list, *iter; - gint ii; g_return_if_fail (E_IS_COMPOSER_NAME_HEADER (header)); @@ -314,10 +334,5 @@ e_composer_name_header_set_destinations (EComposerNameHeader *header, e_destination_store_remove_destination (store, iter->data); g_list_free (list); - if (destinations == NULL) - return; - - for (ii = 0; destinations[ii] != NULL; ii++) - e_destination_store_append_destination ( - store, destinations[ii]); + e_composer_name_header_add_destinations (header, destinations); } diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h index 04f7100241..f95c33fce3 100644 --- a/composer/e-composer-name-header.h +++ b/composer/e-composer-name-header.h @@ -66,6 +66,9 @@ ENameSelector * e_composer_name_header_get_name_selector (EComposerNameHeader *header); EDestination ** e_composer_name_header_get_destinations (EComposerNameHeader *header); +void e_composer_name_header_add_destinations + (EComposerNameHeader *header, + EDestination **destination); void e_composer_name_header_set_destinations (EComposerNameHeader *header, EDestination **destinations); diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index 1729aae9fa..fe5b66ceee 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -90,6 +90,7 @@ e_composer_private_init (EMsgComposer *composer) GtkWidget *send_widget; const gchar *path; gchar *filename; + gint ii; GError *error = NULL; editor = GTKHTML_EDITOR (composer); @@ -165,6 +166,46 @@ e_composer_private_init (EMsgComposer *composer) GTK_BOX (container), widget, TRUE, TRUE, 0, GTK_PACK_START); composer_setup_recent_menu (composer); + + /* Bind headers to their corresponding actions. */ + + for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { + EComposerHeaderTable *table; + EComposerHeader *header; + GtkAction *action; + + table = E_COMPOSER_HEADER_TABLE (priv->header_table); + header = e_composer_header_table_get_header (table, ii); + + switch (ii) { + case E_COMPOSER_HEADER_BCC: + action = ACTION (VIEW_BCC); + break; + + case E_COMPOSER_HEADER_CC: + action = ACTION (VIEW_CC); + break; + + case E_COMPOSER_HEADER_FROM: + action = ACTION (VIEW_FROM); + break; + + case E_COMPOSER_HEADER_REPLY_TO: + action = ACTION (VIEW_REPLY_TO); + break; + + default: + continue; + } + + e_mutual_binding_new ( + G_OBJECT (header), "sensitive", + G_OBJECT (action), "sensitive"); + + e_mutual_binding_new ( + G_OBJECT (header), "visible", + G_OBJECT (action), "active"); + } } void diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index 669af31235..8dc9b4be93 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -28,6 +28,7 @@ #include "e-composer-actions.h" #include "e-composer-autosave.h" #include "e-composer-header-table.h" +#include "e-util/e-binding.h" #include "e-util/gconf-bridge.h" #include "widgets/misc/e-attachment-paned.h" #include "widgets/misc/e-attachment-store.h" @@ -65,16 +66,6 @@ COMPOSER_GCONF_PREFIX "/send_html" #define COMPOSER_GCONF_SPELL_LANGUAGES_KEY \ COMPOSER_GCONF_PREFIX "/spell_languages" -#define COMPOSER_GCONF_VIEW_BCC_KEY \ - COMPOSER_GCONF_PREFIX "/view/Bcc" -#define COMPOSER_GCONF_VIEW_CC_KEY \ - COMPOSER_GCONF_PREFIX "/view/Cc" -#define COMPOSER_GCONF_VIEW_FROM_KEY \ - COMPOSER_GCONF_PREFIX "/view/From" -#define COMPOSER_GCONF_VIEW_POST_TO_KEY \ - COMPOSER_GCONF_PREFIX "/view/PostTo" -#define COMPOSER_GCONF_VIEW_REPLY_TO_KEY \ - COMPOSER_GCONF_PREFIX "/view/ReplyTo" #define COMPOSER_GCONF_WINDOW_PREFIX \ COMPOSER_GCONF_PREFIX "/window" diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 3079e8ed57..9b526f63ac 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -113,37 +113,6 @@ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MSG_COMPOSER, EMsgComposerPrivate)) -#define E_MSG_COMPOSER_VISIBLE_MASK_SENDER \ - (E_MSG_COMPOSER_VISIBLE_FROM | \ - E_MSG_COMPOSER_VISIBLE_REPLYTO) - -#define E_MSG_COMPOSER_VISIBLE_MASK_BASIC \ - (E_MSG_COMPOSER_VISIBLE_MASK_SENDER | \ - E_MSG_COMPOSER_VISIBLE_SUBJECT) - -#define E_MSG_COMPOSER_VISIBLE_MASK_RECIPIENTS \ - (E_MSG_COMPOSER_VISIBLE_TO | \ - E_MSG_COMPOSER_VISIBLE_CC | \ - E_MSG_COMPOSER_VISIBLE_BCC) - -#define E_MSG_COMPOSER_VISIBLE_MASK_MAIL \ - (E_MSG_COMPOSER_VISIBLE_MASK_BASIC | \ - E_MSG_COMPOSER_VISIBLE_MASK_RECIPIENTS) - -#define E_MSG_COMPOSER_VISIBLE_MASK_POST \ - (E_MSG_COMPOSER_VISIBLE_MASK_BASIC | \ - E_MSG_COMPOSER_VISIBLE_POSTTO) - -typedef enum { - E_MSG_COMPOSER_VISIBLE_FROM = (1 << 0), - E_MSG_COMPOSER_VISIBLE_REPLYTO = (1 << 1), - E_MSG_COMPOSER_VISIBLE_TO = (1 << 2), - E_MSG_COMPOSER_VISIBLE_CC = (1 << 3), - E_MSG_COMPOSER_VISIBLE_BCC = (1 << 4), - E_MSG_COMPOSER_VISIBLE_POSTTO = (1 << 5), - E_MSG_COMPOSER_VISIBLE_SUBJECT = (1 << 7) -} EMsgComposerHeaderVisibleFlags; - enum { SEND, SAVE_DRAFT, @@ -399,6 +368,7 @@ build_message_headers (EMsgComposer *composer, gboolean redirect) { EComposerHeaderTable *table; + EComposerHeader *header; EAccount *account; const gchar *subject; const gchar *reply_to; @@ -449,9 +419,9 @@ build_message_headers (EMsgComposer *composer, } /* To:, Cc:, Bcc: */ - if (e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_TO) || - e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_CC) || - e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_BCC)) { + header = e_composer_header_table_get_header ( + table, E_COMPOSER_HEADER_TO); + if (e_composer_header_get_visible (header)) { EDestination **to, **cc, **bcc; to = e_composer_header_table_get_destinations_to (table); @@ -466,7 +436,9 @@ build_message_headers (EMsgComposer *composer, } /* X-Evolution-PostTo: */ - if (e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_POST_TO)) { + header = e_composer_header_table_get_header ( + table, E_COMPOSER_HEADER_POST_TO); + if (e_composer_header_get_visible (header)) { CamelMedium *medium = CAMEL_MEDIUM (msg); const gchar *name = "X-Evolution-PostTo"; GList *list, *iter; @@ -1359,90 +1331,6 @@ msg_composer_subject_changed_cb (EMsgComposer *composer) gtk_window_set_title (GTK_WINDOW (composer), subject); } -enum { - UPDATE_AUTO_CC, - UPDATE_AUTO_BCC, -}; - -static void -update_auto_recipients (EComposerHeaderTable *table, - gint mode, - const gchar *auto_addrs) -{ - EDestination *dest, **destv = NULL; - CamelInternetAddress *iaddr; - GList *list = NULL; - guint length; - gint i; - - if (auto_addrs) { - iaddr = camel_internet_address_new (); - if (camel_address_decode (CAMEL_ADDRESS (iaddr), auto_addrs) != -1) { - for (i = 0; i < camel_address_length (CAMEL_ADDRESS (iaddr)); i++) { - const gchar *name, *addr; - - if (!camel_internet_address_get (iaddr, i, &name, &addr)) - continue; - - dest = e_destination_new (); - e_destination_set_auto_recipient (dest, TRUE); - - if (name) - e_destination_set_name (dest, name); - - if (addr) - e_destination_set_email (dest, addr); - - list = g_list_prepend (list, dest); - } - } - - camel_object_unref (iaddr); - } - - switch (mode) { - case UPDATE_AUTO_CC: - destv = e_composer_header_table_get_destinations_cc (table); - break; - case UPDATE_AUTO_BCC: - destv = e_composer_header_table_get_destinations_bcc (table); - break; - default: - g_return_if_reached (); - } - - if (destv) { - for (i = 0; destv[i]; i++) { - if (!e_destination_is_auto_recipient (destv[i])) { - dest = e_destination_copy (destv[i]); - list = g_list_prepend (list, dest); - } - } - - e_destination_freev (destv); - } - - list = g_list_reverse (list); - - length = g_list_length (list); - destv = destination_list_to_vector_sized (list, length); - - g_list_free (list); - - switch (mode) { - case UPDATE_AUTO_CC: - e_composer_header_table_set_destinations_cc (table, destv); - break; - case UPDATE_AUTO_BCC: - e_composer_header_table_set_destinations_bcc (table, destv); - break; - default: - g_return_if_reached (); - } - - e_destination_freev (destv); -} - static void msg_composer_account_changed_cb (EMsgComposer *composer) { @@ -1453,8 +1341,6 @@ msg_composer_account_changed_cb (EMsgComposer *composer) EAccount *account; gboolean active; gboolean sensitive; - const gchar *cc_addrs = NULL; - const gchar *bcc_addrs = NULL; const gchar *uid; table = e_msg_composer_get_header_table (composer); @@ -1477,11 +1363,6 @@ msg_composer_account_changed_cb (EMsgComposer *composer) active = account->smime_encrypt_default; gtk_toggle_action_set_active (action, active); - if (account->always_cc) - cc_addrs = account->cc_addrs; - if (account->always_bcc) - bcc_addrs = account->bcc_addrs; - uid = account->id->sig_uid; signature = uid ? mail_config_get_signature_by_uid (uid) : NULL; e_composer_header_table_set_signature (table, signature); @@ -1494,8 +1375,6 @@ msg_composer_account_changed_cb (EMsgComposer *composer) gtk_action_set_sensitive (ACTION (SEND_OPTIONS), sensitive); exit: - update_auto_recipients (table, UPDATE_AUTO_CC, cc_addrs); - update_auto_recipients (table, UPDATE_AUTO_BCC, bcc_addrs); e_msg_composer_show_sig_file (composer); } @@ -1634,36 +1513,6 @@ msg_composer_constructor (GType type, G_OBJECT (composer), "current-folder"); g_array_append_val (array, binding_id); - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_BCC_KEY, - G_OBJECT (ACTION (VIEW_BCC)), "active"); - g_array_append_val (array, binding_id); - - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_CC_KEY, - G_OBJECT (ACTION (VIEW_CC)), "active"); - g_array_append_val (array, binding_id); - - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_FROM_KEY, - G_OBJECT (ACTION (VIEW_FROM)), "active"); - g_array_append_val (array, binding_id); - - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_POST_TO_KEY, - G_OBJECT (ACTION (VIEW_POST_TO)), "active"); - g_array_append_val (array, binding_id); - - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_REPLY_TO_KEY, - G_OBJECT (ACTION (VIEW_REPLY_TO)), "active"); - g_array_append_val (array, binding_id); - binding_id = gconf_bridge_bind_window ( gconf_bridge_get (), COMPOSER_GCONF_WINDOW_PREFIX, @@ -2415,87 +2264,6 @@ e_msg_composer_get_type (void) /* Callbacks. */ -static EMsgComposer * -create_composer (gint visible_mask) -{ - EMsgComposer *composer; - EComposerHeaderTable *table; - GtkToggleAction *action; - gboolean active; - - composer = g_object_new (E_TYPE_MSG_COMPOSER, NULL); - table = E_COMPOSER_HEADER_TABLE (composer->priv->header_table); - - /* Configure View Menu */ - - /* If we're mailing, you cannot disable "To". */ - action = GTK_TOGGLE_ACTION (ACTION (VIEW_TO)); - active = visible_mask & E_MSG_COMPOSER_VISIBLE_TO; - gtk_action_set_sensitive (ACTION (VIEW_TO), active); - gtk_toggle_action_set_active (action, active); - - /* Ditto for "Post-To". */ - action = GTK_TOGGLE_ACTION (ACTION (VIEW_POST_TO)); - active = visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO; - gtk_action_set_sensitive (ACTION (VIEW_POST_TO), active); - gtk_toggle_action_set_active (action, active); - - /* Disable "Cc" if we're posting. */ - if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_CC)) { - action = GTK_TOGGLE_ACTION (ACTION (VIEW_CC)); - gtk_toggle_action_set_active (action, FALSE); - } - - /* Disable "Bcc" if we're posting. */ - if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_BCC)) { - action = GTK_TOGGLE_ACTION (ACTION (VIEW_BCC)); - gtk_toggle_action_set_active (action, FALSE); - } - - action = GTK_TOGGLE_ACTION (ACTION (VIEW_SUBJECT)); - gtk_toggle_action_set_active (action, TRUE); - - return composer; -} - -/** - * e_msg_composer_new_with_type: - * - * Create a new message composer widget. The type can be - * E_MSG_COMPOSER_MAIL, E_MSG_COMPOSER_POST or E_MSG_COMPOSER_MAIL_POST. - * - * Returns: A pointer to the newly created widget - **/ - -EMsgComposer * -e_msg_composer_new_with_type (int type) -{ - EMsgComposer *composer; - gint visible_mask; - - switch (type) { - case E_MSG_COMPOSER_MAIL: - visible_mask = E_MSG_COMPOSER_VISIBLE_MASK_MAIL; - break; - - case E_MSG_COMPOSER_POST: - visible_mask = E_MSG_COMPOSER_VISIBLE_MASK_POST; - break; - - default: - visible_mask = - E_MSG_COMPOSER_VISIBLE_MASK_MAIL | - E_MSG_COMPOSER_VISIBLE_MASK_POST; - break; - } - - composer = create_composer (visible_mask); - - set_editor_text (composer, "", TRUE); - - return composer; -} - /** * e_msg_composer_new: * @@ -2506,7 +2274,7 @@ e_msg_composer_new_with_type (int type) EMsgComposer * e_msg_composer_new (void) { - return e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL); + return g_object_new (E_TYPE_MSG_COMPOSER, NULL); } static void @@ -2932,25 +2700,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) GtkToggleAction *action; struct _camel_header_raw *xev; gint len, i; - EMsgComposerPrivate *p; for (headers = CAMEL_MIME_PART (message)->headers;headers;headers = headers->next) { if (!strcmp (headers->name, "X-Evolution-PostTo")) postto = g_list_append (postto, g_strstrip (g_strdup (headers->value))); } - if (postto != NULL) - composer = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_POST); - else - composer = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_MAIL); - p = composer->priv; - - if (!composer) { - g_list_foreach (postto, (GFunc)g_free, NULL); - g_list_free (postto); - return NULL; - } - + composer = e_msg_composer_new (); table = e_msg_composer_get_header_table (composer); if (postto) { @@ -3154,8 +2910,12 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) while (headers) { if (g_ascii_strcasecmp (headers->name, "References") == 0 || g_ascii_strcasecmp (headers->name, "In-Reply-To") == 0) { - g_ptr_array_add (p->extra_hdr_names, g_strdup (headers->name)); - g_ptr_array_add (p->extra_hdr_values, g_strdup (headers->value)); + g_ptr_array_add ( + composer->priv->extra_hdr_names, + g_strdup (headers->name)); + g_ptr_array_add ( + composer->priv->extra_hdr_values, + g_strdup (headers->value)); } headers = headers->next; diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index 54520ec941..7a279ba230 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -68,13 +68,8 @@ struct _EMsgComposerClass { struct _EAttachmentBar; -#define E_MSG_COMPOSER_MAIL 1 -#define E_MSG_COMPOSER_POST 2 -#define E_MSG_COMPOSER_MAIL_POST E_MSG_COMPOSER_MAIL|E_MSG_COMPOSER_POST - GType e_msg_composer_get_type (void); EMsgComposer * e_msg_composer_new (void); -EMsgComposer * e_msg_composer_new_with_type (gint type); EMsgComposer * e_msg_composer_new_with_message (CamelMimeMessage *msg); EMsgComposer * e_msg_composer_new_from_url (const gchar *url); EMsgComposer * e_msg_composer_new_redirect (CamelMimeMessage *message, diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui index dc77aae183..c22368383c 100644 --- a/composer/evolution-composer.ui +++ b/composer/evolution-composer.ui @@ -9,9 +9,9 @@ <menuitem action='save'/> <menuitem action='save-as'/> <menuitem action='save-draft'/> - <placeholder name='template-holder'/> + <placeholder name='template-holder'/> <separator/> - <placeholder name='external-editor-holder'/> + <placeholder name='external-editor-holder'/> <separator/> <separator/> <menuitem action='print-preview'/> @@ -29,12 +29,9 @@ <placeholder name='pre-insert-menu'> <menu action='view-menu'> <menuitem action='view-from'/> - <menuitem action='view-to'/> - <menuitem action='view-post-to'/> <menuitem action='view-reply-to'/> <menuitem action='view-cc'/> <menuitem action='view-bcc'/> - <menuitem action='view-subject'/> </menu> </placeholder> <menu action='insert-menu'> diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index f47368de78..1d72119c8c 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -41,7 +41,7 @@ enum { E_BCONF_MAP_ENUM, /* long/bool -> prop of name 'to', with the value indexed into the child map table's from field */ E_BCONF_MAP_CHILD, /* a new child of name 'to' */ E_BCONF_MAP_MASK = 0x3f, - E_BCONF_MAP_CONTENT = 0x80, /* if set, create a new node of name 'to' instead of a property */ + E_BCONF_MAP_CONTENT = 0x80 /* if set, create a new node of name 'to' instead of a property */ }; typedef struct _e_bconf_map { diff --git a/e-util/e-config.h b/e-util/e-config.h index 2eeb663d59..1ee7e29b58 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -75,7 +75,7 @@ typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem * typedef enum _e_config_target_change_t { E_CONFIG_TARGET_CHANGED_STATE, - E_CONFIG_TARGET_CHANGED_REBUILD, + E_CONFIG_TARGET_CHANGED_REBUILD } e_config_target_change_t; /** @@ -123,7 +123,7 @@ enum _e_config_t { E_CONFIG_SECTION, E_CONFIG_SECTION_TABLE, E_CONFIG_ITEM, - E_CONFIG_ITEM_TABLE, /* only allowed in table sections */ + E_CONFIG_ITEM_TABLE /* only allowed in table sections */ }; /** diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h index 9e1a228316..f0b78b3126 100644 --- a/e-util/e-cursor.h +++ b/e-util/e-cursor.h @@ -27,11 +27,9 @@ #include <gtk/gtk.h> typedef enum { - E_CURSOR_NORMAL, - E_CURSOR_BUSY, - -}ECursorType; + E_CURSOR_BUSY +} ECursorType; void e_cursor_set (GtkWidget *widget, ECursorType cursor); diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index afe50a85b4..f1777ca55d 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -28,7 +28,6 @@ #include <string.h> #include <time.h> #include <gtk/gtk.h> -#include <libgnomeui/gnome-dateedit.h> #include "e-dialog-widgets.h" @@ -499,39 +498,6 @@ e_dialog_combo_box_get (GtkWidget *widget, const int *value_map) } /** - * e_dialog_dateedit_set: - * @widget: A #GnomeDateEdit widget. - * @t: Date/time value. - * - * Sets the value of a #GnomeDateEdit widget. - **/ -void -e_dialog_dateedit_set (GtkWidget *widget, time_t t) -{ - g_return_if_fail (widget != NULL); - g_return_if_fail (GNOME_IS_DATE_EDIT (widget)); - - gnome_date_edit_set_time (GNOME_DATE_EDIT (widget), t); -} - -/** - * e_dialog_dateedit_get: - * @widget: A #GnomeDateEdit widget. - * - * Queries the value of a #GnomeDateEdit widget. - * - * Return value: Date/time value. - **/ -time_t -e_dialog_dateedit_get (GtkWidget *widget) -{ - g_return_val_if_fail (widget != NULL, -1); - g_return_val_if_fail (GNOME_IS_DATE_EDIT (widget), -1); - - return gnome_date_edit_get_time (GNOME_DATE_EDIT (widget)); -} - -/** * e_dialog_widget_hook_value: * @dialog: Dialog box in which the @widget lives in. * @widget: A widget that will control a variable. diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h index 1a46c02fd3..f5ff123a4f 100644 --- a/e-util/e-dialog-widgets.h +++ b/e-util/e-dialog-widgets.h @@ -46,9 +46,6 @@ int e_dialog_spin_get_int (GtkWidget *widget); void e_dialog_combo_box_set (GtkWidget *widget, int value, const int *value_map); int e_dialog_combo_box_get (GtkWidget *widget, const int *value_map); -void e_dialog_dateedit_set (GtkWidget *widget, time_t t); -time_t e_dialog_dateedit_get (GtkWidget *widget); - gboolean e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget, gpointer value_var, gpointer info); diff --git a/e-util/e-event.h b/e-util/e-event.h index 074d8deed2..c97f1b30bc 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -60,7 +60,7 @@ typedef void (*EEventFactoryFunc)(EEvent *ee, void *); **/ enum _e_event_t { E_EVENT_PASS, /* passthrough */ - E_EVENT_SINK, /* sink events */ + E_EVENT_SINK /* sink events */ }; /** diff --git a/e-util/e-menu.h b/e-util/e-menu.h index e6ee11f304..f844f80400 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -68,7 +68,7 @@ enum _e_menu_t { E_MENU_TOGGLE, E_MENU_RADIO, E_MENU_TYPE_MASK = 0xffff, - E_MENU_ACTIVE = 0x10000, + E_MENU_ACTIVE = 0x10000 }; /** diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index b7ac21adc1..dd84671902 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -42,14 +42,14 @@ typedef struct _EProfileEventClass EProfileEventClass; /* Current target description */ enum _e_profile_event_target_t { - E_PROFILE_EVENT_TARGET, + E_PROFILE_EVENT_TARGET }; /* Flags that qualify a target (UNIMPLEMENTED) */ enum { E_PROFILE_EVENT_START = 1<< 0, E_PROFILE_EVENT_END = 1<< 1, - E_PROFILE_EVENT_CANCEL = 1<< 2, + E_PROFILE_EVENT_CANCEL = 1<< 2 }; typedef struct _EProfileEventTarget EProfileEventTarget; diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index 4edd48a7dd..cfaa64c28a 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -41,7 +41,7 @@ typedef struct _ESignatureListClass ESignatureListClass; /* search options for the find command */ typedef enum { E_SIGNATURE_FIND_NAME, - E_SIGNATURE_FIND_UID, + E_SIGNATURE_FIND_UID } e_signature_find_t; struct _ESignatureList { diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index 599681c4d4..cf92b804f5 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -366,7 +366,7 @@ set_values (FilterDatespec *fds) p->type = fds->type==FDST_UNKNOWN ? FDST_NOW : fds->type; - note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc. + note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; /* FUTURE and AGO use the same notebook pages/etc. */ switch (p->type) { case FDST_NOW: diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h index 29c4f872b1..cbb79a46c5 100644 --- a/filter/filter-datespec.h +++ b/filter/filter-datespec.h @@ -42,7 +42,7 @@ typedef enum _FilterDatespec_type { FDST_NOW, FDST_SPECIFIED, FDST_X_AGO, - FDST_X_FUTURE, + FDST_X_FUTURE } FilterDatespec_type; struct _FilterDatespec { diff --git a/filter/filter-rule.h b/filter/filter-rule.h index 184c1270e5..b1683e1c8b 100644 --- a/filter/filter-rule.h +++ b/filter/filter-rule.h @@ -52,7 +52,7 @@ enum _filter_threading_t { FILTER_THREAD_ALL, /* add all possible threads */ FILTER_THREAD_REPLIES, /* add only replies */ FILTER_THREAD_REPLIES_PARENTS, /* replies plus parents */ - FILTER_THREAD_SINGLE, /* messages with no replies or parents */ + FILTER_THREAD_SINGLE /* messages with no replies or parents */ }; #define FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */ diff --git a/filter/rule-context.h b/filter/rule-context.h index f7a10df65f..ba7e47c381 100644 --- a/filter/rule-context.h +++ b/filter/rule-context.h @@ -45,7 +45,7 @@ typedef struct _RuleContextClass RuleContextClass; /* backend capabilities, this is a hack since we don't support nested rules */ enum { RULE_CONTEXT_GROUPING = 1 << 0, - RULE_CONTEXT_THREADING = 1 << 1, + RULE_CONTEXT_THREADING = 1 << 1 }; struct _RuleContext { diff --git a/filter/rule-editor.h b/filter/rule-editor.h index 4e675f839f..555b5e8263 100644 --- a/filter/rule-editor.h +++ b/filter/rule-editor.h @@ -77,7 +77,7 @@ enum { RULE_EDITOR_LOG_EDIT, RULE_EDITOR_LOG_ADD, RULE_EDITOR_LOG_REMOVE, - RULE_EDITOR_LOG_RANK, + RULE_EDITOR_LOG_RANK }; struct _RuleEditorUndo { diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 9a5b09afe3..43e5c0652c 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -38,7 +38,7 @@ typedef struct _EMAccountEditorClass EMAccountEditorClass; typedef enum { EMAE_NOTEBOOK, - EMAE_DRUID, + EMAE_DRUID } em_account_editor_t; struct _EMAccountEditor { diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 0425645abe..f427feca6d 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -660,13 +660,18 @@ create_new_composer (const char *subject, const char *fromuri, gboolean use_defa EAccount *account = NULL; composer = e_msg_composer_new (); - if (composer == NULL) - return NULL; + table = e_msg_composer_get_header_table (composer); + + if (fromuri != NULL) { + GList *list; - if (fromuri) account = mail_config_get_account_by_source_url(fromuri); - table = e_msg_composer_get_header_table (composer); + list = g_list_prepend (NULL, (gpointer) fromuri); + e_composer_header_table_set_post_to_list (table, list); + g_list_free (list); + } + e_composer_header_table_set_account (table, account); e_composer_header_table_set_subject (table, subject); @@ -729,82 +734,6 @@ em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri) gdk_window_raise (((GtkWidget *) composer)->window); } -/** - * em_utils_post_to_folder: - * @folder: folder - * - * Opens a new composer window as a child window of @parent's toplevel - * window. If @folder is non-NULL, the composer will default to posting - * mail to the folder specified by @folder. - **/ -void -em_utils_post_to_folder (CamelFolder *folder) -{ - EMsgComposer *composer; - EComposerHeaderTable *table; - EAccount *account; - - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_POST); - table = e_msg_composer_get_header_table (composer); - - if (folder != NULL) { - char *url = mail_tools_folder_to_url (folder); - GList *list = g_list_prepend (NULL, url); - - e_composer_header_table_set_post_to_list (table, list); - - g_list_free (list); - g_free (url); - - url = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, CAMEL_URL_HIDE_ALL); - account = mail_config_get_account_by_source_url (url); - g_free (url); - - if (account) - e_composer_header_table_set_account_name ( - table, account->name); - } - - em_composer_utils_setup_default_callbacks (composer); - - composer_set_no_change (composer, TRUE, TRUE); - - gtk_widget_show ((GtkWidget *) composer); - gdk_window_raise (((GtkWidget *) composer)->window); -} - -/** - * em_utils_post_to_url: - * @url: mailto url - * - * Opens a new composer window as a child window of @parent's toplevel - * window. If @url is non-NULL, the composer will default to posting - * mail to the folder specified by @url. - **/ -void -em_utils_post_to_url (const char *url) -{ - EMsgComposer *composer; - EComposerHeaderTable *table; - - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_POST); - table = e_msg_composer_get_header_table (composer); - - if (url != NULL) { - GList *list = NULL; - - list = g_list_prepend (list, (gpointer) url); - e_composer_header_table_set_post_to_list (table, list); - g_list_free (list); - } - - em_composer_utils_setup_default_callbacks (composer); - - composer_set_no_change (composer, TRUE, TRUE); - - gtk_widget_show ((GtkWidget *) composer); -} - /* Editing messages... */ static void @@ -1763,18 +1692,12 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, g_return_val_if_fail (to == NULL || CAMEL_IS_INTERNET_ADDRESS (to), NULL); g_return_val_if_fail (cc == NULL || CAMEL_IS_INTERNET_ADDRESS (cc), NULL); + composer = e_msg_composer_new (); + /* construct the tov/ccv */ tov = em_utils_camel_address_to_destination (to); ccv = em_utils_camel_address_to_destination (cc); - if (tov || ccv) { - if (postto && camel_address_length((CamelAddress *)postto)) - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL_POST); - else - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL); - } else - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_POST); - /* Set the subject of the new message. */ if ((subject = (char *) camel_mime_message_get_subject (message))) { if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0) @@ -1789,7 +1712,10 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, e_composer_header_table_set_account (table, account); e_composer_header_table_set_subject (table, subject); e_composer_header_table_set_destinations_to (table, tov); - e_composer_header_table_set_destinations_cc (table, ccv); + + /* Add destinations instead of setting, so we don't remove + * automatic CC addresses that have already been added. */ + e_composer_header_table_add_destinations_cc (table, ccv); g_free (subject); @@ -2047,7 +1973,7 @@ enum { ATTRIB_TM_YEAR, ATTRIB_TM_2YEAR, ATTRIB_TM_WDAY, /* not actually used */ - ATTRIB_TM_YDAY, + ATTRIB_TM_YDAY }; typedef void (* AttribFormatter) (GString *str, const char *attr, CamelMimeMessage *message); @@ -2400,124 +2326,3 @@ em_utils_reply_to_message(CamelFolder *folder, const char *uid, CamelMimeMessage gtk_widget_show (GTK_WIDGET (composer)); } - -/* Posting replies... */ - -static void -post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *message, void *user_data) -{ - /* FIXME: would be nice if this shared more code with reply_get_composer() */ - const char *message_id, *references; - CamelInternetAddress *to; - EDestination **tov = NULL; - CamelFolder *real_folder; - EMsgComposer *composer; - EComposerHeaderTable *table; - char *subject, *url; - EAccount *account; - char *real_uid; - guint32 flags; - GList *list = NULL; - - if (message == NULL) - return; - - if (CAMEL_IS_VEE_FOLDER (folder)) { - CamelMessageInfo *info; - - info = camel_folder_get_message_info (folder, uid); - real_folder = camel_vee_folder_get_location ((CamelVeeFolder *) folder, (struct _CamelVeeMessageInfo *) info, &real_uid); - camel_folder_free_message_info (folder, info); - } else { - real_folder = folder; - camel_object_ref (folder); - real_uid = g_strdup (uid); - } - - account = guess_account (message, real_folder); - flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN; - - to = camel_internet_address_new(); - get_reply_sender (message, to, NULL); - - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL_POST); - - /* construct the tov/ccv */ - tov = em_utils_camel_address_to_destination (to); - - /* Set the subject of the new message. */ - if ((subject = (char *) camel_mime_message_get_subject (message))) { - if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0) - subject = g_strdup_printf ("Re: %s", subject); - else - subject = g_strdup (subject); - } else { - subject = g_strdup (""); - } - - table = e_msg_composer_get_header_table (composer); - e_composer_header_table_set_account (table, account); - e_composer_header_table_set_subject (table, subject); - e_composer_header_table_set_destinations_to (table, tov); - - g_free (subject); - - url = mail_tools_folder_to_url (real_folder); - list = g_list_prepend (list, url); - - e_composer_header_table_set_post_to_list (table, list); - - g_list_free (list); - g_free (url); - - /* Add In-Reply-To and References. */ - message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-Id"); - references = camel_medium_get_header (CAMEL_MEDIUM (message), "References"); - if (message_id) { - char *reply_refs; - - e_msg_composer_add_header (composer, "In-Reply-To", message_id); - - if (references) - reply_refs = g_strdup_printf ("%s %s", references, message_id); - else - reply_refs = g_strdup (message_id); - - e_msg_composer_add_header (composer, "References", reply_refs); - g_free (reply_refs); - } else if (references) { - e_msg_composer_add_header (composer, "References", references); - } - - e_msg_composer_add_message_attachments (composer, message, TRUE); - - composer_set_body (composer, message, NULL); - - em_composer_utils_setup_callbacks (composer, real_folder, real_uid, flags, flags, NULL, NULL); - - composer_set_no_change (composer, TRUE, FALSE); - - gtk_widget_show (GTK_WIDGET (composer)); - - camel_object_unref (real_folder); - camel_object_unref(to); - g_free (real_uid); -} - -/** - * em_utils_post_reply_to_message_by_uid: - * @folder: folder containing message to reply to - * @uid: message uid - * @mode: reply mode - * - * Creates a new composer (post mode) ready to reply to the message - * referenced by @folder and @uid. - **/ -void -em_utils_post_reply_to_message_by_uid (CamelFolder *folder, const char *uid) -{ - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); -} diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index d17a98caa3..c46f808879 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -50,8 +50,6 @@ void em_utils_compose_new_message (const char *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ void em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri); -void em_utils_post_to_folder (struct _CamelFolder *folder); -void em_utils_post_to_url (const char *url); void em_utils_edit_message (struct _CamelMimeMessage *message, struct _CamelFolder *folder); void em_utils_edit_messages (struct _CamelFolder *folder, GPtrArray *uids, gboolean replace); @@ -79,8 +77,6 @@ enum { void em_utils_reply_to_message (struct _CamelFolder *, const char *uid, struct _CamelMimeMessage *message, int mode, struct _EMFormat *source); -void em_utils_post_reply_to_message_by_uid (struct _CamelFolder *folder, const char *uid); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/mail/em-config.h b/mail/em-config.h index 5530d27d00..ba19bb1c37 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -42,7 +42,7 @@ typedef struct _EMConfigClass EMConfigClass; enum _em_config_target_t { EM_CONFIG_TARGET_FOLDER, EM_CONFIG_TARGET_PREFS, - EM_CONFIG_TARGET_ACCOUNT, + EM_CONFIG_TARGET_ACCOUNT }; typedef struct _EMConfigTargetFolder EMConfigTargetFolder; diff --git a/mail/em-event.h b/mail/em-event.h index eb45050a27..21df1df42d 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -49,37 +49,37 @@ enum _em_event_target_t { EM_EVENT_TARGET_MESSAGE, EM_EVENT_TARGET_COMPOSER, EM_EVENT_TARGET_SEND_RECEIVE, - EM_EVENT_TARGET_CUSTOM_ICON, + EM_EVENT_TARGET_CUSTOM_ICON }; /* Flags for FOLDER BROWSER Events*/ enum { - EM_EVENT_FOLDER_BROWSER = 1<< 0, + EM_EVENT_FOLDER_BROWSER = 1<< 0 }; /* Flags that describe TARGET_FOLDER */ enum { - EM_EVENT_FOLDER_NEWMAIL = 1<< 0, + EM_EVENT_FOLDER_NEWMAIL = 1<< 0 }; /* Flags that describe TARGET_MESSAGE */ enum { - EM_EVENT_MESSAGE_REPLY_ALL = 1<< 0, + EM_EVENT_MESSAGE_REPLY_ALL = 1<< 0 }; /* Flags that describe TARGET_COMPOSER */ enum { - EM_EVENT_COMPOSER_SEND_OPTION = 1<< 0, + EM_EVENT_COMPOSER_SEND_OPTION = 1<< 0 }; /* Flags that describe TARGET_SEND_RECEIVE*/ enum { - EM_EVENT_SEND_RECEIVE = 1<< 0, + EM_EVENT_SEND_RECEIVE = 1<< 0 }; /* Flags that describe TARGET_CUSTOM_ICON*/ enum { - EM_EVENT_CUSTOM_ICON = 1<< 0, + EM_EVENT_CUSTOM_ICON = 1<< 0 }; typedef struct _EMEventTargetFolder EMEventTargetFolder; diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 58e42a5834..9a80a0c254 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -164,7 +164,6 @@ static const EMFolderViewEnable emfb_enable_map[] = { { "FolderRename", EM_POPUP_SELECT_FOLDER }, { "FolderRefresh", EM_POPUP_SELECT_FOLDER }, { "ChangeFolderProperties", EM_POPUP_SELECT_FOLDER }, - { "MailPost", EM_POPUP_SELECT_FOLDER }, { "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER }, { "ViewHideSelected", EM_POPUP_SELECT_MANY }, { "ViewThreadsCollapseAll", EM_FOLDER_VIEW_SELECT_THREADED}, @@ -181,7 +180,7 @@ enum { static guint folder_browser_signals [LAST_SIGNAL] = {0, }; enum { - ESB_SAVE, + ESB_SAVE }; static ESearchBarItem emfb_search_items[] = { @@ -1363,7 +1362,7 @@ emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, } if (!folder_choose && !emfb->view.preview->caret_mode && mail_config_get_enable_magic_spacebar ()) { - //check for unread messages. if yes .. rewindback to the folder + /* check for unread messages. if yes .. rewindback to the folder */ EMFolderTree *emft = g_object_get_data((GObject*)emfb, "foldertree"); switch (ev->key.keyval) { case GDK_space: @@ -1694,13 +1693,6 @@ emfb_mail_stop(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_mail_post(BonoboUIComponent *uid, void *data, const char *path) -{ - EMFolderView *emfv = data; - em_utils_post_to_folder (emfv->folder); -} - -static void emfb_tools_filters(BonoboUIComponent *uid, void *data, const char *path) { EMFolderBrowser *emfb = data; @@ -1779,7 +1771,6 @@ static BonoboUIVerb emfb_verbs[] = { BONOBO_UI_UNSAFE_VERB ("FolderCreate", emfb_folder_create), BONOBO_UI_UNSAFE_VERB ("HelpDebug", emfb_help_debug), - BONOBO_UI_UNSAFE_VERB ("MailPost", emfb_mail_post), BONOBO_UI_UNSAFE_VERB ("MailStop", emfb_mail_stop), BONOBO_UI_UNSAFE_VERB ("ToolsFilters", emfb_tools_filters), BONOBO_UI_UNSAFE_VERB ("ToolsSubscriptions", emfb_tools_subscriptions), diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 06b1bc4520..7b011f588c 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -61,11 +61,11 @@ struct _EMFolderSelectorClass { }; enum { - EM_FOLDER_SELECTOR_CAN_CREATE = 1, + EM_FOLDER_SELECTOR_CAN_CREATE = 1 }; enum { - EM_FOLDER_SELECTOR_RESPONSE_NEW = 1, + EM_FOLDER_SELECTOR_RESPONSE_NEW = 1 }; GType em_folder_selector_get_type (void); diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 8687b1cbd2..04e66e2c86 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -295,7 +295,7 @@ em_folder_tree_model_init (EMFolderTreeModel *model) model->account_hash = g_hash_table_new (g_direct_hash, g_direct_equal); model->account_changed_id = g_signal_connect (model->accounts, "account-changed", G_CALLBACK (account_changed), model); model->account_removed_id = g_signal_connect (model->accounts, "account-removed", G_CALLBACK (account_removed), model); - //g_signal_connect (model, "row-changed", G_CALLBACK (emft_model_unread_count_changed), NULL); + /* g_signal_connect (model, "row-changed", G_CALLBACK (emft_model_unread_count_changed), NULL); */ } static void diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 8e220955fa..e31d8d727c 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -185,7 +185,6 @@ static const EMFolderViewEnable emfv_enable_map[] = { { "MessageFollowUpClear", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_FLAG_CLEAR }, { "MessageMove", EM_POPUP_SELECT_MANY }, { "MessageOpen", EM_POPUP_SELECT_MANY }, - { "MessagePostReply", EM_POPUP_SELECT_ONE }, { "MessageReplyAll", EM_POPUP_SELECT_ONE }, { "MessageReplyList", EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST }, { "MessageReplySender", EM_POPUP_SELECT_ONE }, @@ -1726,20 +1725,6 @@ emfv_message_redirect (BonoboUIComponent *uic, void *data, const char *path) em_utils_redirect_message_by_uid (emfv->folder, emfv->list->cursor_uid); } -static void -emfv_message_post_reply (BonoboUIComponent *uic, void *data, const char *path) -{ - EMFolderView *emfv = data; - - if (emfv->list->cursor_uid == NULL) - return; - - if (!em_utils_check_user_can_send_mail ((GtkWidget *) emfv)) - return; - - em_utils_post_reply_to_message_by_uid (emfv->folder, emfv->list->cursor_uid); -} - static gboolean html_contains_nonwhitespace (const char *html, gint len) { @@ -2073,7 +2058,6 @@ static BonoboUIVerb emfv_message_verbs[] = { BONOBO_UI_UNSAFE_VERB ("MessageFollowUpClear", emfv_message_followup_clear), BONOBO_UI_UNSAFE_VERB ("MessageMove", emfv_message_move), BONOBO_UI_UNSAFE_VERB ("MessageOpen", emfv_message_open), - BONOBO_UI_UNSAFE_VERB ("MessagePostReply", emfv_message_post_reply), BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", emfv_message_reply_all), BONOBO_UI_UNSAFE_VERB ("MessageReplyList", emfv_message_reply_list), BONOBO_UI_UNSAFE_VERB ("MessageReplySender", emfv_message_reply_sender), @@ -2752,7 +2736,6 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem emfv_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.11", N_("C_all To..."), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_CALLTO }, { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "edit-copy", EM_POPUP_URI_NOT_MAILTO }, { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, @@ -2822,7 +2805,7 @@ emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu gtk_widget_destroy (GTK_WIDGET (src_menu)); /* free src_emp together with des_emp; name contains unique identifier */ - name = g_strdup_printf ("emp_%p", src_emp); + name = g_strdup_printf ("emp_%p", (gpointer) src_emp); g_object_set_data_full (G_OBJECT (des_emp), name, src_emp, emfv_free_em_popup); g_free (name); diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index 42ef20d296..4af4760cac 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -67,7 +67,7 @@ enum { EM_FOLDER_VIEW_SELECT_SELECTION = EM_POPUP_SELECT_LAST<<6, EM_FOLDER_VIEW_SELECT_NOSELECTION = EM_POPUP_SELECT_LAST<<7, EM_FOLDER_VIEW_PREVIEW_PRESENT = EM_POPUP_SELECT_LAST<<8, - EM_FOLDER_VIEW_SELECT_LAST = EM_POPUP_SELECT_LAST<<9, + EM_FOLDER_VIEW_SELECT_LAST = EM_POPUP_SELECT_LAST<<9 }; struct _EMFolderViewEnable { diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index bc2f4e25bf..aba9c64069 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -175,7 +175,7 @@ enum { EFHD_LINK_CLICKED, EFHD_POPUP_EVENT, EFHD_ON_URL, - EFHD_LAST_SIGNAL, + EFHD_LAST_SIGNAL }; static guint efhd_signals[EFHD_LAST_SIGNAL] = { 0 }; @@ -595,11 +595,11 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd) g_signal_connect (G_OBJECT (p->search_entry), "changed", (GCallback) icon_entry_changed_cb, clear_button); gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, FALSE, FALSE, 0); -// gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0); + /* gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0); */ hbox2 = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, FALSE, FALSE, 5); -// gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); + /* gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); */ button3 = gtk_button_new_with_mnemonic (_("_Previous")); gtk_button_set_image (GTK_BUTTON (button3), GTK_WIDGET(gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON))); diff --git a/mail/em-format-html.h b/mail/em-format-html.h index a34f7b6915..7cadd5e282 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -65,7 +65,7 @@ typedef struct _EMFormatHTMLPrivate EMFormatHTMLPrivate; enum _em_format_html_header_flags { EM_FORMAT_HTML_HEADER_TO = 1<<0, EM_FORMAT_HTML_HEADER_CC = 1<<1, - EM_FORMAT_HTML_HEADER_BCC = 1<<2, + EM_FORMAT_HTML_HEADER_BCC = 1<<2 }; typedef enum { diff --git a/mail/em-format.c b/mail/em-format.c index 89445ab35a..1d5570be96 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -82,7 +82,7 @@ static void emf_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart static gboolean emf_busy(EMFormat *emf); enum { EMF_COMPLETE, - EMF_LAST_SIGNAL, + EMF_LAST_SIGNAL }; static guint emf_signals[EMF_LAST_SIGNAL]; @@ -718,7 +718,7 @@ emf_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeM g_string_truncate(emf->part_id, 0); if (folder != NULL) /* TODO build some string based on the folder name/location? */ - g_string_append_printf(emf->part_id, ".%p", folder); + g_string_append_printf(emf->part_id, ".%p", (gpointer) folder); if (uid != NULL) g_string_append_printf(emf->part_id, ".%s", uid); } diff --git a/mail/em-format.h b/mail/em-format.h index 004d9c2e96..92c6b3dddf 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -71,7 +71,7 @@ typedef void (*EMFormatFunc) (EMFormat *md, CamelStream *stream, CamelMimePart * typedef enum _em_format_mode_t { EM_FORMAT_NORMAL, EM_FORMAT_ALLHEADERS, - EM_FORMAT_SOURCE, + EM_FORMAT_SOURCE } em_format_mode_t; /** @@ -103,7 +103,7 @@ struct _EMFormatHandler { **/ enum _em_format_handler_t { EM_FORMAT_HANDLER_INLINE = 1<<0, - EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1, + EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1 }; diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index 07c7afa192..f671159369 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -102,7 +102,7 @@ enum { EMIF_BINHEX, EMIF_POSTSCRIPT, EMIF_PGPSIGNED, - EMIF_PGPENCRYPTED, + EMIF_PGPENCRYPTED }; static const struct { diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index e489e16826..9784f480b8 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -60,7 +60,7 @@ enum { HEADER_LIST_ENABLED_COLUMN, /* is the header enabled? */ HEADER_LIST_IS_DEFAULT_COLUMN, /* is this header a default header, eg From: */ HEADER_LIST_HEADER_COLUMN, /* the real name of this header */ - HEADER_LIST_N_COLUMNS, + HEADER_LIST_N_COLUMNS }; static GType col_types[] = { @@ -190,7 +190,7 @@ enum { enum { JH_LIST_COLUMN_NAME, - JH_LIST_COLUMN_VALUE, + JH_LIST_COLUMN_VALUE }; static void label_sensitive_buttons (EMMailerPrefs *prefs) @@ -356,7 +356,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) char *tok; GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - //FIXME: Validate the values + /* FIXME: Validate the values */ tok = g_strdup_printf ("%s=%s", name, value); list = g_slist_append (list, tok); @@ -842,18 +842,6 @@ custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) } -#if 0 -// not used at the moment, commenting out -static void -toggle_button_toggled_not (GtkToggleButton *toggle, EMMailerPrefs *prefs) -{ - const char *key; - - key = g_object_get_data ((GObject *) toggle, "key"); - gconf_client_set_bool (prefs->gconf, key, !gtk_toggle_button_get_active (toggle), NULL); -} -#endif - static void custom_font_changed (GtkToggleButton *toggle, EMMailerPrefs *prefs) { diff --git a/mail/em-menu.h b/mail/em-menu.h index 48fc96b7fc..08467fefd8 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -40,7 +40,7 @@ typedef struct _EMMenuClass EMMenuClass; /* Types of popup tagets */ enum _em_menu_target_t { EM_MENU_TARGET_SELECT, - EM_MENU_TARGET_WIDGET, + EM_MENU_TARGET_WIDGET }; /* Flags that describe a TARGET_SELECT */ diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 8338bf56dc..1c58b6ca99 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -1347,7 +1347,7 @@ nofile: enum { CP_UNIQUE = 0, CP_OVERWRITE, - CP_APPEND, + CP_APPEND }; static int open_flags[3] = { @@ -2936,7 +2936,7 @@ migrate_to_db() i++; e_iterator_next (iter); } - //camel_session_set_online ((CamelSession *) session, TRUE); + /* camel_session_set_online ((CamelSession *) session, TRUE); */ g_object_unref (iter); em_migrate_close_progress_dialog (); } diff --git a/mail/em-popup.c b/mail/em-popup.c index debad8cb56..192ab7ac7b 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -261,10 +261,6 @@ em_popup_target_new_uri(EMPopup *emp, const char *uri) if (g_ascii_strncasecmp(uri, "http:", 5) == 0 || g_ascii_strncasecmp(uri, "https:", 6) == 0) mask &= ~EM_POPUP_URI_HTTP; - else if (g_ascii_strncasecmp(uri, "sip:", 3) == 0 - || g_ascii_strncasecmp(uri, "h323:", 5) == 0 - || g_ascii_strncasecmp(uri, "callto:", 7) == 0) - mask &= ~EM_POPUP_URI_CALLTO; if (g_ascii_strncasecmp(uri, "mailto:", 7) == 0) mask &= ~EM_POPUP_URI_MAILTO; @@ -824,7 +820,6 @@ static const EPopupHookTargetMask emph_uri_masks[] = { { "http", EM_POPUP_URI_HTTP }, { "mailto", EM_POPUP_URI_MAILTO }, { "notmailto", EM_POPUP_URI_NOT_MAILTO }, - { "callto", EM_POPUP_URI_CALLTO }, { NULL } }; diff --git a/mail/em-popup.h b/mail/em-popup.h index 77f80e5599..870055140b 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -104,7 +104,7 @@ enum _em_popup_target_select_t { EM_POPUP_SELECT_FOLDER = 1<<15, /* do we have any folder at all? */ EM_POPUP_SELECT_JUNK = 1<<16, EM_POPUP_SELECT_NOT_JUNK = 1<<17, - EM_POPUP_SELECT_LAST = 1<<18, + EM_POPUP_SELECT_LAST = 1<<18 }; /** @@ -113,14 +113,12 @@ enum _em_popup_target_select_t { * @EM_POPUP_URI_HTTP: This is a HTTP or HTTPS url. * @EM_POPUP_URI_MAILTO: This is a MAILTO url. * @EM_POPUP_URI_NOT_MAILTO: This is not a MAILTO url. - * @EM_POPUP_URI_CALLTO: This is a CALLTO url. * **/ enum _em_popup_target_uri_t { EM_POPUP_URI_HTTP = 1<<0, EM_POPUP_URI_MAILTO = 1<<1, - EM_POPUP_URI_NOT_MAILTO = 1<<2, - EM_POPUP_URI_CALLTO = 1<<3, + EM_POPUP_URI_NOT_MAILTO = 1<<2 }; /** @@ -132,7 +130,7 @@ enum _em_popup_target_uri_t { **/ enum _em_popup_target_part_t { EM_POPUP_PART_MESSAGE = 1<<0, - EM_POPUP_PART_IMAGE = 1<<1, + EM_POPUP_PART_IMAGE = 1<<1 }; /** @@ -153,7 +151,7 @@ enum _em_popup_target_folder_t { EM_POPUP_FOLDER_DELETE = 1<<3, /* folder can be deleted/renamed */ EM_POPUP_FOLDER_SELECT = 1<<4, /* folder can be selected/opened */ EM_POPUP_FOLDER_OUTBOX = 1<<5, /* Outbox folder */ - EM_POPUP_FOLDER_NONSTATIC = 1<<6, /* Except static folders like Outbox.*/ + EM_POPUP_FOLDER_NONSTATIC = 1<<6 /* Except static folders like Outbox.*/ }; typedef struct _EMPopupTargetSelect EMPopupTargetSelect; diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 724b9b4874..9842e32d0e 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -356,7 +356,8 @@ sub_folderinfo_exec (struct _emse_folderinfo_msg *m) if (m->seq == m->sub->seq) { camel_operation_register(m->base.cancel); - m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &m->base.ex); + m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, + CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST, &m->base.ex); camel_operation_unregister(m->base.cancel); } } diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index ce388eea42..311c2e1b7a 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -39,7 +39,7 @@ enum _write_msg_t { EMSS_WRITE, EMSS_FLUSH, - EMSS_CLOSE, + EMSS_CLOSE }; struct _write_msg { diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 6e12a0456d..a777faaefe 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -366,7 +366,7 @@ rule_copy(FilterRule *dest, FilterRule *src) enum { BUTTON_ADD, BUTTON_REMOVE, - BUTTON_LAST, + BUTTON_LAST }; struct _source_data { diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h index 18f8c3156b..bc6a330c4b 100644 --- a/mail/em-vfolder-rule.h +++ b/mail/em-vfolder-rule.h @@ -37,7 +37,7 @@ enum _em_vfolder_rule_with_t { EM_VFOLDER_RULE_WITH_SPECIFIC, EM_VFOLDER_RULE_WITH_LOCAL_REMOTE_ACTIVE, EM_VFOLDER_RULE_WITH_REMOTE_ACTIVE, - EM_VFOLDER_RULE_WITH_LOCAL, + EM_VFOLDER_RULE_WITH_LOCAL }; typedef struct _EMVFolderRule EMVFolderRule; diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index e63d9eec4a..fbc23eb746 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -116,71 +116,91 @@ </schema> <schema> - <key>/schemas/apps/evolution/mail/composer/view/From</key> - <applyto>/apps/evolution/mail/composer/view/From</applyto> + <key>/schemas/apps/evolution/mail/composer/show_mail_bcc</key> + <applyto>/apps/evolution/mail/composer/show_mail_bcc</applyto> + <owner>evolution-mail</owner> + <type>bool</type> + <default>false</default> + <locale name="C"> + <short>Show "Bcc" field when sending a mail message</short> + <long> + Show the "Bcc" field when sending a mail message. This is + controlled from the View menu when a mail account is chosen. + </long> + </locale> + </schema> + + <schema> + <key>/schemas/apps/evolution/mail/composer/show_mail_cc</key> + <applyto>/apps/evolution/mail/composer/show_mail_cc</applyto> <owner>evolution-mail</owner> <type>bool</type> <default>true</default> <locale name="C"> - <short>View/From menu item is checked</short> + <short>Show "Cc" field when sending a mail message</short> <long> - View/From menu item is checked. + Show the "Cc" field when sending a mail message. This is + controlled from the View menu when a mail account is chosen. </long> </locale> </schema> <schema> - <key>/schemas/apps/evolution/mail/composer/view/PostTo</key> - <applyto>/apps/evolution/mail/composer/view/PostTo</applyto> + <key>/schemas/apps/evolution/mail/composer/show_mail_from</key> + <applyto>/apps/evolution/mail/composer/show_mail_from</applyto> <owner>evolution-mail</owner> <type>bool</type> <default>true</default> <locale name="C"> - <short>View/PostTo menu item is checked</short> + <short>Show "From" field when sending a mail message</short> <long> - View/PostTo menu item is checked. + Show the "From" field when sending a mail message. This is + controlled from the View menu when a mail account is chosen. </long> </locale> </schema> <schema> - <key>/schemas/apps/evolution/mail/composer/view/ReplyTo</key> - <applyto>/apps/evolution/mail/composer/view/ReplyTo</applyto> + <key>/schemas/apps/evolution/mail/composer/show_mail_reply_to</key> + <applyto>/apps/evolution/mail/composer/show_mail_reply_to</applyto> <owner>evolution-mail</owner> <type>bool</type> <default>false</default> <locale name="C"> - <short>View/ReplyTo menu item is checked</short> + <short>Show "Reply To" field when sending a mail message</short> <long> - View/ReplyTo menu item is checked. + Show the "Reply To" field when sending a mail message. This + is controlled from the View menu when a mail account is chosen. </long> </locale> </schema> <schema> - <key>/schemas/apps/evolution/mail/composer/view/Cc</key> - <applyto>/apps/evolution/mail/composer/view/Cc</applyto> + <key>/schemas/apps/evolution/mail/composer/show_post_from</key> + <applyto>/apps/evolution/mail/composer/show_post_from</applyto> <owner>evolution-mail</owner> <type>bool</type> - <default>false</default> + <default>true</default> <locale name="C"> - <short>View/Cc menu item is checked</short> + <short>Show "From" field when posting to a newsgroup</short> <long> - View/Cc menu item is checked. + Show the "From" field when posting to a newsgroup. This is + controlled from the View menu when a news account is chosen. </long> </locale> </schema> <schema> - <key>/schemas/apps/evolution/mail/composer/view/Bcc</key> - <applyto>/apps/evolution/mail/composer/view/Bcc</applyto> + <key>/schemas/apps/evolution/mail/composer/show_post_reply_to</key> + <applyto>/apps/evolution/mail/composer/show_post_reply_to</applyto> <owner>evolution-mail</owner> <type>bool</type> <default>false</default> <locale name="C"> - <short>View/Bcc menu item is checked</short> + <short>Show "Reply To" field when posting to a newsgroup</short> <long> - View/Bcc menu item is checked. + Show the "Reply To" field when posting to a newsgroup. This + is controlled from the View menu when a news account is chosen. </long> </locale> </schema> diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index 9f2f66674a..bae8bd8313 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -35,7 +35,7 @@ enum { AUTO_SUBJECT = 1, AUTO_FROM = 2, AUTO_TO = 4, - AUTO_MLIST = 8, + AUTO_MLIST = 8 }; struct _FilterRule *em_vfolder_rule_from_message(struct _EMVFolderContext *context, struct _CamelMimeMessage *msg, int flags, const char *source); diff --git a/mail/mail-component.h b/mail/mail-component.h index 3aa088c890..c1215c61c4 100644 --- a/mail/mail-component.h +++ b/mail/mail-component.h @@ -47,7 +47,7 @@ enum _mail_component_folder_t { MAIL_COMPONENT_FOLDER_OUTBOX, MAIL_COMPONENT_FOLDER_SENT, MAIL_COMPONENT_FOLDER_TEMPLATES, - MAIL_COMPONENT_FOLDER_LOCAL_INBOX, + MAIL_COMPONENT_FOLDER_LOCAL_INBOX }; struct _MailComponent { diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index a1589cec79..ed3d583927 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -1048,10 +1048,7 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) gboolean mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) { - char *uri; - - uri = mail_tools_folder_to_url (folder); - + char *uri = mail_tools_folder_to_url (folder); struct _find_info fi = { uri, NULL, NULL }; if (stores == NULL) diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 5d26c13b3f..6388a56938 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -132,7 +132,7 @@ mail_msg_new (MailMsgInfo *info) #ifdef LOG_OPS if (log_ops) - fprintf(log, "%p: New\n", msg); + fprintf(log, "%p: New\n", (gpointer) msg); #endif MAIL_MT_UNLOCK(mail_msg_lock); diff --git a/mail/mail-mt.h b/mail/mail-mt.h index dba4adee16..b95620a000 100644 --- a/mail/mail-mt.h +++ b/mail/mail-mt.h @@ -100,7 +100,7 @@ typedef struct _MailAsyncEvent { typedef enum _mail_async_event_t { MAIL_ASYNC_GUI, - MAIL_ASYNC_THREAD, + MAIL_ASYNC_THREAD } mail_async_event_t; typedef void (*MailAsyncFunc)(void *, void *, void *); @@ -119,7 +119,7 @@ typedef enum { MAIL_CALL_p_ppp, MAIL_CALL_p_pppp, MAIL_CALL_p_ppppp, - MAIL_CALL_p_ppippp, + MAIL_CALL_p_ppippp } mail_call_t; typedef void *(*MailMainFunc)(); diff --git a/mail/mail-ops.c b/mail/mail-ops.c index a8aa14d278..6feadd5b9c 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -36,7 +36,6 @@ #include <glib.h> #include <glib/gstdio.h> -#include <libgnome/gnome-exec.h> #include <glib/gi18n.h> #include <camel/camel-mime-filter-from.h> @@ -1658,9 +1657,9 @@ refresh_folder_desc (struct _sync_folder_msg *m) static void refresh_folder_exec (struct _sync_folder_msg *m) { - //camel_folder_sync (m->folder, FALSE, &m->base.ex); + /* camel_folder_sync (m->folder, FALSE, &m->base.ex); */ - //if (!camel_exception_is_set (&m->base.ex)) + /* if (!camel_exception_is_set (&m->base.ex)) */ camel_folder_refresh_info(m->folder, &m->base.ex); } @@ -2514,7 +2513,7 @@ mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, vo if (argc <= 0) return; - gnome_execute_async_fds (NULL, argc, argv, TRUE); + g_spawn_async (NULL, argv, NULL, 0, NULL, data, NULL, NULL); } /* Async service-checking/authtype-lookup code. */ diff --git a/mail/message-list.c b/mail/message-list.c index 68177535e2..e2c23db51a 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -126,7 +126,7 @@ static struct { enum { DND_X_UID_LIST, /* x-uid-list */ DND_MESSAGE_RFC822, /* message/rfc822 */ - DND_TEXT_URI_LIST, /* text/uri-list */ + DND_TEXT_URI_LIST /* text/uri-list */ }; /* What we send */ @@ -170,7 +170,7 @@ enum { NORMALISED_SUBJECT, NORMALISED_FROM, NORMALISED_TO, - NORMALISED_LAST, + NORMALISED_LAST }; /* #define SMART_ADDRESS_COMPARE */ @@ -4169,7 +4169,7 @@ regen_list_exec (struct _regen_list_msg *m) e_profile_event_emit("list.threaduids", m->folder->full_name, 0); - //camel_folder_summary_reload_from_db (m->folder->summary, NULL); + /* camel_folder_summary_reload_from_db (m->folder->summary, NULL); */ if (!camel_operation_cancel_check(m->base.cancel)) { camel_folder_sort_uids (m->folder, showuids); diff --git a/mail/message-list.h b/mail/message-list.h index 47be897fd2..15dae0fcb7 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -73,7 +73,7 @@ enum { /* Invisible columns */ COL_DELETED, COL_UNREAD, - COL_COLOUR, + COL_COLOUR }; #define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \ @@ -178,7 +178,7 @@ typedef enum { MESSAGE_LIST_SELECT_NEXT = 0, MESSAGE_LIST_SELECT_PREVIOUS = 1, MESSAGE_LIST_SELECT_DIRECTION = 1, /* direction mask */ - MESSAGE_LIST_SELECT_WRAP = 1<<1, /* option bit */ + MESSAGE_LIST_SELECT_WRAP = 1<<1 /* option bit */ } MessageListSelectDirection; GType message_list_get_type (void); diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 8634ce4000..08c1956303 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -65,7 +65,7 @@ typedef struct { enum { CLUE_KEYWORD_COLUMN, - CLUE_N_COLUMNS, + CLUE_N_COLUMNS }; int e_plugin_lib_enable (EPluginLib *ep, int enable); diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 5d4a911c9a..f9745e8972 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -48,7 +48,7 @@ void backup_restore_abort (EPlugin *ep, EMConfigTargetAccount *target); typedef enum _br_flags { BR_OK = 1<<0, - BR_START = 1<<1, + BR_START = 1<<1 }br_flags; static void diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index fe1a73febb..85e275f2a0 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -55,7 +55,7 @@ typedef struct { enum { HEADER_KEY_COLUMN, HEADER_VALUE_COLUMN, - HEADER_N_COLUMNS, + HEADER_N_COLUMNS }; struct _EmailCustomHeaderOptionsDialogPrivate { @@ -350,7 +350,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) for (header_section_id = 0,label_row = 0,row = 0,column = 1; header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) { - // To create an empty label widget. Text will be added dynamically. + /* To create an empty label widget. Text will be added dynamically. */ priv->header_type_name_label = gtk_label_new (""); temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id); str = (temp_header_ptr->header_type_value)->str; diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index ae889247c8..ccfb6afb71 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -136,7 +136,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data) /* "Cacel" button was hit */ return; } - //g_print ("Current password is \"%s\"\n", old_password); + /* g_print ("Current password is \"%s\"\n", old_password); */ result = exchange_account_set_password (account, old_password, new_password); if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS) exchange_operations_report_error (account, result); diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 2f60b34bff..bfe295447f 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -113,10 +113,10 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data) /*changes = camel_folder_change_info_new (); camel_folder_change_info_remove_uid (changes, (char *) item_id); camel_folder_summary_remove_uid (folder->summary, item_id);*/ - //camel_folder_delete_message (folder, item_id); + /* camel_folder_delete_message (folder, item_id); */ camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED); camel_folder_summary_touch (folder->summary); - //camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); + /* camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); */ uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL); account = mail_config_get_account_by_source_url (uri); uri = account->source->url; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 0b811d0787..3a850b2a55 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -94,7 +94,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store) if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) return; em_folder_tree_model_add_store (model, store, account->name); - //camel_object_unref (store); + /* camel_object_unref (store); */ } void diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index d16c205758..9b3062b1c3 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -181,7 +181,7 @@ free_all (ShareFolder *sf) sf->users_list = NULL; } - //e_gw_connection_free_container_list (sf->container_list); + /* e_gw_connection_free_container_list (sf->container_list); */ } diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h index ec627d18ce..327cd986fd 100644 --- a/plugins/publish-calendar/publish-location.h +++ b/plugins/publish-calendar/publish-location.h @@ -31,29 +31,25 @@ G_BEGIN_DECLS enum publish_frequency { URI_PUBLISH_DAILY, URI_PUBLISH_WEEKLY, - URI_PUBLISH_MANUAL, - /* URI_PUBLISH_AUTO, */ + URI_PUBLISH_MANUAL }; static const int publish_frequency_type_map[] = { URI_PUBLISH_DAILY, URI_PUBLISH_WEEKLY, URI_PUBLISH_MANUAL, - /* URI_PUBLISH_AUTO, */ -1, }; enum publish_format { URI_PUBLISH_AS_ICAL, - URI_PUBLISH_AS_FB, - /* URI_PUBLISH_AS_HTML, */ + URI_PUBLISH_AS_FB }; static const int publish_format_type_mask[] = { URI_PUBLISH_AS_ICAL, URI_PUBLISH_AS_FB, - /* URI_PUBLISH_AS_HTML, */ - -1, + -1 }; enum FBDurationType { diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index 3a85fc895e..94a1a71f00 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -40,7 +40,7 @@ enum { URL_LIST_ENABLED_COLUMN, URL_LIST_LOCATION_COLUMN, URL_LIST_URL_COLUMN, - URL_LIST_N_COLUMNS, + URL_LIST_N_COLUMNS }; enum { @@ -50,7 +50,7 @@ enum { TYPE_SMB, TYPE_DAV, TYPE_DAVS, - TYPE_URI, + TYPE_URI }; typedef struct _UrlEditorDialog UrlEditorDialog; diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 5114e9b386..39efa2f5ac 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -59,7 +59,6 @@ static pthread_mutex_t em_junk_sa_preferred_socket_path_lock = PTHREAD_MUTEX_INI static pthread_mutex_t em_junk_sa_spamd_restart_lock = PTHREAD_MUTEX_INITIALIZER; int e_plugin_lib_enable (EPluginLib *ep, int enable); -//static const char *em_junk_sa_get_name (void); gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target); @@ -104,14 +103,6 @@ static gboolean em_junk_sa_allow_tell_tested = FALSE; char *em_junk_sa_spamc_gconf_binary = NULL; char *em_junk_sa_spamd_gconf_binary = NULL; -#if 0 -static const char * -em_junk_sa_get_name (void) -{ - return _("SpamAssassin (built-in)"); -} -#endif - static int pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error) { @@ -762,10 +753,6 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) void em_junk_sa_commit_reports (EPlugin *ep) { - /* Only meaningful if we're using sa-learn */ - if (!no_allow_tell) - return; - char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild"); char *argv[4] = { "sa-learn", @@ -774,6 +761,10 @@ em_junk_sa_commit_reports (EPlugin *ep) NULL }; + /* Only meaningful if we're using sa-learn */ + if (!no_allow_tell) + return; + d(fprintf (stderr, "em_junk_sa_commit_reports\n")); if (em_junk_sa_is_available (NULL)) { diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index eae87721c4..537b8822bc 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -60,7 +60,7 @@ typedef struct { enum { CLUE_KEYWORD_COLUMN, CLUE_VALUE_COLUMN, - CLUE_N_COLUMNS, + CLUE_N_COLUMNS }; typedef struct { diff --git a/po/POTFILES.in b/po/POTFILES.in index 8ebac02e3a..39a35ece46 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -477,6 +477,7 @@ widgets/menus/gal-view-new-dialog.glade widgets/misc/e-attachment.c widgets/misc/e-attachment-dialog.c widgets/misc/e-attachment-handler-image.c +widgets/misc/e-attachment-handler-sendto.c widgets/misc/e-attachment-icon-view.c widgets/misc/e-attachment-paned.c widgets/misc/e-attachment-store.c @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: evolution.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution\n" -"POT-Creation-Date: 2009-05-03 04:00+0000\n" -"PO-Revision-Date: 2009-05-03 19:02+0200\n" +"POT-Creation-Date: 2009-05-17 03:19+0000\n" +"PO-Revision-Date: 2009-05-18 23:02+0200\n" "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" @@ -171,7 +171,7 @@ msgstr "%A, %e de %b de %Y" #. specifiers or add anything. #: ../a11y/calendar/ea-gnome-calendar.c:189 #: ../calendar/gui/calendar-component.c:774 -#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599 +#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1598 #: ../calendar/gui/e-week-view-main-item.c:335 msgid "%a %d %b" msgstr "%a, %e de %b" @@ -203,7 +203,7 @@ msgstr "%e de %B de %Y" #. change the specifiers or add anything. #: ../a11y/calendar/ea-gnome-calendar.c:219 #: ../calendar/gui/calendar-component.c:800 -#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615 +#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1614 #: ../calendar/gui/e-week-view-main-item.c:349 msgid "%d %b" msgstr "%e de %b" @@ -389,9 +389,9 @@ msgstr "No se pudo eliminar la libreta de direcciones." #: ../addressbook/addressbook.error.xml.h:11 msgid "" -"Currently you can access only GroupWise System Address Book from Evolution. " -"Please use some other GroupWise mail client once, to get your GroupWise " -"Frequent Contacts and GroupWise Personal Contacts folders." +"Currently you can only access the GroupWise System Address Book from " +"Evolution. Please use some other GroupWise mail client once to get your " +"GroupWise Frequent Contacts and Groupwise Personal Contacts folders." msgstr "" "Actualmente sólo puede acceder a la libreta de direcciones del sistema de " "GroupWise desde Evolution. Use algún cliente de correo de GroupWise una sola " @@ -654,7 +654,7 @@ msgstr "Gestione sus certificados S/MIME aquí" #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091 #: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:200 #: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2890 -#: ../mail/mail-component.c:318 ../mail/mail-vfolder.c:223 +#: ../mail/mail-component.c:318 ../mail/mail-vfolder.c:217 #: ../mail/message-list.c:1517 msgid "On This Computer" msgstr "En este equipo" @@ -799,7 +799,7 @@ msgstr "" #: ../addressbook/gui/component/addressbook-config.c:1022 #: ../addressbook/gui/component/ldap-config.glade.h:17 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 #: ../calendar/gui/dialogs/calendar-setup.c:367 #: ../calendar/gui/dialogs/calendar-setup.c:378 #: ../calendar/gui/dialogs/calendar-setup.c:389 @@ -1143,14 +1143,17 @@ msgid "Search _filter:" msgstr "_Filtro de búsqueda:" #: ../addressbook/gui/component/ldap-config.glade.h:27 +#| msgid "" +#| "Search filter is the type of the objects searched for, while performing " +#| "the search. If this is not modified, by default search will be performed " +#| "on objectclass of the type \"person\"." msgid "" -"Search filter is the type of the objects searched for, while performing the " -"search. If this is not modified, by default search will be performed on " -"objectclass of the type \"person\"." +"Search filter is the type of object to be searched for. If this is not " +"modified, the default search will be performed on the type \"person\"." msgstr "" -"Filtro de búsqueda es el tipo de los objetos buscados, mientras se realiza " -"la búsqueda. Si esto no se modifica, la búsqueda por omisión se realizará " -"sobre la clase de objetos de tipo «person»." +"El filtro de búsqueda es el tipo de los objetos que buscar. Si no se " +"modifica, la búsqueda predeterminada se realizará sobre la clase de objetos " +"de tipo «person»." #: ../addressbook/gui/component/ldap-config.glade.h:28 msgid "Supported Search Bases" @@ -1220,7 +1223,7 @@ msgstr "Á_mbito de búsqueda:" #: ../addressbook/gui/component/ldap-config.glade.h:39 #: ../mail/mail-config.glade.h:185 -#: ../plugins/publish-calendar/publish-calendar.glade.h:26 +#: ../plugins/publish-calendar/publish-calendar.glade.h:27 msgid "_Server:" msgstr "_Servidor:" @@ -1344,7 +1347,7 @@ msgid "_Birthday:" msgstr "_Cumpleaños:" #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23 -#: ../calendar/gui/dialogs/event-page.c:792 +#: ../calendar/gui/dialogs/event-page.c:805 #: ../calendar/gui/dialogs/event-page.glade.h:14 #: ../plugins/itip-formatter/itip-view.c:1910 msgid "_Calendar:" @@ -1650,7 +1653,6 @@ msgstr "" "\n" "Sr.\n" "Sra.\n" -"Sr.\n" "Srta.\n" "Dr." @@ -1664,6 +1666,8 @@ msgid "" "III\n" "Esq." msgstr "" +"\n" +"Sr." #: ../addressbook/gui/contact-editor/fullname.glade.h:14 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16 @@ -2255,16 +2259,16 @@ msgstr "Seleccionado" msgid "Has Cursor" msgstr "Tiene el cursor" -#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:549 +#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545 msgid "_Open Link in Browser" msgstr "_Abrir enlace en el navegador" #: ../addressbook/gui/widgets/eab-contact-display.c:170 -#: ../mail/em-folder-view.c:2756 +#: ../mail/em-folder-view.c:2755 msgid "_Copy Link Location" msgstr "_Copiar dirección del enlace" -#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:550 +#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546 msgid "_Send New Message To..." msgstr "_Enviar un mensaje nuevo a…" @@ -2322,7 +2326,7 @@ msgid "Calendar" msgstr "Calendario" #: ../addressbook/gui/widgets/eab-contact-display.c:629 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 #: ../calendar/gui/dialogs/event-editor.c:116 msgid "Free/Busy" msgstr "Disponibilidad" @@ -2660,22 +2664,22 @@ msgstr "Mover contactos a" msgid "Copy contacts to" msgstr "Copiar contactos a" -#: ../addressbook/gui/widgets/eab-gui-util.c:901 +#: ../addressbook/gui/widgets/eab-gui-util.c:903 msgid "Multiple vCards" msgstr "vCards múltiples" -#: ../addressbook/gui/widgets/eab-gui-util.c:908 +#: ../addressbook/gui/widgets/eab-gui-util.c:910 #, c-format msgid "vCard for %s" msgstr "vCard para %s" -#: ../addressbook/gui/widgets/eab-gui-util.c:920 -#: ../addressbook/gui/widgets/eab-gui-util.c:946 +#: ../addressbook/gui/widgets/eab-gui-util.c:922 +#: ../addressbook/gui/widgets/eab-gui-util.c:948 #, c-format msgid "Contact information" msgstr "Información de contacto" -#: ../addressbook/gui/widgets/eab-gui-util.c:948 +#: ../addressbook/gui/widgets/eab-gui-util.c:950 #, c-format msgid "Contact information for %s" msgstr "Información de contacto de %s" @@ -3417,8 +3421,8 @@ msgstr "Descartar _todo" #. Location #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1606 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1612 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1605 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1611 #: ../calendar/gui/e-itip-control.c:1165 #: ../plugins/itip-formatter/itip-view.c:1021 msgid "Location:" @@ -3433,11 +3437,11 @@ msgid "_Dismiss" msgstr "_Descartar" #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6 -#: ../calendar/gui/dialogs/comp-editor.c:1013 +#: ../calendar/gui/dialogs/comp-editor.c:1019 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15 -#: ../plugins/publish-calendar/publish-calendar.glade.h:21 +#: ../plugins/publish-calendar/publish-calendar.glade.h:22 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42 @@ -3453,32 +3457,32 @@ msgstr "_Posponer" msgid "location of appointment" msgstr "lugar de la cita" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1464 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1589 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1463 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1588 msgid "No summary available." msgstr "No hay resumen disponible." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1473 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1475 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1472 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1474 msgid "No description available." msgstr "No hay descripción disponible." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1483 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1482 msgid "No location information available." msgstr "No hay información del lugar disponible." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1528 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1527 #, c-format msgid "You have %d alarms" msgstr "Tiene %d alertas" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1690 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1718 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1689 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1717 #: ../e-util/e-non-intrusive-error-dialog.h:41 msgid "Warning" msgstr "Advertencia" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1694 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1693 msgid "" "Evolution does not support calendar reminders with\n" "email notifications yet, but this reminder was\n" @@ -3490,7 +3494,7 @@ msgstr "" "configurado para enviar un mensaje de correo-e. En su lugar\n" "Evolution mostrará un diálogo de recordatorio normal." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1724 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1723 #, c-format msgid "" "An Evolution Calendar reminder is about to trigger. This reminder is " @@ -3507,7 +3511,7 @@ msgstr "" "\n" "¿Está seguro que quiere ejecutar este programa?" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1738 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1737 msgid "Do not ask me about this program again." msgstr "No preguntar otra vez sobre este programa." @@ -3629,11 +3633,11 @@ msgstr "Directorio para guardar los archivos de sonidos de alertas" #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17 msgid "Event Gradient" -msgstr "Degradado de eventos" +msgstr "Degradado de acontecimientos" #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18 msgid "Event Transparency" -msgstr "Transparencia de eventos" +msgstr "Transparencia de acontecimientos" #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19 msgid "Free/busy server URLs" @@ -4322,7 +4326,7 @@ msgstr "Categoría" msgid "Classification" msgstr "Clasificación" -#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249 +#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248 #: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568 #: ../calendar/gui/memotypes.xml.h:6 #: ../plugins/email-custom-header/email-custom-header.c:341 @@ -4364,13 +4368,13 @@ msgstr "Lugar" msgid "Organizer" msgstr "Organizador" -#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248 +#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247 #: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567 #: ../calendar/gui/memotypes.xml.h:12 msgid "Private" msgstr "Privado" -#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247 +#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246 #: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348 #: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13 msgid "Public" @@ -4557,14 +4561,14 @@ msgid "A_dd" msgstr "Aña_dir" #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 #: ../calendar/gui/dialogs/event-page.glade.h:4 msgid "Alarms" msgstr "Alertas" #: ../calendar/gui/dialogs/cal-attachment-select-file.c:81 #: ../widgets/misc/e-attachment-dialog.c:371 -#: ../widgets/misc/e-attachment-store.c:545 +#: ../widgets/misc/e-attachment-store.c:553 msgid "_Suggest automatic display of attachment" msgstr "_Sugerir mostrar automáticamente el adjunto" @@ -4575,8 +4579,8 @@ msgstr "Adjuntar archivo(s)" #. an empty string is the same as 'None' #: ../calendar/gui/dialogs/cal-prefs-dialog.c:137 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:186 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 -#: ../calendar/gui/dialogs/event-page.c:2951 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32 +#: ../calendar/gui/dialogs/event-page.c:2968 #: ../calendar/gui/e-cal-model-tasks.c:673 #: ../calendar/gui/e-day-view-time-item.c:788 #: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942 @@ -4650,25 +4654,21 @@ msgstr "<span weight=\"bold\">Tiempo</span>" msgid "<span weight=\"bold\">Work Week</span>" msgstr "<span weight=\"bold\">Semana laboral</span>" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 -msgid "Adjust for daylight sa_ving time" -msgstr "Ajustar a la hora de _verano" - -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 msgid "Day _ends:" msgstr "La jornada _acaba a las:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 msgid "Display" msgstr "Mostrar" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 #: ../calendar/gui/dialogs/recurrence-page.c:1107 #: ../calendar/gui/e-itip-control.c:731 msgid "Friday" msgstr "viernes" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 msgid "" "Minutes\n" "Hours\n" @@ -4678,13 +4678,13 @@ msgstr "" "horas\n" "días" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24 #: ../calendar/gui/dialogs/recurrence-page.c:1103 #: ../calendar/gui/e-itip-control.c:727 msgid "Monday" msgstr "lunes" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 msgid "" "Monday\n" "Tuesday\n" @@ -4702,178 +4702,182 @@ msgstr "" "sábado\n" "domingo" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 #: ../mail/mail-config.glade.h:117 msgid "Pick a color" msgstr "Elija un color" #. Sunday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35 msgid "S_un" msgstr "_Dom" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 #: ../calendar/gui/dialogs/recurrence-page.c:1108 #: ../calendar/gui/e-itip-control.c:732 msgid "Saturday" msgstr "sábado" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 msgid "Sc_roll Month View by a week" msgstr "" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 msgid "Se_cond zone:" msgstr "Zona se_cundaria:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 msgid "Select the calendars for alarm notification" msgstr "Seleccione los calendarios para las alertas de notificación" +#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 msgid "Sh_ow a reminder" msgstr "M_ostrar un recordatorio" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 +#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 msgid "Show a _reminder" msgstr "Mostrar un _recordatorio" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 msgid "Show week _numbers in date navigator" msgstr "Mostrar los _números de las semanas en el navegador de fechas" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 msgid "Show week n_umber in Day and Work Week View" msgstr "" "Mostrar los n_úmeros de las semanas en la Vista diaria y en la Vista de la " "semana laboral" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46 #: ../calendar/gui/dialogs/recurrence-page.c:1109 #: ../calendar/gui/e-itip-control.c:726 msgid "Sunday" msgstr "domingo" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47 msgid "T_asks due today:" msgstr "Ta_reas que vencen hoy:" #. Thursday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 msgid "T_hu" msgstr "_Jue" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50 msgid "Template:" msgstr "Plantilla:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51 #: ../calendar/gui/dialogs/recurrence-page.c:1106 #: ../calendar/gui/e-itip-control.c:730 msgid "Thursday" msgstr "jueves" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52 #: ../calendar/gui/dialogs/event-page.glade.h:12 msgid "Time _zone:" msgstr "_Zona horaria:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53 msgid "Time format:" msgstr "Formato de la hora:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54 #: ../calendar/gui/dialogs/recurrence-page.c:1104 #: ../calendar/gui/e-itip-control.c:728 msgid "Tuesday" msgstr "martes" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 msgid "Use s_ystem time zone" msgstr "Usar la zona horaria del s_istema" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56 #: ../calendar/gui/dialogs/recurrence-page.c:1105 #: ../calendar/gui/e-itip-control.c:729 msgid "Wednesday" msgstr "miércoles" #. A weekday like "Monday" follows -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58 msgid "Wee_k starts on:" msgstr "La _semana empieza en:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 msgid "Work days:" msgstr "Días laborables:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60 msgid "_12 hour (AM/PM)" msgstr "_12 horas (AM/PM)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61 msgid "_24 hour" msgstr "_24 horas" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62 msgid "_Ask for confirmation when deleting items" msgstr "Pedir confirm_ación al borrar elementos" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 msgid "_Compress weekends in month view" msgstr "_Comprimir fines de semana en la vista mensual" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64 msgid "_Day begins:" msgstr "La jornada laboral _comienza a las:" #. Friday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66 msgid "_Fri" msgstr "_Vie" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67 msgid "_Hide completed tasks after" msgstr "_Ocultar tareas terminadas tras" #. Monday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69 msgid "_Mon" msgstr "_Lun" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70 msgid "_Overdue tasks:" msgstr "Tareas fuera de pla_zo:" #. Saturday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72 msgid "_Sat" msgstr "_Sáb" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73 msgid "_Show appointment end times in week and month view" msgstr "" "_Mostrar la hora del final de las citas en las vistas semanales y mensuales" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74 msgid "_Time divisions:" msgstr "Divisiones de _hora:" #. Tuesday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76 msgid "_Tue" msgstr "_Mar" #. Wednesday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 msgid "_Wed" msgstr "M_ié" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 +#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 msgid "before every anniversary/birthday" msgstr "antes de cada aniversario/cumpleaños" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79 +#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82 msgid "before every appointment" msgstr "antes de cada cita" @@ -5005,212 +5009,212 @@ msgstr " (Vence " msgid "Due " msgstr "Vence " -#: ../calendar/gui/dialogs/comp-editor.c:237 -#: ../calendar/gui/dialogs/comp-editor.c:2664 ../mail/em-utils.c:373 +#: ../calendar/gui/dialogs/comp-editor.c:245 +#: ../calendar/gui/dialogs/comp-editor.c:2675 ../mail/em-utils.c:373 #: ../plugins/prefer-plain/prefer-plain.c:91 msgid "attachment" msgstr "adjunto" -#: ../calendar/gui/dialogs/comp-editor.c:468 +#: ../calendar/gui/dialogs/comp-editor.c:474 msgid "Could not update object" msgstr "No es posible actualizar el objeto" -#: ../calendar/gui/dialogs/comp-editor.c:557 +#: ../calendar/gui/dialogs/comp-editor.c:563 msgid "Edit Appointment" msgstr "Editar cita" -#: ../calendar/gui/dialogs/comp-editor.c:564 +#: ../calendar/gui/dialogs/comp-editor.c:570 #, c-format msgid "Meeting - %s" msgstr "Reunión: %s" -#: ../calendar/gui/dialogs/comp-editor.c:566 +#: ../calendar/gui/dialogs/comp-editor.c:572 #, c-format msgid "Appointment - %s" msgstr "Cita: %s" -#: ../calendar/gui/dialogs/comp-editor.c:572 +#: ../calendar/gui/dialogs/comp-editor.c:578 #, c-format msgid "Assigned Task - %s" msgstr "Tarea asignada: %s" -#: ../calendar/gui/dialogs/comp-editor.c:574 +#: ../calendar/gui/dialogs/comp-editor.c:580 #, c-format msgid "Task - %s" msgstr "Tarea: %s" -#: ../calendar/gui/dialogs/comp-editor.c:579 +#: ../calendar/gui/dialogs/comp-editor.c:585 #, c-format msgid "Memo - %s" msgstr "Nota - %s" -#: ../calendar/gui/dialogs/comp-editor.c:595 +#: ../calendar/gui/dialogs/comp-editor.c:601 msgid "No Summary" msgstr "Sin resumen" -#: ../calendar/gui/dialogs/comp-editor.c:737 +#: ../calendar/gui/dialogs/comp-editor.c:743 msgid "Keep original item?" msgstr "¿Mantener el elemento original?" -#: ../calendar/gui/dialogs/comp-editor.c:943 +#: ../calendar/gui/dialogs/comp-editor.c:949 msgid "Click here to close the current window" msgstr "Pulse aquí para cerrar la ventana actual" -#: ../calendar/gui/dialogs/comp-editor.c:950 +#: ../calendar/gui/dialogs/comp-editor.c:956 msgid "Copy selected text to the clipboard" msgstr "Copia el texto seleccionado al portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:957 +#: ../calendar/gui/dialogs/comp-editor.c:963 msgid "Cut selected text to the clipboard" msgstr "Corta el texto seleccionado al portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:964 +#: ../calendar/gui/dialogs/comp-editor.c:970 msgid "Click here to view help available" msgstr "Pulse aquí para ver la ayuda disponible" -#: ../calendar/gui/dialogs/comp-editor.c:971 +#: ../calendar/gui/dialogs/comp-editor.c:977 msgid "Paste text from the clipboard" msgstr "Pega texto desde el portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:992 +#: ../calendar/gui/dialogs/comp-editor.c:998 msgid "Click here to save the current window" msgstr "Pulse aquí para guardar la vista actual" -#: ../calendar/gui/dialogs/comp-editor.c:999 +#: ../calendar/gui/dialogs/comp-editor.c:1005 msgid "Select all text" msgstr "Selecciona todo el texto" -#: ../calendar/gui/dialogs/comp-editor.c:1006 +#: ../calendar/gui/dialogs/comp-editor.c:1012 msgid "_Classification" msgstr "_Clasificación" -#: ../calendar/gui/dialogs/comp-editor.c:1020 +#: ../calendar/gui/dialogs/comp-editor.c:1026 #: ../mail/mail-signature-editor.c:208 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43 msgid "_File" msgstr "_Archivo" -#: ../calendar/gui/dialogs/comp-editor.c:1027 +#: ../calendar/gui/dialogs/comp-editor.c:1033 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24 #: ../ui/evolution.xml.h:46 msgid "_Help" msgstr "Ay_uda" -#: ../calendar/gui/dialogs/comp-editor.c:1034 +#: ../calendar/gui/dialogs/comp-editor.c:1040 msgid "_Insert" msgstr "_Insertar" -#: ../calendar/gui/dialogs/comp-editor.c:1041 +#: ../calendar/gui/dialogs/comp-editor.c:1047 msgid "_Options" msgstr "_Opciones" -#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/em-folder-tree.c:2115 +#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2115 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30 #: ../ui/evolution.xml.h:55 msgid "_View" msgstr "_Ver" -#: ../calendar/gui/dialogs/comp-editor.c:1058 +#: ../calendar/gui/dialogs/comp-editor.c:1064 #: ../composer/e-composer-actions.c:413 msgid "_Attachment..." msgstr "_Adjunto…" -#: ../calendar/gui/dialogs/comp-editor.c:1060 +#: ../calendar/gui/dialogs/comp-editor.c:1066 msgid "Click here to attach a file" msgstr "Pulse aquí para adjuntar un archivo" -#: ../calendar/gui/dialogs/comp-editor.c:1068 +#: ../calendar/gui/dialogs/comp-editor.c:1074 msgid "_Categories" msgstr "_Categorías" -#: ../calendar/gui/dialogs/comp-editor.c:1070 +#: ../calendar/gui/dialogs/comp-editor.c:1076 msgid "Toggles whether to display categories" msgstr "Conmuta cuando se muestran las categorías" -#: ../calendar/gui/dialogs/comp-editor.c:1076 +#: ../calendar/gui/dialogs/comp-editor.c:1082 msgid "Time _Zone" msgstr "_Zona horaria" -#: ../calendar/gui/dialogs/comp-editor.c:1078 +#: ../calendar/gui/dialogs/comp-editor.c:1084 msgid "Toggles whether the time zone is displayed" msgstr "Conmuta cuando se muestra la «Zona horaria»" -#: ../calendar/gui/dialogs/comp-editor.c:1087 +#: ../calendar/gui/dialogs/comp-editor.c:1093 msgid "Pu_blic" msgstr "Pú_blico" -#: ../calendar/gui/dialogs/comp-editor.c:1089 +#: ../calendar/gui/dialogs/comp-editor.c:1095 msgid "Classify as public" msgstr "Clasificar como público" -#: ../calendar/gui/dialogs/comp-editor.c:1094 +#: ../calendar/gui/dialogs/comp-editor.c:1100 msgid "_Private" msgstr "_Privado" -#: ../calendar/gui/dialogs/comp-editor.c:1096 +#: ../calendar/gui/dialogs/comp-editor.c:1102 msgid "Classify as private" msgstr "Clasificar como privado" -#: ../calendar/gui/dialogs/comp-editor.c:1101 +#: ../calendar/gui/dialogs/comp-editor.c:1107 msgid "_Confidential" msgstr "_Confidencial" -#: ../calendar/gui/dialogs/comp-editor.c:1103 +#: ../calendar/gui/dialogs/comp-editor.c:1109 msgid "Classify as confidential" msgstr "Clasificar como confidencial" -#: ../calendar/gui/dialogs/comp-editor.c:1111 +#: ../calendar/gui/dialogs/comp-editor.c:1117 msgid "R_ole Field" msgstr "Campo «_Rol»" -#: ../calendar/gui/dialogs/comp-editor.c:1113 +#: ../calendar/gui/dialogs/comp-editor.c:1119 msgid "Toggles whether the Role field is displayed" msgstr "Conmuta cuando se muestra el campo «Rol»" -#: ../calendar/gui/dialogs/comp-editor.c:1119 +#: ../calendar/gui/dialogs/comp-editor.c:1125 msgid "_RSVP" msgstr "_Confirmar" -#: ../calendar/gui/dialogs/comp-editor.c:1121 +#: ../calendar/gui/dialogs/comp-editor.c:1127 msgid "Toggles whether the RSVP field is displayed" msgstr "Conmuta cuando se muestra el campo «Confirmar»" -#: ../calendar/gui/dialogs/comp-editor.c:1127 +#: ../calendar/gui/dialogs/comp-editor.c:1133 msgid "_Status Field" msgstr "Campo de _estado" -#: ../calendar/gui/dialogs/comp-editor.c:1129 +#: ../calendar/gui/dialogs/comp-editor.c:1135 msgid "Toggles whether the Status field is displayed" msgstr "Conmuta cuando se muestra el campo «Estado»" -#: ../calendar/gui/dialogs/comp-editor.c:1135 +#: ../calendar/gui/dialogs/comp-editor.c:1141 msgid "_Type Field" msgstr "Campo de _tipo" -#: ../calendar/gui/dialogs/comp-editor.c:1137 +#: ../calendar/gui/dialogs/comp-editor.c:1143 msgid "Toggles whether the Attendee Type is displayed" msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»" -#: ../calendar/gui/dialogs/comp-editor.c:1161 +#: ../calendar/gui/dialogs/comp-editor.c:1167 #: ../composer/e-composer-private.c:66 msgid "Recent _Documents" msgstr "_Documentos recientes" -#: ../calendar/gui/dialogs/comp-editor.c:1586 +#: ../calendar/gui/dialogs/comp-editor.c:1593 #: ../composer/e-composer-actions.c:640 msgid "Attach" msgstr "Adjuntar" -#: ../calendar/gui/dialogs/comp-editor.c:1845 -#: ../calendar/gui/dialogs/comp-editor.c:1893 -#: ../calendar/gui/dialogs/comp-editor.c:2695 +#: ../calendar/gui/dialogs/comp-editor.c:1856 +#: ../calendar/gui/dialogs/comp-editor.c:1904 +#: ../calendar/gui/dialogs/comp-editor.c:2706 msgid "Changes made to this item may be discarded if an update arrives" msgstr "" "Los cambios efectuados a este elemento pueden descartarse si llega una " "actualización por correo" -#: ../calendar/gui/dialogs/comp-editor.c:2724 +#: ../calendar/gui/dialogs/comp-editor.c:2735 msgid "Unable to use current version!" msgstr "Imposible usar la versión actual." @@ -5347,69 +5351,69 @@ msgstr "Consultar información de disponibilidad para los participantes" msgid "Appoint_ment" msgstr "_Cita" -#: ../calendar/gui/dialogs/event-page.c:736 -#: ../calendar/gui/dialogs/event-page.c:2729 +#: ../calendar/gui/dialogs/event-page.c:749 +#: ../calendar/gui/dialogs/event-page.c:2743 msgid "This event has alarms" msgstr "Este acontecimiento tiene alertas." -#: ../calendar/gui/dialogs/event-page.c:799 +#: ../calendar/gui/dialogs/event-page.c:812 #: ../calendar/gui/dialogs/event-page.glade.h:10 #: ../calendar/gui/dialogs/memo-page.glade.h:2 msgid "Or_ganizer:" msgstr "Or_ganizador:" -#: ../calendar/gui/dialogs/event-page.c:845 +#: ../calendar/gui/dialogs/event-page.c:859 msgid "_Delegatees" msgstr "_Delegados" -#: ../calendar/gui/dialogs/event-page.c:847 +#: ../calendar/gui/dialogs/event-page.c:861 msgid "Atte_ndees" msgstr "_Participantes" -#: ../calendar/gui/dialogs/event-page.c:1032 +#: ../calendar/gui/dialogs/event-page.c:1046 msgid "Event with no start date" msgstr "Acontecimiento sin fecha de inicio" -#: ../calendar/gui/dialogs/event-page.c:1035 +#: ../calendar/gui/dialogs/event-page.c:1049 msgid "Event with no end date" msgstr "Acontecimiento sin fecha de finalización" -#: ../calendar/gui/dialogs/event-page.c:1204 +#: ../calendar/gui/dialogs/event-page.c:1218 #: ../calendar/gui/dialogs/memo-page.c:640 #: ../calendar/gui/dialogs/task-page.c:814 msgid "Start date is wrong" msgstr "La fecha de inicio está equivocada" -#: ../calendar/gui/dialogs/event-page.c:1214 +#: ../calendar/gui/dialogs/event-page.c:1228 msgid "End date is wrong" msgstr "La fecha de finalización está equivocada" -#: ../calendar/gui/dialogs/event-page.c:1237 +#: ../calendar/gui/dialogs/event-page.c:1251 msgid "Start time is wrong" msgstr "La hora de inicio está equivocada" -#: ../calendar/gui/dialogs/event-page.c:1244 +#: ../calendar/gui/dialogs/event-page.c:1258 msgid "End time is wrong" msgstr "La hora de finalización está equivocada" -#: ../calendar/gui/dialogs/event-page.c:1407 +#: ../calendar/gui/dialogs/event-page.c:1421 #: ../calendar/gui/dialogs/memo-page.c:681 #: ../calendar/gui/dialogs/task-page.c:874 msgid "The organizer selected no longer has an account." msgstr "El organizador seleccionado ya no tiene una cuenta." -#: ../calendar/gui/dialogs/event-page.c:1413 +#: ../calendar/gui/dialogs/event-page.c:1427 #: ../calendar/gui/dialogs/memo-page.c:687 #: ../calendar/gui/dialogs/task-page.c:880 msgid "An organizer is required." msgstr "Se requiere un organizador." -#: ../calendar/gui/dialogs/event-page.c:1438 +#: ../calendar/gui/dialogs/event-page.c:1452 #: ../calendar/gui/dialogs/task-page.c:904 msgid "At least one attendee is required." msgstr "Es necesario por lo menos un participante." -#: ../calendar/gui/dialogs/event-page.c:1878 +#: ../calendar/gui/dialogs/event-page.c:1892 #: ../calendar/gui/dialogs/task-page.c:1202 #: ../plugins/groupwise-features/junk-settings.glade.h:8 #: ../plugins/groupwise-features/properties.glade.h:13 @@ -5417,45 +5421,45 @@ msgstr "Es necesario por lo menos un participante." msgid "_Remove" msgstr "_Quitar" -#: ../calendar/gui/dialogs/event-page.c:1879 +#: ../calendar/gui/dialogs/event-page.c:1893 #: ../calendar/gui/dialogs/task-page.c:1203 msgid "_Add " msgstr "_Añadir " -#: ../calendar/gui/dialogs/event-page.c:2605 +#: ../calendar/gui/dialogs/event-page.c:2619 #, c-format msgid "Unable to open the calendar '%s'." msgstr "No es posible abrir el calendario «%s»." -#: ../calendar/gui/dialogs/event-page.c:2649 +#: ../calendar/gui/dialogs/event-page.c:2663 #: ../calendar/gui/dialogs/memo-page.c:896 #: ../calendar/gui/dialogs/task-page.c:1810 #, c-format msgid "You are acting on behalf of %s" msgstr "Está actuando en nombre de <b>%s</b>" -#: ../calendar/gui/dialogs/event-page.c:2928 +#: ../calendar/gui/dialogs/event-page.c:2942 #, c-format msgid "%d day before appointment" msgid_plural "%d days before appointment" msgstr[0] "%d día antes de la cita" msgstr[1] "%d días antes de la cita" -#: ../calendar/gui/dialogs/event-page.c:2934 +#: ../calendar/gui/dialogs/event-page.c:2948 #, c-format msgid "%d hour before appointment" msgid_plural "%d hours before appointment" msgstr[0] "%d hora antes de la cita" msgstr[1] "%d horas antes de la cita" -#: ../calendar/gui/dialogs/event-page.c:2940 +#: ../calendar/gui/dialogs/event-page.c:2954 #, c-format msgid "%d minute before appointment" msgid_plural "%d minutes before appointment" msgstr[0] "%d minuto antes de la cita" msgstr[1] "%d minutos antes de la cita" -#: ../calendar/gui/dialogs/event-page.c:2950 +#: ../calendar/gui/dialogs/event-page.c:2967 msgid "Customize" msgstr "Personalizar" @@ -5501,7 +5505,7 @@ msgstr "_Descripción:" #: ../calendar/gui/dialogs/event-page.glade.h:16 #: ../plugins/calendar-weather/calendar-weather.c:372 #: ../plugins/exchange-operations/exchange-calendar.c:247 -#: ../plugins/exchange-operations/exchange-contacts.c:239 +#: ../plugins/exchange-operations/exchange-contacts.c:240 msgid "_Location:" msgstr "_Lugar:" @@ -5987,7 +5991,7 @@ msgid "I_mport to Tasks" msgstr "I_mportar a las tareas" #: ../calendar/gui/e-cal-component-memo-preview.c:69 -#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3272 +#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3271 #, c-format msgid "Click to open %s" msgstr "Pulse para abrir %s" @@ -6101,10 +6105,8 @@ msgstr "Fecha de terminación" #: ../calendar/gui/e-cal-list-view.etspec.h:4 #: ../calendar/gui/e-calendar-table.etspec.h:9 #: ../calendar/gui/e-memo-table.etspec.h:4 -#, fuzzy -#| msgid "Modified" msgid "Last modified" -msgstr "Modificado" +msgstr "" #: ../calendar/gui/e-cal-list-view.etspec.h:6 #: ../calendar/gui/e-memo-table.etspec.h:5 @@ -6118,7 +6120,7 @@ msgstr "Libre" #: ../calendar/gui/e-cal-model-calendar.c:190 #: ../calendar/gui/e-calendar-table.c:641 -#: ../calendar/gui/e-meeting-time-sel.c:398 +#: ../calendar/gui/e-meeting-time-sel.c:397 msgid "Busy" msgstr "Ocupada" @@ -6272,7 +6274,7 @@ msgstr "Abrir página _web" #: ../calendar/gui/e-calendar-table.c:1600 #: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939 -#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:498 +#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494 msgid "_Save As..." msgstr "Guardar _como…" @@ -6431,7 +6433,7 @@ msgstr "_Responder" #: ../calendar/gui/e-calendar-view.c:1831 #: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331 -#: ../mail/em-popup.c:503 ../ui/evolution-mail-message.xml.h:82 +#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:82 msgid "Reply to _All" msgstr "Responder a _todos" @@ -6466,7 +6468,7 @@ msgstr "Rehusado" #: ../calendar/gui/e-calendar-view.c:2294 #: ../calendar/gui/e-meeting-list-view.c:204 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199 -#: ../calendar/gui/e-meeting-time-sel.c:397 +#: ../calendar/gui/e-meeting-time-sel.c:396 msgid "Tentative" msgstr "Provisional" @@ -6531,25 +6533,25 @@ msgstr "Muestra la segunda zona horaria" #. month, %B = full month name. You can change the #. order but don't change the specifiers or add #. anything. -#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582 +#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1581 #: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678 msgid "%A %d %B" msgstr "%A %e de %B" #. String to use in 12-hour time format for times in the morning. -#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:543 +#: ../calendar/gui/e-day-view.c:804 ../calendar/gui/e-week-view.c:542 #: ../calendar/gui/print.c:828 msgid "am" msgstr "am" #. String to use in 12-hour time format for times in the afternoon. -#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:546 +#: ../calendar/gui/e-day-view.c:807 ../calendar/gui/e-week-view.c:545 #: ../calendar/gui/print.c:830 msgid "pm" msgstr "pm" #. To Translators: the %d stands for a week number, it's value between 1 and 52/53 -#: ../calendar/gui/e-day-view.c:2321 +#: ../calendar/gui/e-day-view.c:2320 #, c-format msgid "Week %d" msgstr "Semana %d" @@ -7061,7 +7063,7 @@ msgstr "En proceso" #. This is a strftime() format string %A = full weekday name, #. %B = full month name, %d = month day, %Y = full year. #: ../calendar/gui/e-meeting-time-sel-item.c:467 -#: ../calendar/gui/e-meeting-time-sel.c:2126 +#: ../calendar/gui/e-meeting-time-sel.c:2125 msgid "%A, %B %d, %Y" msgstr "%A, %d de %B, %Y" @@ -7070,7 +7072,7 @@ msgstr "%A, %d de %B, %Y" #. This is a strftime() format string %a = abbreviated weekday name, #. %m = month number, %d = month day, %Y = full year. #: ../calendar/gui/e-meeting-time-sel-item.c:471 -#: ../calendar/gui/e-meeting-time-sel.c:2157 +#: ../calendar/gui/e-meeting-time-sel.c:2156 msgid "%a %m/%d/%Y" msgstr "%a %d/%m/%Y" @@ -7080,67 +7082,67 @@ msgstr "%a %d/%m/%Y" msgid "%m/%d/%Y" msgstr "%e/%m/%Y" -#: ../calendar/gui/e-meeting-time-sel.c:399 +#: ../calendar/gui/e-meeting-time-sel.c:398 msgid "Out of Office" msgstr "Fuera de la oficina" -#: ../calendar/gui/e-meeting-time-sel.c:400 +#: ../calendar/gui/e-meeting-time-sel.c:399 msgid "No Information" msgstr "Sin información" -#: ../calendar/gui/e-meeting-time-sel.c:415 +#: ../calendar/gui/e-meeting-time-sel.c:414 msgid "A_ttendees..." msgstr "_Participantes…" -#: ../calendar/gui/e-meeting-time-sel.c:436 +#: ../calendar/gui/e-meeting-time-sel.c:435 msgid "O_ptions" msgstr "O_pciones" -#: ../calendar/gui/e-meeting-time-sel.c:453 +#: ../calendar/gui/e-meeting-time-sel.c:452 msgid "Show _only working hours" msgstr "Mostrar _sólo las horas de trabajo" -#: ../calendar/gui/e-meeting-time-sel.c:463 +#: ../calendar/gui/e-meeting-time-sel.c:462 msgid "Show _zoomed out" msgstr "Mostrar quitando _ampliación" -#: ../calendar/gui/e-meeting-time-sel.c:478 +#: ../calendar/gui/e-meeting-time-sel.c:477 msgid "_Update free/busy" msgstr "_Actualizar disponibilidad" -#: ../calendar/gui/e-meeting-time-sel.c:493 +#: ../calendar/gui/e-meeting-time-sel.c:492 msgid "_<<" msgstr "_<<" -#: ../calendar/gui/e-meeting-time-sel.c:511 +#: ../calendar/gui/e-meeting-time-sel.c:510 msgid "_Autopick" msgstr "_Auto-seleccionar" -#: ../calendar/gui/e-meeting-time-sel.c:526 +#: ../calendar/gui/e-meeting-time-sel.c:525 msgid ">_>" msgstr "_>>" -#: ../calendar/gui/e-meeting-time-sel.c:543 +#: ../calendar/gui/e-meeting-time-sel.c:542 msgid "_All people and resources" msgstr "_Todas las personas y los recursos" -#: ../calendar/gui/e-meeting-time-sel.c:552 +#: ../calendar/gui/e-meeting-time-sel.c:551 msgid "All _people and one resource" msgstr "Todas las _personas y un recurso" -#: ../calendar/gui/e-meeting-time-sel.c:561 +#: ../calendar/gui/e-meeting-time-sel.c:560 msgid "_Required people" msgstr "Personas _requeridas" -#: ../calendar/gui/e-meeting-time-sel.c:570 +#: ../calendar/gui/e-meeting-time-sel.c:569 msgid "Required people and _one resource" msgstr "Personas requeridas y _un recurso" -#: ../calendar/gui/e-meeting-time-sel.c:606 +#: ../calendar/gui/e-meeting-time-sel.c:605 msgid "_Start time:" msgstr "Hora de _inicio:" -#: ../calendar/gui/e-meeting-time-sel.c:633 +#: ../calendar/gui/e-meeting-time-sel.c:632 msgid "_End time:" msgstr "Hora de _fin:" @@ -9450,7 +9452,7 @@ msgid "Untitled Message" msgstr "Mensaje sin título" #: ../composer/e-composer-actions.c:415 -#: ../widgets/misc/e-attachment-view.c:327 +#: ../widgets/misc/e-attachment-view.c:328 msgid "Attach a file" msgstr "Adjuntar un archivo" @@ -9632,15 +9634,15 @@ msgstr "Conmutador que indica si se muestra el campo «Para»" msgid "Save Draft" msgstr "Guardar borrador" -#: ../composer/e-composer-header-table.c:64 +#: ../composer/e-composer-header-table.c:65 msgid "Enter the recipients of the message" msgstr "Escriba los destinatarios del mensaje" -#: ../composer/e-composer-header-table.c:66 +#: ../composer/e-composer-header-table.c:67 msgid "Enter the addresses that will receive a carbon copy of the message" msgstr "Escriba las direcciones que recibirán una copia del mensaje" -#: ../composer/e-composer-header-table.c:69 +#: ../composer/e-composer-header-table.c:70 msgid "" "Enter the addresses that will receive a carbon copy of the message without " "appearing in the recipient list of the message" @@ -9648,35 +9650,35 @@ msgstr "" "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en " "la lista de destinatarios del mensaje" -#: ../composer/e-composer-header-table.c:643 +#: ../composer/e-composer-header-table.c:742 msgid "Fr_om:" msgstr "_De:" -#: ../composer/e-composer-header-table.c:652 +#: ../composer/e-composer-header-table.c:751 msgid "_Reply-To:" msgstr "_Responder a:" -#: ../composer/e-composer-header-table.c:656 +#: ../composer/e-composer-header-table.c:755 msgid "_To:" msgstr "_Para:" -#: ../composer/e-composer-header-table.c:661 +#: ../composer/e-composer-header-table.c:760 msgid "_Cc:" msgstr "_Cc:" -#: ../composer/e-composer-header-table.c:666 +#: ../composer/e-composer-header-table.c:765 msgid "_Bcc:" msgstr "Cc_o:" -#: ../composer/e-composer-header-table.c:671 +#: ../composer/e-composer-header-table.c:770 msgid "_Post To:" msgstr "_Publicar en:" -#: ../composer/e-composer-header-table.c:675 +#: ../composer/e-composer-header-table.c:774 msgid "S_ubject:" msgstr "_Asunto:" -#: ../composer/e-composer-header-table.c:684 +#: ../composer/e-composer-header-table.c:783 msgid "Si_gnature:" msgstr "_Firma:" @@ -9711,19 +9713,11 @@ msgstr "" "No es posible cifrar el mensaje saliente: no hay establecido un certificado " "de cifrado para esta cuenta" -#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2487 +#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2218 msgid "Compose Message" msgstr "Redactar un mensaje" -#. translators, this count will always be >1 -#: ../composer/e-msg-composer.c:1735 ../widgets/misc/e-attachment.c:936 -#, c-format -msgid "Attached message" -msgid_plural "%d attached messages" -msgstr[0] "Mensaje adjunto" -msgstr[1] "%d mensajes adjuntos" - -#: ../composer/e-msg-composer.c:3709 +#: ../composer/e-msg-composer.c:3440 msgid "" "<b>(The composer contains a non-text message body, which cannot be edited.)</" "b>" @@ -9889,7 +9883,7 @@ msgstr "Guardar _borrador" msgid "Evolution Mail and Calendar" msgstr "Correo y calendario de Evolution" -#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951 +#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:948 msgid "Groupware Suite" msgstr "Suite de trabajo en grupo" @@ -10498,7 +10492,7 @@ msgid "_Mail" msgstr "Co_rreo" #: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332 -#: ../mail/em-popup.c:505 ../ui/evolution-mail-message.xml.h:109 +#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:109 msgid "_Forward" msgstr "Reen_viar" @@ -10683,14 +10677,14 @@ msgid "No account found to use, forward of the message has been cancelled." msgstr "" "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje." -#: ../mail/em-composer-utils.c:2060 +#: ../mail/em-composer-utils.c:2068 msgid "an unknown sender" msgstr "un remitente desconocido" #. Note to translators: this is the attribution string used when quoting messages. #. * each ${Variable} gets replaced with a value. To see a full list of available #. * variables, see em-composer-utils.c:1514 -#: ../mail/em-composer-utils.c:2107 +#: ../mail/em-composer-utils.c:2115 msgid "" "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " "${TimeZone}, ${Sender} wrote:" @@ -10698,7 +10692,7 @@ msgstr "" "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} " "${TimeZone}, ${Sender} escribió:" -#: ../mail/em-composer-utils.c:2250 +#: ../mail/em-composer-utils.c:2258 msgid "-----Original Message-----" msgstr "-----Mensaje original-----" @@ -11083,7 +11077,7 @@ msgstr "_Nombre de la carpeta:" #. load store to mail component #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206 -#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047 +#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1028 msgid "Search Folders" msgstr "Carpetas de búsqueda" @@ -11179,7 +11173,7 @@ msgstr "_Mover" msgid "Cancel _Drag" msgstr "Cancelar _arrastre" -#: ../mail/em-folder-tree.c:1717 ../mail/mail-ops.c:1065 +#: ../mail/em-folder-tree.c:1717 ../mail/mail-ops.c:1064 #, c-format msgid "Scanning folders in \"%s\"" msgstr "Analizando carpetas en «%s»" @@ -11378,33 +11372,29 @@ msgstr "No se pudo obtener el mensaje" msgid "Retrieving Message..." msgstr "Obteniendo mensaje…" -#: ../mail/em-folder-view.c:2755 -msgid "C_all To..." -msgstr "Ll_amar a…" - -#: ../mail/em-folder-view.c:2758 +#: ../mail/em-folder-view.c:2757 msgid "Create _Search Folder" msgstr "Crear carpeta de _búsqueda" -#: ../mail/em-folder-view.c:2759 +#: ../mail/em-folder-view.c:2758 msgid "_From this Address" msgstr "_Desde esta dirección" -#: ../mail/em-folder-view.c:2760 +#: ../mail/em-folder-view.c:2759 msgid "_To this Address" msgstr "_A esta dirección" -#: ../mail/em-folder-view.c:3253 +#: ../mail/em-folder-view.c:3252 #, c-format msgid "Click to mail %s" msgstr "Pulse para enviar correo a %s" -#: ../mail/em-folder-view.c:3265 +#: ../mail/em-folder-view.c:3264 #, c-format msgid "Click to call %s" msgstr "Pulse para llamar a %s" -#: ../mail/em-folder-view.c:3270 +#: ../mail/em-folder-view.c:3269 msgid "Click to hide/unhide addresses" msgstr "Pulse para ocultar/mostrar las direcciones" @@ -11564,12 +11554,12 @@ msgid "by %B %d, %Y, %l:%M %p" msgstr "antes del %e de %B de %Y, %l:%M %p" #: ../mail/em-format-html-display.c:1460 -#: ../widgets/misc/e-attachment-view.c:356 +#: ../widgets/misc/e-attachment-view.c:357 msgid "_View Inline" msgstr "_Ver incluido" #: ../mail/em-format-html-display.c:1461 -#: ../widgets/misc/e-attachment-view.c:349 +#: ../widgets/misc/e-attachment-view.c:350 msgid "_Hide" msgstr "_Ocultar" @@ -11666,7 +11656,7 @@ msgstr "Cco" #. pseudo-header #: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353 -#: ../mail/em-mailer-prefs.c:1451 +#: ../mail/em-mailer-prefs.c:1439 msgid "Mailer" msgstr "Transporte" @@ -11805,20 +11795,20 @@ msgid "Tag" msgstr "Etiqueta" #. May be a better text -#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133 +#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121 #, c-format msgid "%s plugin is available and the binary is installed." msgstr "El complemento %s está disponible y el binario está instalado." #. May be a better text -#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142 +#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130 #, c-format msgid "" "%s plugin is not available. Please check whether the package is installed." msgstr "" "El complemento %s no está disponible. Compruebe si el paquete está instalado." -#: ../mail/em-mailer-prefs.c:1108 +#: ../mail/em-mailer-prefs.c:1096 msgid "No Junk plugin available" msgstr "No hay complemento para SPAM disponible" @@ -11912,55 +11902,55 @@ msgstr "" "No es posible leer la configuración de la instalación anterior de Evolution, " "«evolution/config.xmldb» no existe o está corrompido." -#: ../mail/em-popup.c:368 +#: ../mail/em-popup.c:364 msgid "Save As..." msgstr "Guardar como…" -#: ../mail/em-popup.c:393 +#: ../mail/em-popup.c:389 #, c-format msgid "untitled_image.%s" msgstr "imagen-_sin-título.%s" -#: ../mail/em-popup.c:499 ../widgets/misc/e-attachment-handler-image.c:147 +#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147 msgid "Set as _Background" msgstr "Establecer como _fondo" -#: ../mail/em-popup.c:501 +#: ../mail/em-popup.c:497 msgid "_Reply to sender" msgstr "_Responder al remitente" -#: ../mail/em-popup.c:502 ../ui/evolution-mail-message.xml.h:83 +#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:83 msgid "Reply to _List" msgstr "Responder a la _lista" #. make it first item -#: ../mail/em-popup.c:551 ../mail/em-popup.c:751 +#: ../mail/em-popup.c:547 ../mail/em-popup.c:747 msgid "_Add to Address Book" msgstr "_Añadir a la libreta de direcciones" -#: ../mail/em-popup.c:730 ../widgets/misc/e-attachment-view.c:645 +#: ../mail/em-popup.c:726 #, c-format msgid "Open in %s..." msgstr "Abrir en %s…" -#: ../mail/em-subscribe-editor.c:604 +#: ../mail/em-subscribe-editor.c:605 msgid "This store does not support subscriptions, or they are not enabled." msgstr "Este almacén no soporta suscripciones, o no están activadas." -#: ../mail/em-subscribe-editor.c:637 +#: ../mail/em-subscribe-editor.c:638 msgid "Subscribed" msgstr "Suscrito" -#: ../mail/em-subscribe-editor.c:641 +#: ../mail/em-subscribe-editor.c:642 msgid "Folder" msgstr "Carpeta" #. FIXME: This is just to get the shadow, is there a better way? -#: ../mail/em-subscribe-editor.c:857 +#: ../mail/em-subscribe-editor.c:858 msgid "Please select a server." msgstr "Seleccione un servidor." -#: ../mail/em-subscribe-editor.c:893 +#: ../mail/em-subscribe-editor.c:894 msgid "No server has been selected" msgstr "No se ha seleccionado ningún servidor" @@ -12230,30 +12220,30 @@ msgid "Enable or disable magic space bar" msgstr "Activa o desactiva la barra espaciadora mágica" #: ../mail/evolution-mail.schemas.in.h:49 +msgid "Enable or disable the prompt whilst marking multiple messages." +msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes." + +#: ../mail/evolution-mail.schemas.in.h:50 msgid "Enable or disable type ahead search feature" msgstr "Activa o desactiva la característica de búsqueda al teclear" -#: ../mail/evolution-mail.schemas.in.h:50 +#: ../mail/evolution-mail.schemas.in.h:51 msgid "Enable search folders" msgstr "Activar las carpetas de búsqueda" -#: ../mail/evolution-mail.schemas.in.h:51 +#: ../mail/evolution-mail.schemas.in.h:52 msgid "Enable search folders on startup." msgstr "Activar las carpetas de búsqueda al inicio." -#: ../mail/evolution-mail.schemas.in.h:52 +#: ../mail/evolution-mail.schemas.in.h:53 msgid "" -"Enable side bar search feature so that you can start interactive searching " -"by typing in the text. Use is that you can easily find a folder in that side " -"bar by just typing the folder name and the selection jumps automatically to " -"that folder." +"Enable the side bar search feature to allow interactive searching of folder " +"names." msgstr "" -"Activa la característica de búsqueda en la barra para que puede iniciar una " -"búsqueda interactiva tecleando el texto. El uso es para que pueda encontrar " -"fácilmente una carpeta en esa barra lateral tan sólo tecleando el nombre de " -"la carpeta y la selección salta automáticamente a esa carpeta." +"Activar la característica barra de búsqueda lateral para permitir búsquedas " +"interactivas de nombres de carpetas." -#: ../mail/evolution-mail.schemas.in.h:53 +#: ../mail/evolution-mail.schemas.in.h:54 msgid "" "Enable this to use Space bar key to scroll in message preview, message list " "and folders." @@ -12261,42 +12251,43 @@ msgstr "" "Activar esto para usar la barra espaciadora para desplazarse en la vista " "previa del mensaje, lista de mensajes y carpetas." -#: ../mail/evolution-mail.schemas.in.h:54 +#: ../mail/evolution-mail.schemas.in.h:55 msgid "Enable to render message text part of limited size." msgstr "Activar para mostrar la parte de texto del mensaje de tamaño limitado." -#: ../mail/evolution-mail.schemas.in.h:55 +#: ../mail/evolution-mail.schemas.in.h:56 msgid "Enable/disable caret mode" msgstr "Activar/desactivar modo cursor" -#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:86 +#: ../mail/evolution-mail.schemas.in.h:57 ../mail/mail-config.glade.h:86 msgid "Encode file names in an Outlook/GMail way" msgstr "Codificar nombres de archivo de la forma Outlook/GMail" -#: ../mail/evolution-mail.schemas.in.h:57 +#: ../mail/evolution-mail.schemas.in.h:58 msgid "" -"Encode file names in the mail headers same as Outlook or GMail does, to let " -"them understand localized file names sent by Evolution, because they do not " -"follow the RFC 2231, but uses incorrect RFC 2047 standard." +"Encode file names in the mail headers same as Outlook or GMail do, to let " +"them display correctly file names with UTF-8 letters sent by Evolution, " +"because they do not follow the RFC 2231, but use the incorrect RFC 2047 " +"standard." msgstr "" "Codificar los nombres de archivo en las cabeceras del correo de la misma " "forma que Outlook y GMail, para hacerles entender los nombres de archivo " "localizados enviados por Evolution, ya que no siguen el RFC 2231, pero usan " "el estándar incorrecto RFC 2047." -#: ../mail/evolution-mail.schemas.in.h:58 +#: ../mail/evolution-mail.schemas.in.h:59 msgid "Height of the message-list pane" msgstr "Altura del panel de lista de mensajes" -#: ../mail/evolution-mail.schemas.in.h:59 +#: ../mail/evolution-mail.schemas.in.h:60 msgid "Height of the message-list pane." msgstr "Altura del panel de vista de mensajes." -#: ../mail/evolution-mail.schemas.in.h:60 +#: ../mail/evolution-mail.schemas.in.h:61 msgid "Hides the per-folder preview and removes the selection" msgstr "Oculta la vista previa por carpeta y elimina la selección" -#: ../mail/evolution-mail.schemas.in.h:61 +#: ../mail/evolution-mail.schemas.in.h:62 msgid "" "If a user tries to open 10 or more messages at one time, ask the user if " "they really want to do it." @@ -12304,7 +12295,7 @@ msgstr "" "Si el usuario intenta abrir diez o más mensajes al mismo tiempo, preguntar " "al usuario si quiere realmente hacerlo." -#: ../mail/evolution-mail.schemas.in.h:62 +#: ../mail/evolution-mail.schemas.in.h:63 msgid "" "If the \"Preview\" pane is on, then show it side-by-side rather than " "vertically." @@ -12312,7 +12303,7 @@ msgstr "" "Si el panel de «Vista previa» está activado, entonces lo muestra en el " "lateral en vez de verticalmente." -#: ../mail/evolution-mail.schemas.in.h:63 +#: ../mail/evolution-mail.schemas.in.h:64 msgid "" "If there isn't a builtin viewer for a particular MIME type inside Evolution, " "any MIME types appearing in this list which map to a Bonobo component viewer " @@ -12323,7 +12314,7 @@ msgstr "" "visor de componentes bonobo en la base de datos de GNOME puede usarse para " "mostrar el contenido." -#: ../mail/evolution-mail.schemas.in.h:64 +#: ../mail/evolution-mail.schemas.in.h:65 msgid "" "Initial height of the \"Send and Receive Mail\" window. The value updates as " "the user resizes the window vertically." @@ -12331,7 +12322,7 @@ msgstr "" "Altura inicial de la ventana «Enviar y recibir correo». El valor se actualiza " "según el usuario redimensiona verticalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:65 +#: ../mail/evolution-mail.schemas.in.h:66 msgid "" "Initial maximize state of the \"Send and Receive Mail\" window. The value " "updates when the user maximizes or unmaximizes the window. Note, this " @@ -12345,7 +12336,7 @@ msgstr "" "no se puede maximizar. Esta clave existe sólo como un detalle de " "implementación." -#: ../mail/evolution-mail.schemas.in.h:66 +#: ../mail/evolution-mail.schemas.in.h:67 msgid "" "Initial width of the \"Send and Receive Mail\" window. The value updates as " "the user resizes the window horizontally." @@ -12353,10 +12344,6 @@ msgstr "" "Anchura inicial de la ventana «Enviar y recibir correo». El valor se " "actualiza según el usuario redimensiona horizontalmente la ventana." -#: ../mail/evolution-mail.schemas.in.h:67 -msgid "It disables/enables the prompt while marking multiple messages." -msgstr "Desactiva/activa la pregunta cuando se marcan varios mensajes." - #: ../mail/evolution-mail.schemas.in.h:68 msgid "" "It disables/enables the repeated prompts to ask if offline sync is required " @@ -13891,21 +13878,21 @@ msgstr "_Marque esto para aceptar el acuerdo de licencia" msgid "Pinging %s" msgstr "Haciendo ping a %s" -#: ../mail/mail-ops.c:106 +#: ../mail/mail-ops.c:105 msgid "Filtering Selected Messages" msgstr "Filtrado de mensajes seleccionados" -#: ../mail/mail-ops.c:265 +#: ../mail/mail-ops.c:264 msgid "Fetching Mail" msgstr "Obteniendo mensajes" #. sending mail, filtering failed -#: ../mail/mail-ops.c:561 +#: ../mail/mail-ops.c:560 #, c-format msgid "Failed to apply outgoing filters: %s" msgstr "No se pudieron aplicar los filtros al correo saliente: %s" -#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602 +#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601 #, c-format msgid "" "Failed to append to %s: %s\n" @@ -13914,123 +13901,123 @@ msgstr "" "No es posible anexar a %s: %s\n" "Se anexará a la carpeta local «Correo enviado» en su lugar." -#: ../mail/mail-ops.c:619 +#: ../mail/mail-ops.c:618 #, c-format msgid "Failed to append to local `Sent' folder: %s" msgstr "No es posible anexar a la carpeta local «Correo enviado»: %s" -#: ../mail/mail-ops.c:725 ../mail/mail-ops.c:806 +#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805 msgid "Sending message" msgstr "Enviando mensaje" -#: ../mail/mail-ops.c:735 +#: ../mail/mail-ops.c:734 #, c-format msgid "Sending message %d of %d" msgstr "Enviando mensaje %d de %d" -#: ../mail/mail-ops.c:762 +#: ../mail/mail-ops.c:761 #, c-format msgid "Failed to send %d of %d messages" msgstr "Falló al enviar %d de %d mensajes" -#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700 +#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700 msgid "Canceled." msgstr "Cancelado." -#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702 +#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702 msgid "Complete." msgstr "Completado." -#: ../mail/mail-ops.c:878 +#: ../mail/mail-ops.c:877 msgid "Saving message to folder" msgstr "Guardando mensaje en la carpeta" -#: ../mail/mail-ops.c:956 +#: ../mail/mail-ops.c:955 #, c-format msgid "Moving messages to %s" msgstr "Moviendo mensajes a %s" -#: ../mail/mail-ops.c:956 +#: ../mail/mail-ops.c:955 #, c-format msgid "Copying messages to %s" msgstr "Copiando mensajes a %s" -#: ../mail/mail-ops.c:1173 +#: ../mail/mail-ops.c:1172 msgid "Forwarded messages" msgstr "Mensajes reenviados" -#: ../mail/mail-ops.c:1214 +#: ../mail/mail-ops.c:1213 #, c-format msgid "Opening folder %s" msgstr "Abriendo carpeta %s" -#: ../mail/mail-ops.c:1279 +#: ../mail/mail-ops.c:1278 #, c-format msgid "Retrieving quota information for folder %s" msgstr "Obteniendo la información de la cuota para la carpeta %s" -#: ../mail/mail-ops.c:1348 +#: ../mail/mail-ops.c:1347 #, c-format msgid "Opening store %s" msgstr "Abriendo almacén %s" -#: ../mail/mail-ops.c:1419 +#: ../mail/mail-ops.c:1418 #, c-format msgid "Removing folder %s" msgstr "Eliminando carpeta %s" -#: ../mail/mail-ops.c:1537 +#: ../mail/mail-ops.c:1536 #, c-format msgid "Storing folder '%s'" msgstr "Guardando carpeta «%s»" -#: ../mail/mail-ops.c:1600 +#: ../mail/mail-ops.c:1599 #, c-format msgid "Expunging and storing account '%s'" msgstr "Compactando y almacenando cuenta «%s»" -#: ../mail/mail-ops.c:1601 +#: ../mail/mail-ops.c:1600 #, c-format msgid "Storing account '%s'" msgstr "Almacenando cuenta «%s»" -#: ../mail/mail-ops.c:1655 +#: ../mail/mail-ops.c:1654 msgid "Refreshing folder" msgstr "Actualizando carpeta" -#: ../mail/mail-ops.c:1695 ../mail/mail-ops.c:1745 +#: ../mail/mail-ops.c:1694 ../mail/mail-ops.c:1744 msgid "Expunging folder" msgstr "Compactando carpeta" -#: ../mail/mail-ops.c:1742 +#: ../mail/mail-ops.c:1741 #, c-format msgid "Emptying trash in '%s'" msgstr "Vaciando papelera en «%s»" -#: ../mail/mail-ops.c:1743 +#: ../mail/mail-ops.c:1742 msgid "Local Folders" msgstr "Carpetas locales" -#: ../mail/mail-ops.c:1824 +#: ../mail/mail-ops.c:1823 #, c-format msgid "Retrieving message %s" msgstr "Obteniendo mensaje %s" -#: ../mail/mail-ops.c:1931 +#: ../mail/mail-ops.c:1930 #, c-format msgid "Retrieving %d message" msgid_plural "Retrieving %d messages" msgstr[0] "Descargando %d mensaje" msgstr[1] "Descargando %d mensajes" -#: ../mail/mail-ops.c:2016 +#: ../mail/mail-ops.c:2015 #, c-format msgid "Saving %d message" msgid_plural "Saving %d messages" msgstr[0] "Guardando %d mensaje" msgstr[1] "Guardando %d mensajes" -#: ../mail/mail-ops.c:2094 +#: ../mail/mail-ops.c:2093 #, c-format msgid "" "Error saving messages to: %s:\n" @@ -14039,11 +14026,11 @@ msgstr "" "Error guardando mensajes en: %s:\n" " %s" -#: ../mail/mail-ops.c:2166 +#: ../mail/mail-ops.c:2165 msgid "Saving attachment" msgstr "Guardando adjunto" -#: ../mail/mail-ops.c:2184 ../mail/mail-ops.c:2192 +#: ../mail/mail-ops.c:2183 ../mail/mail-ops.c:2191 #, c-format msgid "" "Cannot create output file: %s:\n" @@ -14052,27 +14039,27 @@ msgstr "" "No es posible crear el archivo de salida: %s:\n" " %s" -#: ../mail/mail-ops.c:2207 +#: ../mail/mail-ops.c:2206 #, c-format msgid "Could not write data: %s" msgstr "No es posible escribir datos: %s" -#: ../mail/mail-ops.c:2353 +#: ../mail/mail-ops.c:2352 #, c-format msgid "Disconnecting from %s" msgstr "Desconectando de %s" -#: ../mail/mail-ops.c:2353 +#: ../mail/mail-ops.c:2352 #, c-format msgid "Reconnecting to %s" msgstr "Reconectar a %s" -#: ../mail/mail-ops.c:2449 +#: ../mail/mail-ops.c:2448 #, c-format msgid "Preparing account '%s' for offline" msgstr "Preparando la cuenta «%s» para desconexión" -#: ../mail/mail-ops.c:2535 +#: ../mail/mail-ops.c:2534 msgid "Checking Service" msgstr "Comprobando el servicio" @@ -14165,21 +14152,21 @@ msgstr "Carpeta inválida: «%s»" msgid "Setting up Search Folder: %s" msgstr "Configurando carpeta de búsqueda: %s" -#: ../mail/mail-vfolder.c:240 +#: ../mail/mail-vfolder.c:234 #, c-format msgid "Updating Search Folders for '%s:%s'" msgstr "Actualizando carpetas de búsqueda para «%s: %s»" -#: ../mail/mail-vfolder.c:247 +#: ../mail/mail-vfolder.c:241 #, c-format msgid "Updating Search Folders for '%s'" msgstr "Actualizando carpetas de búsqueda para «%s»" -#: ../mail/mail-vfolder.c:1086 +#: ../mail/mail-vfolder.c:1067 msgid "Edit Search Folder" msgstr "Editar carpeta de búsqueda" -#: ../mail/mail-vfolder.c:1175 +#: ../mail/mail-vfolder.c:1156 msgid "New Search Folder" msgstr "Carpeta de búsqueda nueva" @@ -14869,11 +14856,11 @@ msgid "%b %d %Y" msgstr "%e de %b de %Y" #. there is some info why the message list is empty, let it be something useful -#: ../mail/message-list.c:3985 ../mail/message-list.c:4459 +#: ../mail/message-list.c:3986 ../mail/message-list.c:4460 msgid "Generating message list" msgstr "Generando la lista de mensajes" -#: ../mail/message-list.c:4298 +#: ../mail/message-list.c:4299 msgid "" "No message satisfies your search criteria. Either clear search with Search-" ">Clear menu item or change it." @@ -14881,7 +14868,7 @@ msgstr "" "Ningún mensaje satisface su criterio de búsqueda. Limpie el criterio de " "selección con el elemento del menú Buscar->Limpiar o cámbielo." -#: ../mail/message-list.c:4300 +#: ../mail/message-list.c:4301 msgid "There are no messages in this folder." msgstr "No hay mensajes en esta carpeta." @@ -15100,106 +15087,106 @@ msgstr "Seleccione un archivador de Evolution para restaurar:" msgid "Choose a file to restore" msgstr "Elija un archivador para restaurar" -#: ../plugins/backup-restore/backup.c:64 +#: ../plugins/backup-restore/backup.c:62 msgid "Backup Evolution directory" msgstr "Respaldar el directorio de Evolution" -#: ../plugins/backup-restore/backup.c:66 +#: ../plugins/backup-restore/backup.c:64 msgid "Restore Evolution directory" msgstr "Restaurar el directorio de Evolution" -#: ../plugins/backup-restore/backup.c:68 +#: ../plugins/backup-restore/backup.c:66 msgid "Check Evolution Backup" msgstr "Comprobar respaldo de Evolution" -#: ../plugins/backup-restore/backup.c:70 +#: ../plugins/backup-restore/backup.c:68 msgid "Restart Evolution" msgstr "Reiniciar Evolution" -#: ../plugins/backup-restore/backup.c:72 +#: ../plugins/backup-restore/backup.c:70 msgid "With Graphical User Interface" msgstr "Con interfaz gráfica de usuario" -#: ../plugins/backup-restore/backup.c:123 -#: ../plugins/backup-restore/backup.c:256 +#: ../plugins/backup-restore/backup.c:187 +#: ../plugins/backup-restore/backup.c:235 msgid "Shutting down Evolution" msgstr "Cerrando Evolution" -#: ../plugins/backup-restore/backup.c:130 +#: ../plugins/backup-restore/backup.c:194 msgid "Backing Evolution accounts and settings" msgstr "Respaldar las cuentas y la configuración de Evolution" -#: ../plugins/backup-restore/backup.c:134 +#: ../plugins/backup-restore/backup.c:200 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)" msgstr "" "Respaldar los datos de Evolution (correos, contactos, calendario, tareas, " "notas)" -#: ../plugins/backup-restore/backup.c:145 +#: ../plugins/backup-restore/backup.c:211 msgid "Backup complete" msgstr "Respaldo completado" -#: ../plugins/backup-restore/backup.c:150 -#: ../plugins/backup-restore/backup.c:337 +#: ../plugins/backup-restore/backup.c:216 +#: ../plugins/backup-restore/backup.c:269 msgid "Restarting Evolution" msgstr "Reiniciando Evolution" -#: ../plugins/backup-restore/backup.c:260 +#: ../plugins/backup-restore/backup.c:239 msgid "Backup current Evolution data" msgstr "Respaldar los datos actuales de Evolution" -#: ../plugins/backup-restore/backup.c:265 +#: ../plugins/backup-restore/backup.c:244 msgid "Extracting files from backup" msgstr "Extrayendo archivos del respaldo" -#: ../plugins/backup-restore/backup.c:272 +#: ../plugins/backup-restore/backup.c:251 msgid "Loading Evolution settings" msgstr "Carga la configuración de Evolution" -#: ../plugins/backup-restore/backup.c:276 +#: ../plugins/backup-restore/backup.c:258 msgid "Removing temporary backup files" msgstr "Eliminando archivos temporales de respaldo" -#: ../plugins/backup-restore/backup.c:283 +#: ../plugins/backup-restore/backup.c:265 msgid "Ensuring local sources" msgstr "Asegurando fuentes locales" -#: ../plugins/backup-restore/backup.c:454 +#: ../plugins/backup-restore/backup.c:386 #, c-format msgid "Backing up to the folder %s" msgstr "Respaldando a la carpeta %s" -#: ../plugins/backup-restore/backup.c:459 +#: ../plugins/backup-restore/backup.c:391 #, c-format msgid "Restoring from the folder %s" msgstr "Restaurando desde la carpeta %s" #. Backup / Restore only can have GUI. We should restrict the rest -#: ../plugins/backup-restore/backup.c:478 +#: ../plugins/backup-restore/backup.c:410 msgid "Evolution Backup" msgstr "Respaldo de Evolution" -#: ../plugins/backup-restore/backup.c:478 +#: ../plugins/backup-restore/backup.c:410 msgid "Evolution Restore" msgstr "Restaurador de Evolution" -#: ../plugins/backup-restore/backup.c:513 +#: ../plugins/backup-restore/backup.c:445 msgid "Backing up Evolution Data" msgstr "Respaldando los datos de Evolution" -#: ../plugins/backup-restore/backup.c:514 +#: ../plugins/backup-restore/backup.c:446 msgid "Please wait while Evolution is backing up your data." msgstr "Espere mientras Evolution respalda sus datos." -#: ../plugins/backup-restore/backup.c:516 +#: ../plugins/backup-restore/backup.c:448 msgid "Restoring Evolution Data" msgstr "Restaurando los datos de Evolution" -#: ../plugins/backup-restore/backup.c:517 +#: ../plugins/backup-restore/backup.c:449 msgid "Please wait while Evolution is restoring your data." msgstr "Espere mientras Evolution restaura sus datos." -#: ../plugins/backup-restore/backup.c:535 +#: ../plugins/backup-restore/backup.c:467 msgid "This may take a while depending on the amount of data in your account." msgstr "" "Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta." @@ -15280,40 +15267,40 @@ msgstr "R_estaurar ajustes…" msgid "_Backup Settings..." msgstr "_Respaldar ajustes…" -#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624 +#: ../plugins/bbdb/bbdb.c:621 ../plugins/bbdb/bbdb.c:630 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1 msgid "Automatic Contacts" msgstr "Contactos automáticos" #. Enable BBDB checkbox -#: ../plugins/bbdb/bbdb.c:639 -msgid "_Auto-create address book entries when replying to messages" +#: ../plugins/bbdb/bbdb.c:645 +msgid "Create _address book entries when sending mails" msgstr "" -"Crear entradas _automáticamente en la libreta de direcciones al responder " +"Crear entradas _automáticamente en la libreta de direcciones al enviar " "correos" -#: ../plugins/bbdb/bbdb.c:645 +#: ../plugins/bbdb/bbdb.c:651 msgid "Select Address book for Automatic Contacts" msgstr "Seleccione la libreta para contactos automáticos" -#: ../plugins/bbdb/bbdb.c:660 +#: ../plugins/bbdb/bbdb.c:666 msgid "Instant Messaging Contacts" msgstr "Contactos de mensajería instantánea" #. Enable Gaim Checkbox -#: ../plugins/bbdb/bbdb.c:675 +#: ../plugins/bbdb/bbdb.c:681 msgid "Synchronize contact info and images from Pidgin buddy list" msgstr "" "Sincronizar información e imágenes de contactos desde la lista de contactos " "de Pidgin" -#: ../plugins/bbdb/bbdb.c:681 +#: ../plugins/bbdb/bbdb.c:687 msgid "Select Address book for Pidgin buddy list" msgstr "" "Seleccione la libreta de direcciones para la lista de contactos de Pidgin" #. Synchronize now button. -#: ../plugins/bbdb/bbdb.c:692 +#: ../plugins/bbdb/bbdb.c:698 msgid "Synchronize with _buddy list now" msgstr "Sincronizar con la lista de _contactos de MI ahora" @@ -15754,43 +15741,43 @@ msgstr "URL _OWA:" msgid "A_uthenticate" msgstr "A_utenticar" -#: ../plugins/exchange-operations/exchange-account-setup.c:777 -msgid "S_pecify the mailbox name" -msgstr "Especi_ficar el nombre del buzón de correo" +#: ../plugins/exchange-operations/exchange-account-setup.c:778 +msgid "Mailbox name is _different than user name" +msgstr "El nombre del buzón es _diferente del nombre de usuario" -#: ../plugins/exchange-operations/exchange-account-setup.c:790 +#: ../plugins/exchange-operations/exchange-account-setup.c:791 msgid "_Mailbox:" msgstr "_Buzón:" -#: ../plugins/exchange-operations/exchange-account-setup.c:1005 +#: ../plugins/exchange-operations/exchange-account-setup.c:1006 msgid "_Authentication Type" msgstr "Tipo de _autenticación" -#: ../plugins/exchange-operations/exchange-account-setup.c:1019 +#: ../plugins/exchange-operations/exchange-account-setup.c:1020 msgid "Ch_eck for Supported Types" msgstr "_Comprobar tipos soportados" -#: ../plugins/exchange-operations/exchange-account-setup.c:1134 -#: ../plugins/exchange-operations/exchange-contacts.c:217 +#: ../plugins/exchange-operations/exchange-account-setup.c:1135 +#: ../plugins/exchange-operations/exchange-contacts.c:218 #, c-format msgid "%s KB" msgstr "%s KiB" -#: ../plugins/exchange-operations/exchange-account-setup.c:1136 -#: ../plugins/exchange-operations/exchange-contacts.c:219 +#: ../plugins/exchange-operations/exchange-account-setup.c:1137 +#: ../plugins/exchange-operations/exchange-contacts.c:220 #, c-format msgid "0 KB" msgstr "0 KiB" #. FIXME: Take care of i18n -#: ../plugins/exchange-operations/exchange-account-setup.c:1141 +#: ../plugins/exchange-operations/exchange-account-setup.c:1142 #: ../plugins/exchange-operations/exchange-calendar.c:236 -#: ../plugins/exchange-operations/exchange-contacts.c:222 +#: ../plugins/exchange-operations/exchange-contacts.c:223 msgid "Size:" msgstr "Tamaño:" #: ../plugins/exchange-operations/exchange-calendar.c:196 -#: ../plugins/exchange-operations/exchange-contacts.c:170 +#: ../plugins/exchange-operations/exchange-contacts.c:171 msgid "" "Evolution is in offline mode. You cannot create or modify folders now.\n" "Please switch to online mode for such operations." @@ -16611,11 +16598,12 @@ msgstr "Compruebe los permisos de la carpeta" #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1 msgid "Automatically launch editor when key is pressed in the mail composer" msgstr "" +"Lanzar el editor automáticamente al pulsar una tecla en el editor de correos" #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2 #: ../plugins/external-editor/external-editor.c:120 msgid "Automatically launch when a new mail is edited" -msgstr "" +msgstr "Lanzar automáticamente al editar un correo nuevo" #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3 msgid "Default External Editor" @@ -16625,6 +16613,18 @@ msgstr "Editor externo predeterminado" msgid "The default command that must be used as the editor." msgstr "El comando predeterminado que usar como editor." +#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1 +msgid "" +"A plugin for using an external editor as the composer. You can send only " +"plain-text messages." +msgstr "" +"Un complemento para usar un editor externo como editor de mensajes. Sólo " +"puede enviar correos en texto plano." + +#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2 +msgid "External Editor" +msgstr "Editor externo" + #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1 msgid "Cannot create Temporary File" msgstr "No se puede crear el directorio de guardado temporal" @@ -16675,10 +16675,8 @@ msgstr "" #: ../plugins/external-editor/external-editor.c:308 #: ../plugins/external-editor/external-editor.c:310 -#, fuzzy -#| msgid "Compose in _External Editor" msgid "Compose in External Editor" -msgstr "Redactar en un editor _externo" +msgstr "Redactar en un editor externo" #: ../plugins/face/face.c:59 msgid "Select a (48*48) png of size < 700bytes" @@ -17941,10 +17939,8 @@ msgid "_Inherit reminder" msgstr "_Heredar recordatorio" #: ../plugins/itip-formatter/itip-view.c:1914 -#, fuzzy -#| msgid "_Memos" msgid "_Memos:" -msgstr "_Notas" +msgstr "_Notas:" #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1 msgid "Displays text/calendar parts in messages." @@ -18156,16 +18152,12 @@ msgid "Cannot open calendar. %s" msgstr "No se puede abrir el calendario. %s" #: ../plugins/mail-to-task/mail-to-task.c:350 -#, fuzzy -#| msgid "" -#| "Selected source is read only, thus cannot create task there. Select other " -#| "source, please." msgid "" "Selected source is read only, thus cannot create event there. Select other " "source, please." msgstr "" -"El origen seleccionado es de sólo lectura, por ello no se puede crear una " -"tarea en él. Selecione otro origen." +"El origen seleccionado es de sólo lectura, por ello no se puede crear un " +"acontecimiento en él. Seleccione otro origen." #: ../plugins/mail-to-task/mail-to-task.c:353 msgid "" @@ -18173,19 +18165,15 @@ msgid "" "source, please." msgstr "" "El origen seleccionado es de sólo lectura, por ello no se puede crear una " -"tarea en él. Selecione otro origen." +"tarea en él. Seleccione otro origen." #: ../plugins/mail-to-task/mail-to-task.c:356 -#, fuzzy -#| msgid "" -#| "Selected source is read only, thus cannot create task there. Select other " -#| "source, please." msgid "" "Selected source is read only, thus cannot create memo there. Select other " "source, please." msgstr "" "El origen seleccionado es de sólo lectura, por ello no se puede crear una " -"tarea en él. Selecione otro origen." +"nota en él. Seleccione otro origen." #: ../plugins/mail-to-task/mail-to-task.c:455 #, c-format @@ -18193,10 +18181,9 @@ msgid "Could not create object. %s" msgstr "No se pudo crear el objeto. %s" #: ../plugins/mail-to-task/mail-to-task.c:555 -#, fuzzy, c-format -#| msgid "Cannot open source \"{2}\"." +#, c-format msgid "Cannot get source list. %s" -msgstr "No se puede abrir el origen «{2}»." +msgstr "No se pudo obtener la lista de origen. %s" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1 msgid "" @@ -18237,22 +18224,16 @@ msgid "Mail to task" msgstr "Correo a tarea" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1 -#, fuzzy -#| msgid "Convert the selected message to a new task" msgid "Convert the selected message to a new event" -msgstr "Convierte el mensaje seleccionado en una tarea nueva" +msgstr "Convertir el mensaje seleccionado en un acontecimiento nuevo" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2 -#, fuzzy -#| msgid "Convert the selected message to a new task" msgid "Convert the selected message to a new meeting" -msgstr "Convierte el mensaje seleccionado en una tarea nueva" +msgstr "Convertir el mensaje seleccionado en una reunión nueva" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3 -#, fuzzy -#| msgid "Convert the selected message to a new task" msgid "Convert the selected message to a new memo" -msgstr "Convierte el mensaje seleccionado en una tarea nueva" +msgstr "Convertir el mensaje seleccionado en una nota nueva" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4 msgid "Convert the selected message to a new task" @@ -18694,27 +18675,41 @@ msgstr "" msgid "Service _type:" msgstr "_Tipo de servicio:" -#: ../plugins/publish-calendar/publish-calendar.glade.h:22 +#: ../plugins/publish-calendar/publish-calendar.glade.h:21 +msgid "Time _duration:" +msgstr "_Duración:" + +#: ../plugins/publish-calendar/publish-calendar.glade.h:23 msgid "_File:" msgstr "_Archivo:" -#: ../plugins/publish-calendar/publish-calendar.glade.h:23 +#: ../plugins/publish-calendar/publish-calendar.glade.h:24 msgid "_Password:" msgstr "_Contraseña:" -#: ../plugins/publish-calendar/publish-calendar.glade.h:24 +#: ../plugins/publish-calendar/publish-calendar.glade.h:25 msgid "_Publish as:" msgstr "_Publicar como:" -#: ../plugins/publish-calendar/publish-calendar.glade.h:25 +#: ../plugins/publish-calendar/publish-calendar.glade.h:26 msgid "_Remember password" msgstr "_Recordar contraseña" -#: ../plugins/publish-calendar/publish-calendar.glade.h:27 +#: ../plugins/publish-calendar/publish-calendar.glade.h:28 msgid "_Username:" msgstr "_Usuario:" -#: ../plugins/publish-calendar/publish-calendar.glade.h:28 +#: ../plugins/publish-calendar/publish-calendar.glade.h:29 +msgid "" +"days\n" +"weeks\n" +"months" +msgstr "" +"días\n" +"semanas\n" +"meses" + +#: ../plugins/publish-calendar/publish-calendar.glade.h:32 msgid "" "iCal\n" "Free/Busy" @@ -18722,18 +18717,18 @@ msgstr "" "Disponibilidad\n" "iCal" -#: ../plugins/publish-calendar/publish-format-fb.c:57 +#: ../plugins/publish-calendar/publish-format-fb.c:69 #: ../plugins/publish-calendar/publish-format-ical.c:82 #, c-format msgid "Could not publish calendar: Calendar backend no longer exists" msgstr "" "No se pudo publicar el calendario: El «backend» del calendario ya no existe." -#: ../plugins/publish-calendar/url-editor-dialog.c:461 +#: ../plugins/publish-calendar/url-editor-dialog.c:480 msgid "New Location" msgstr "Ubicación nueva" -#: ../plugins/publish-calendar/url-editor-dialog.c:463 +#: ../plugins/publish-calendar/url-editor-dialog.c:482 msgid "Edit Location" msgstr "Editar ubicación" @@ -18761,51 +18756,47 @@ msgstr "Un complemento que carga otros complementos escritos en Python." msgid "Python Loader" msgstr "Cargador de Python" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:111 -msgid "SpamAssassin (built-in)" -msgstr "SpamAssassin (integrado)" - -#: ../plugins/sa-junk-plugin/em-junk-filter.c:137 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:128 #, c-format msgid "SpamAssassin not found, code: %d" msgstr "No se encontró SpamAssasin, código: %d" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:145 -#: ../plugins/sa-junk-plugin/em-junk-filter.c:153 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:136 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:144 #, c-format msgid "Failed to create pipe: %s" msgstr "Falló al crear la tubería: %s" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:192 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:183 #, c-format msgid "Error after fork: %s" msgstr "Error después de bifurcar: %s" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:247 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:238 #, c-format msgid "SpamAssassin child process does not respond, killing..." msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo…" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:249 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:240 #, c-format msgid "Wait for SpamAssassin child process interrupted, terminating..." msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando…" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:258 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:249 #, c-format msgid "Pipe to SpamAssassin failed, error code: %d" msgstr "Falló la tubería hacia SpamAssasin, código de error: %d" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:521 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:512 #, c-format msgid "SpamAssassin is not available." msgstr "SpamAssasin no está disponible." -#: ../plugins/sa-junk-plugin/em-junk-filter.c:913 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:904 msgid "This will make SpamAssassin more reliable, but slower" msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:919 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:910 msgid "I_nclude remote tests" msgstr "I_ncluir tests remotos" @@ -19159,14 +19150,12 @@ msgstr "" "o bien del archivo de contrasñeas ~/.gnome2_private/Evolution." #: ../shell/apps_evolution_shell.schemas.in.h:15 -#| msgid "Insert Attachment" msgid "Initial attachment view" msgstr "Vista inicial de adjunto" #: ../shell/apps_evolution_shell.schemas.in.h:16 -#| msgid "Install the shared folder" msgid "Initial file chooser folder" -msgstr "" +msgstr "Carpeta inicial del selector de archivos" #: ../shell/apps_evolution_shell.schemas.in.h:17 msgid "Initial folder for GtkFileChooser dialogs." @@ -19467,28 +19456,28 @@ msgstr "Preferencias de Evolution" msgid "%s - Evolution" msgstr "%s - Evolution" -#: ../shell/e-shell-window-commands.c:75 +#: ../shell/e-shell-window-commands.c:69 msgid "The GNOME Pilot tools do not appear to be installed on this system." msgstr "" "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema." -#: ../shell/e-shell-window-commands.c:83 +#: ../shell/e-shell-window-commands.c:78 #, c-format -msgid "Error executing %s." -msgstr "Error ejecutando %s." +msgid "Error executing %s. (%s)" +msgstr "Error al ejecutar %s. (%s)" -#: ../shell/e-shell-window-commands.c:139 +#: ../shell/e-shell-window-commands.c:136 msgid "Bug buddy is not installed." msgstr "Bug Buddy no está instalado." -#: ../shell/e-shell-window-commands.c:142 +#: ../shell/e-shell-window-commands.c:139 msgid "Bug buddy could not be run." msgstr "No es posible ejecutar Bug Buddy." #. The translator-credits string is for translators to list #. * per-language credits for translation, displayed in the #. * about dialog. -#: ../shell/e-shell-window-commands.c:942 +#: ../shell/e-shell-window-commands.c:939 msgid "translator-credits" msgstr "" "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009\n" @@ -19499,19 +19488,19 @@ msgstr "" "Eneko Lacunza <enlar@iname.com>, 2001-2002\n" "Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001" -#: ../shell/e-shell-window-commands.c:953 +#: ../shell/e-shell-window-commands.c:950 msgid "Evolution Website" msgstr "Página web de Evolution" -#: ../shell/e-shell-window-commands.c:1171 +#: ../shell/e-shell-window-commands.c:1168 msgid "_Work Online" msgstr "_Trabajar conectado" -#: ../shell/e-shell-window-commands.c:1184 ../ui/evolution.xml.h:57 +#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57 msgid "_Work Offline" msgstr "_Trabajar desconectado" -#: ../shell/e-shell-window-commands.c:1197 +#: ../shell/e-shell-window-commands.c:1194 msgid "Work Offline" msgstr "Trabajar desconectado" @@ -21874,59 +21863,55 @@ msgstr "Tipo de vista" msgid "Type of view:" msgstr "Tipo de vista:" +#: ../widgets/misc/e-attachment.c:940 +msgid "Attached message" +msgstr "Mensaje adjunto" + #. Translators: Default attachment filename. -#: ../widgets/misc/e-attachment.c:1709 ../widgets/misc/e-attachment.c:2258 -#: ../widgets/misc/e-attachment-store.c:627 -#| msgid "attachment" +#: ../widgets/misc/e-attachment.c:1719 ../widgets/misc/e-attachment.c:2270 +#: ../widgets/misc/e-attachment-store.c:635 msgid "attachment.dat" msgstr "attachment.dat" -#: ../widgets/misc/e-attachment.c:1756 ../widgets/misc/e-attachment.c:2560 +#: ../widgets/misc/e-attachment.c:1766 ../widgets/misc/e-attachment.c:2572 msgid "A load operation is already in progress" msgstr "Existe una operación de carga en progreso" -#: ../widgets/misc/e-attachment.c:1764 ../widgets/misc/e-attachment.c:2568 +#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2580 msgid "A save operation is already in progress" msgstr "Existe una operación de guardado en progreso" -#: ../widgets/misc/e-attachment.c:1857 +#: ../widgets/misc/e-attachment.c:1867 #, c-format -#| msgid "Could not load address book" msgid "Could not load '%s'" msgstr "No se pudo cargar «%s»" -#: ../widgets/misc/e-attachment.c:1860 +#: ../widgets/misc/e-attachment.c:1870 #, c-format -#| msgid "Could not open the link." msgid "Could not load the attachment" msgstr "No se pudo cargar el adjunto" -#: ../widgets/misc/e-attachment.c:2135 +#: ../widgets/misc/e-attachment.c:2147 #, c-format -#| msgid "Could not open source" msgid "Could not open '%s'" msgstr "No se pudo abrir «%s»" -#: ../widgets/misc/e-attachment.c:2138 +#: ../widgets/misc/e-attachment.c:2150 #, c-format -#| msgid "Could not open the link." msgid "Could not open the attachment" msgstr "No se pudo abrir el adjunto" -#: ../widgets/misc/e-attachment.c:2576 -#| msgid "Attachment Reminder" +#: ../widgets/misc/e-attachment.c:2588 msgid "Attachment contents not loaded" msgstr "No se cargó el contenido del adjunto" -#: ../widgets/misc/e-attachment.c:2653 +#: ../widgets/misc/e-attachment.c:2665 #, c-format -#| msgid "Could not execute '%s': %s\n" msgid "Could not save '%s'" msgstr "No se pudo guardar «%s»" -#: ../widgets/misc/e-attachment.c:2656 +#: ../widgets/misc/e-attachment.c:2668 #, c-format -#| msgid "Select folder to save all attachments" msgid "Could not save the attachment" msgstr "No se pudo guardar el adjunto" @@ -21935,29 +21920,24 @@ msgid "Attachment Properties" msgstr "Propiedades de adjuntos" #: ../widgets/misc/e-attachment-dialog.c:328 -#| msgid "F_ilename:" msgid "_Filename:" msgstr "Nombre del _archivo:" #: ../widgets/misc/e-attachment-dialog.c:363 -#| msgid "MIME Type" msgid "MIME Type:" msgstr "Tipo MIME:" #: ../widgets/misc/e-attachment-handler-image.c:95 -#| msgid "Set as _Background" msgid "Could not set as background" msgstr "No se pudo establecer como fondo" #: ../widgets/misc/e-attachment-icon-view.c:473 #: ../widgets/misc/e-attachment-tree-view.c:517 -#| msgid "Loading..." msgid "Loading" msgstr "Cargando" #: ../widgets/misc/e-attachment-icon-view.c:485 #: ../widgets/misc/e-attachment-tree-view.c:529 -#| msgid "Shading" msgid "Saving" msgstr "Guardando" @@ -21970,35 +21950,35 @@ msgstr "Ocultar _barra de adjuntos" msgid "Show _Attachment Bar" msgstr "Mostrar _barra de adjuntos" -#: ../widgets/misc/e-attachment-store.c:533 -#| msgid "Attachment" -#| msgid_plural "Attachments" +#: ../widgets/misc/e-attachment-store.c:541 msgid "Add Attachment" msgstr "Añadir adjunto" -#: ../widgets/misc/e-attachment-store.c:536 +#: ../widgets/misc/e-attachment-store.c:544 msgid "A_ttach" msgstr "_Adjuntar" -#: ../widgets/misc/e-attachment-store.c:598 -#| msgid "Save attachments" +#: ../widgets/misc/e-attachment-store.c:606 msgid "Save Attachment" msgid_plural "Save Attachments" msgstr[0] "Guarda el adjunto" msgstr[1] "Guardar los adjuntos" -#: ../widgets/misc/e-attachment-view.c:299 +#: ../widgets/misc/e-attachment-view.c:300 msgid "S_ave All" msgstr "Guardar _todo" -#: ../widgets/misc/e-attachment-view.c:325 -#| msgid "_Add attachment..." +#: ../widgets/misc/e-attachment-view.c:326 msgid "A_dd Attachment..." msgstr "_Añadir adjunto…" -#: ../widgets/misc/e-attachment-view.c:648 +#: ../widgets/misc/e-attachment-view.c:646 +#, c-format +msgid "Open with \"%s\"" +msgstr "Abrir con «%s»" + +#: ../widgets/misc/e-attachment-view.c:649 #, c-format -#| msgid "Save attachment as" msgid "Open this attachment in %s" msgstr "Abrir este adjunto en %s" @@ -22485,7 +22465,6 @@ msgid "_All information" msgstr "_Toda la información" #: ../widgets/misc/e-send-options.glade.h:30 -#| msgid "_Classification" msgid "_Classification:" msgstr "_Clasificación:" @@ -22998,6 +22977,30 @@ msgstr "Contexto IM" msgid "Handle Popup" msgstr "Tirador emergente" +#~ msgid "Adjust for daylight sa_ving time" +#~ msgstr "Ajustar a la hora de _verano" + +#~ msgid "C_all To..." +#~ msgstr "Ll_amar a…" + +#~ msgid "SpamAssassin (built-in)" +#~ msgstr "SpamAssassin (integrado)" + +#~ msgid "" +#~ "Enable side bar search feature so that you can start interactive " +#~ "searching by typing in the text. Use is that you can easily find a folder " +#~ "in that side bar by just typing the folder name and the selection jumps " +#~ "automatically to that folder." +#~ msgstr "" +#~ "Activa la característica de búsqueda en la barra para que puede iniciar " +#~ "una búsqueda interactiva tecleando el texto. El uso es para que pueda " +#~ "encontrar fácilmente una carpeta en esa barra lateral tan sólo tecleando " +#~ "el nombre de la carpeta y la selección salta automáticamente a esa " +#~ "carpeta." + +#~ msgid "S_pecify the mailbox name" +#~ msgstr "Especi_ficar el nombre del buzón de correo" + #~ msgid "_Tasks :" #~ msgstr "_Tareas:" @@ -23972,13 +23975,6 @@ msgstr "Tirador emergente" #~ msgid "No Attachment" #~ msgstr "Sin adjunto" -#~ msgid "" -#~ "A plugin for using an external editor as the composer. You can send only " -#~ "plain-text messages." -#~ msgstr "" -#~ "Un complemento para usar un editor externo como editor de mensajes. Sólo " -#~ "puede enviar correos en texto plano." - #~ msgid "Compose messages using an external editor" #~ msgstr "Redactar mensajes usando un editor externo" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution\n" "POT-Creation-Date: 2009-03-09 04:41+0000\n" -"PO-Revision-Date: 2009-04-09 11:28+0300\n" +"PO-Revision-Date: 2009-05-09 10:11+0300\n" "Last-Translator: Ivar Smolin <okul@linux.ee>\n" "Language-Team: Estonian <gnome-et@linux.ee>\n" "MIME-Version: 1.0\n" @@ -4337,7 +4337,7 @@ msgid "_Ask for confirmation when deleting items" msgstr "K_irjete kustutamisel küsitakse nõusolekut" msgid "_Compress weekends in month view" -msgstr "_Nädalalõppe kuvatakse kokkusurutud vormis" +msgstr "Nädalalõppe kuvatakse kokkusurutud _vormis" msgid "_Day begins:" msgstr "Päev al_gab:" @@ -5550,9 +5550,8 @@ msgstr "" msgid "%02i minute divisions" msgstr "%02i-minutiline jaotamine" -#, fuzzy msgid "Show the second time zone" -msgstr "\"Eelvaatlus\" paani kuvamine" +msgstr "Teise ajavööndi näitamine" #. strftime format %A = full weekday name, %d = day of month, #. %B = full month name. Don't use any other specifiers. @@ -10733,7 +10732,7 @@ msgid "HTML Messages" msgstr "HTML-Sõnumid" msgid "H_TTP Proxy:" -msgstr "H_TTP proksi:" +msgstr "_HTTP proksi:" msgid "Headers" msgstr "Päised" @@ -10769,7 +10768,7 @@ msgid "Message Composer" msgstr "Sõnumiredaktor" msgid "No _Proxy for:" -msgstr "Proksit _ei kasuta:" +msgstr "Proksit _ei kasutata aadressidele:" msgid "" "Note: Underscore in the label name is used as mnemonic identifier in menu." @@ -10931,10 +10930,10 @@ msgid "Us_ername:" msgstr "_Kasutajanimi:" msgid "Use Authe_ntication" -msgstr "_Autentimise kasutamine" +msgstr "Kasutatakse _autentimist" msgid "User_name:" -msgstr "_Kasutajanimi:" +msgstr "Kasutaja_nimi:" msgid "V_ariable-width:" msgstr "_Muutuva laiusega:" @@ -11026,7 +11025,7 @@ msgid "_Use Secure Connection:" msgstr "Tu_rvalise ühenduse kasutamine:" msgid "_Use system defaults" -msgstr "Süsteemi _vaikeväärtuste kasutamine" +msgstr "Kasutatakse süsteemi _vaikeväärtusi" msgid "_Use the same fonts as other applications" msgstr "_Kirjatüüp on sama, mis teistes rakendustes" @@ -13258,9 +13257,8 @@ msgstr "" msgid "Unsubscribing from folder \"%s\"" msgstr "Kausta \"%s\" tellimusest loobumine" -#, fuzzy msgid "Allows unsubscribing of mail folders in the side bar context menu." -msgstr "Sõnumikaustade tellimise lubamine kaustapuu kontekstimenüüst." +msgstr "" msgid "Unsubscribe Folders" msgstr "Kausta tellimuse lõpetamine" @@ -14209,9 +14207,8 @@ msgid "_Preserve my reminder" msgstr "" #. To Translators: This is a check box to inherit a reminder. -#, fuzzy msgid "_Inherit reminder" -msgstr "Manuste meeldetuletaja" +msgstr "" msgid "_Tasks :" msgstr "_Ülesanded :" @@ -17060,7 +17057,7 @@ msgid "" "zone.\n" "Use the right mouse button to zoom out." msgstr "" -"Kasuta vasakut hiirenuppu, et kaarti suurendada ja ajavööndit valida.\n" +"Kaardi suurendamiseks ja ajavööndi valimiseks kasuta vasakut hiirenuppu.\n" "Parema hiirenupuga saab kaarti vähendada." msgid "Collection" @@ -17913,9 +17910,6 @@ msgstr "Välksõnumikontekst" msgid "Handle Popup" msgstr "" -#~ msgid "Novell Groupwise" -#~ msgstr "Novell Groupwise" - #~ msgid "" #~ "We were unable to open this address book. This either means you have " #~ "entered an incorrect URI, or the LDAP server is unreachable." @@ -17923,21 +17917,6 @@ msgstr "" #~ "Aadressiraamatut pole võimalik avada. Põhjuseks võib olla see, et " #~ "sisestasid vigase URI või pole LDAP-server kättesaadav." -#~ msgid "Contact Print Style Editor Test" -#~ msgstr "Kontakti printimislaadi redaktori test" - -#~ msgid "Copyright (C) 2000, Ximian, Inc." -#~ msgstr "Autoriõigus (C) 2000, Ximian, Inc." - -#~ msgid "This should test the contact print style editor widget" -#~ msgstr "See peaks testima kontakti printimise laadiredaktori vidinat" - -#~ msgid "Contact Print Test" -#~ msgstr "Kontakti printimistest" - -#~ msgid "This should test the contact print code" -#~ msgstr "See peaks testima kontaktiprintimise koodi" - #~ msgid "Business" #~ msgstr "Äri" @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: or\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n" "POT-Creation-Date: 2009-05-05 00:57+0000\n" -"PO-Revision-Date: 2009-05-05 18:00+0530\n" +"PO-Revision-Date: 2009-05-07 19:12+0530\n" "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n" "Language-Team: Oriya <oriya-it@googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -36,6 +36,9 @@ msgstr "" "\n" "\n" "\n" +"\n" +"\n" +"\n" "X-Generator: KBabel 1.11.4\n" #: ../a11y/addressbook/ea-addressbook-view.c:94 @@ -17233,15 +17236,14 @@ msgid "<b>%s</b> through %s has canceled the following shared memo:" msgstr "<b></b> ନିମ୍ନଲିଖିତ:" #: ../plugins/itip-formatter/itip-view.c:549 -#, fuzzy, c-format +#, c-format msgid "<b>%s</b> has canceled the following shared memo:" -msgstr "<b></b> ନିମ୍ନଲିଖିତ:" +msgstr "<b>%s</b> ନିମ୍ନଲିଖିତ ସହଭାଗୀ ମେମୋକୁ ବାତିଲ କରିଛି:" #. Everything gets the open button #: ../plugins/itip-formatter/itip-view.c:821 -#, fuzzy msgid "_Open Calendar" -msgstr "ଖୋଲନ୍ତୁ କ୍ଯାଲେଣ୍ଡର" +msgstr "କ୍ଯାଲେଣ୍ଡର ଖୋଲନ୍ତୁ (_O)" #: ../plugins/itip-formatter/itip-view.c:827 #: ../plugins/itip-formatter/itip-view.c:831 @@ -17260,39 +17262,33 @@ msgid "_Accept" msgstr "_ସ୍ବୀକାର କର" #: ../plugins/itip-formatter/itip-view.c:831 -#, fuzzy msgid "_Decline all" -msgstr "ହ୍ରାସ କର ସମସ୍ତ" +msgstr "ସମସ୍ତଙ୍କୁ ହ୍ରାସ କରନ୍ତୁ (_D)" #: ../plugins/itip-formatter/itip-view.c:832 -#, fuzzy msgid "_Tentative all" -msgstr "ଚେଷ୍ଟାକୃତ ସମସ୍ତ" +msgstr "ସମସ୍ତ ଚେଷ୍ଟାକୃତ (_T)" #: ../plugins/itip-formatter/itip-view.c:832 #: ../plugins/itip-formatter/itip-view.c:838 #: ../plugins/itip-formatter/itip-view.c:855 #: ../plugins/itip-formatter/itip-view.c:860 -#, fuzzy msgid "_Tentative" -msgstr "ଚେଷ୍ଟାକୃତ" +msgstr "ଚେଷ୍ଟାକୃତ (_T)" #: ../plugins/itip-formatter/itip-view.c:833 -#, fuzzy msgid "_Accept all" -msgstr "ଗ୍ରହଣକର ସମସ୍ତ" +msgstr "ସମସ୍ତଙ୍କୁ ଗ୍ରହଣକରନ୍ତୁ (_A)" #. FIXME Is this really the right button? #: ../plugins/itip-formatter/itip-view.c:844 -#, fuzzy msgid "_Send Information" -msgstr "ପଠାଅ ସୂଚନା" +msgstr "ସୂଚନା ପଠାନ୍ତୁ (_S)" #. FIXME Is this really the right button? #: ../plugins/itip-formatter/itip-view.c:848 -#, fuzzy msgid "_Update Attendee Status" -msgstr "ଅପଡେଟ କର ଶ୍ରୋତା ଅବସ୍ଥିତି" +msgstr "ଅଂଶଗ୍ରହଣକର୍ତ୍ତା ସ୍ଥିତିକୁ ଅଦ୍ୟତନ କରନ୍ତୁ (_U)" #: ../plugins/itip-formatter/itip-view.c:851 msgid "_Update" @@ -17300,15 +17296,13 @@ msgstr "ଅଦ୍ଯତନ (_U)" #. Start time #: ../plugins/itip-formatter/itip-view.c:1031 -#, fuzzy msgid "Start time:" -msgstr "ଆରମ୍ଭ:" +msgstr "ଆରମ୍ଭ ସମୟ:" #. End time #: ../plugins/itip-formatter/itip-view.c:1042 -#, fuzzy msgid "End time:" -msgstr "ସମାପ୍ତ:" +msgstr "ସମାପ୍ତି ସମୟ:" #. Comment #: ../plugins/itip-formatter/itip-view.c:1062 @@ -17317,20 +17311,17 @@ msgid "Comment:" msgstr "ଟିପ୍ପଣୀ:" #: ../plugins/itip-formatter/itip-view.c:1101 -#, fuzzy msgid "Send _reply to sender" -msgstr "ପଠାଅ କୁ" +msgstr "ପ୍ରେରକଙ୍କ ପାଖକୁ ଉତ୍ତର ପଠାନ୍ତୁ (_r)" #: ../plugins/itip-formatter/itip-view.c:1131 -#, fuzzy msgid "Send _updates to attendees" -msgstr "ପଠାଅ କୁ" +msgstr "ଅଂଶଗ୍ରହଣକାରୀଙ୍କ ପାଖକୁ ଅଦ୍ୟତନଗୁଡ଼ିକୁ ପଠାନ୍ତୁ (_u)" #: ../plugins/itip-formatter/itip-view.c:1140 -#, fuzzy #| msgid "All Instances" msgid "_Apply to all instances" -msgstr "ସମସ୍ତ ଦ୍ରୁଷ୍ଟାନ୍ତ" +msgstr "ସମସ୍ତ ଦ୍ରୁଷ୍ଟାନ୍ତରେ ପ୍ରୟୋଗ କରନ୍ତୁ (_A)" #: ../plugins/itip-formatter/itip-view.c:1149 #, fuzzy @@ -17351,19 +17342,17 @@ msgid "_Inherit reminder" msgstr "ଗୋଟିଏ ସ୍ମାରକପତ୍ର ଦେଖାନ୍ତୁ (_o)" #: ../plugins/itip-formatter/itip-view.c:1914 -#, fuzzy #| msgid "_Memos" msgid "_Memos:" -msgstr "ସ୍ମାରକପତ୍ର (_M)" +msgstr "ସ୍ମାରକପତ୍ର (_M):" #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1 -#, fuzzy msgid "Displays text/calendar parts in messages." -msgstr "ପାଠ୍ଯ କାଲେଣ୍ଡର ଅଂଶ ଇଞ୍ଚ." +msgstr "ପାଠ୍ଯ/କାଲେଣ୍ଡର ଅଂଶବିଶେଷକୁ ସନ୍ଦେଶରେ ଦର୍ଶାନ୍ତୁ।" #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2 msgid "Itip Formatter" -msgstr "" +msgstr "Itip ସଜ୍ଜିକରଣ ଶୈଳୀ" #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1 #, fuzzy @@ -17374,53 +17363,44 @@ msgstr """ କୁ ଯୋଗ କରନ୍ତୁ""?" #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3 msgid "This meeting has been delegated" -msgstr "" +msgstr "ଏହି ସାକ୍ଷାତକାରକୁ ପ୍ରତିନିଧିତ୍ୱ କରାଯାଇଛି" #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4 -#, fuzzy msgid "This response is not from a current attendee. Add the sender as an attendee?" -msgstr "ଅଟେ ନୁହେଁ ଠାରୁ a ମିଶାଅ?" +msgstr "ଏହି ଉତ୍ତରଟି ବର୍ତ୍ତମାନ ଉପସ୍ଥିତ ବ୍ୟକ୍ତିଙ୍କ ପାଖରୁ ନୁହଁ। ପ୍ରେରକଙ୍କୁ ଉପସ୍ଥିତ ବ୍ୟକ୍ତି ଭାବରେ ଯୋଗ କରିବେ କି?" #: ../plugins/mail-account-disable/mail-account-disable.c:46 -#, fuzzy msgid "Proxy _Logout" -msgstr "ପ୍ରକ୍ସି ଲଗଆଉଟ" +msgstr "ପ୍ରକ୍ସି ଲଗଆଉଟ (_L)" #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1 -#, fuzzy msgid "Allows disabling of accounts." -msgstr "ର ଆକାଉଣ୍ଟ ଗୁଡିକ." +msgstr "ଖାତାଗୁଡ଼ିକର ନିଷ୍କ୍ରିୟତାକୁ ଅନୁମତି ଦିଅନ୍ତୁ।" #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2 -#, fuzzy msgid "Disable Account" -msgstr "ନିଷ୍କ୍ରିୟ ହିସାବ ଖାତା" +msgstr "ଖାତାକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1 -#, fuzzy #| msgid "Select sound file" msgid "Beep or play sound file." -msgstr "ଶବ୍ଦ ଫାଇଲକୁ ଚୟନ କରନ୍ତୁ" +msgstr "ଶବ୍ଦ ଫାଇଲକୁ ଦପଦପ କରନ୍ତୁ ଅଥବା ଚଲାନ୍ତୁ। " #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2 -#, fuzzy msgid "Blink icon in notification area." -msgstr "ବ୍ଲିଙ୍କ ଚିତ୍ରସଙ୍କେତ ଇଞ୍ଚ." +msgstr "ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ରରେ ଚିତ୍ରସଙ୍କେତକୁ ଦପଦପ କରନ୍ତୁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3 -#, fuzzy msgid "Enable D-Bus messages." -msgstr "ସକ୍ରିୟ କରନ୍ତୁ D ବସ." +msgstr "D-Bus ସନ୍ଦେଶଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4 -#, fuzzy msgid "Enable icon in notification area." -msgstr "ସକ୍ରିୟ କରନ୍ତୁ ଚିତ୍ରସଙ୍କେତ ଇଞ୍ଚ." +msgstr "ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ରରେ ଚିତ୍ରସଂକେତକୁ ସକ୍ରିୟ କରନ୍ତୁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5 -#, fuzzy msgid "Generates a D-Bus message when new mail messages arrive." -msgstr "a D ବସ ନୂତନ ଡାକ." +msgstr "ନୂତନ ମେଲ ସନ୍ଦେଶ ଆସିବା ସମୟରେ D-Bus ସନ୍ଦେଶ ସୃଷ୍ଟିକରନ୍ତୁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6 #, fuzzy @@ -17430,66 +17410,54 @@ msgid "" msgstr "true ଫାଇଲ ନୂତନ." #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7 -#, fuzzy msgid "Notify new messages for Inbox only." -msgstr "ସୂଚୀତ କରନ୍ତୁ ନୂତନ ପାଇଁ ଇନବକ୍ସ." +msgstr "କେବଳ ଇନବକ୍ସ ପାଇଁ ନୂତନ ସନ୍ଦେଶଗୁଡ଼ିକୁ ସୂଚାନ୍ତୁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8 -#, fuzzy msgid "Play sound when new messages arrive." -msgstr "ବଜାଅ ନୂତନ." +msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ଧ୍ୱନି ଚଲାନ୍ତୁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9 -#, fuzzy msgid "Popup message together with the icon." -msgstr "ପପ-ଅପ ସହିତ ଚିତ୍ରସଙ୍କେତ." +msgstr "ଚିତ୍ରସଙ୍କେତ ସହିତ ପପଅପ ସନ୍ଦେଶ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10 -#, fuzzy msgid "Show new mail icon in notification area when new messages arrive." -msgstr "ଦେଖାଅ ନୂତନ ଡାକ ଚିତ୍ରସଙ୍କେତ ଇଞ୍ଚ ନୂତନ." +msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ରରେ ନୂତନ ମେଲ ଚିତ୍ରସଂକେତକୁ ଦର୍ଶାନ୍ତୁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11 -#, fuzzy #| msgid "No filename provided." msgid "Sound file name to be played." -msgstr "କୌଣସି ଫାଇଲ ନାମ ଦିଆଯାଇ ନାହିଁ।" +msgstr "ଚଲାଇବା ପାଇଁ ଧ୍ୱନି ଫାଇଲ ନାମ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12 -#, fuzzy msgid "Sound file to be played when new messages arrive, if not in beep mode." -msgstr "ଧ୍ବନି ଫାଇଲ କୁ ନୂତନ ନୁହେଁ ଇଞ୍ଚ ମୋଡ." +msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ଚଲାଇବାକୁ ଥିବା ଧ୍ୱନି ଫାଇଲ ନାମ, ଯଦି ଦପଦପ ଅବସ୍ଥାରେ ନାହିଁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13 -#, fuzzy msgid "Whether play sound or beep when new messages arrive." -msgstr "କିମ୍ବା ନୂତନ." +msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ଧ୍ୱନି ଅଥବା ଦପଦପ ଚଲାଇବା ଉଚିତ କି ନୁହଁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14 -#, fuzzy msgid "Whether show message over the icon when new messages arrive." -msgstr "ଚିତ୍ରସଙ୍କେତ ନୂତନ." +msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ଚିତ୍ରସଂକେତ ଉପରେ ସନ୍ଦେଶକୁ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15 -#, fuzzy msgid "Whether the icon should blink or not." -msgstr "ଚିତ୍ରସଙ୍କେତ କିମ୍ବା ନୁହେଁ." +msgstr "ଚିତ୍ରସଙ୍କେତ ଦପଦପ ହେବା ଉଚିତ କି ନୁହଁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16 -#, fuzzy msgid "Whether to notify new messages in Inbox folder only." -msgstr "କୁ ନୂତନ ଇଞ୍ଚ ଇନବକ୍ସ." +msgstr "କେବଳ ଇନବକ୍ସ ଫୋଲଡରରେ ନୂତନ ସନ୍ଦେଶଗୁଡ଼ିକୁ ସୂଚାଇବା ଉଚିତ କି ନୁହଁ।" #: ../plugins/mail-notification/mail-notification.c:256 -#, fuzzy msgid "Generate a _D-Bus message" -msgstr "ସୃଷ୍ଟିକରିବା a D ବସ" +msgstr "D-Bus ସନ୍ଦେଶ ସୃଷ୍ଟି କରୁଅଛି (_D)" #: ../plugins/mail-notification/mail-notification.c:379 -#, fuzzy #| msgid "New Mail Notification" msgid "Evolution's Mail Notification" -msgstr "ନୂତନ ଡାକ ସୂଚନା" +msgstr "Evolution ର ମେଲ ବିଜ୍ଞପ୍ତି" #: ../plugins/mail-notification/mail-notification.c:400 msgid "Mail Notification Properties" @@ -17497,22 +17465,26 @@ msgstr "ମେଲ ବିଜ୍ଞପ୍ତି ଗୁଣଧର୍ମ" #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder #: ../plugins/mail-notification/mail-notification.c:479 -#, fuzzy, c-format +#, c-format msgid "" "You have received %d new message\n" "in %s." msgid_plural "" "You have received %d new messages\n" "in %s." -msgstr[0] "ଆପଣ d ନୂତନ." -msgstr[1] "ଆପଣ d ନୂତନ." +msgstr[0] "" +"ଆପଣ %d ଟି ନୂତନ ସନ୍ଦେଶ\n" +"ଗ୍ରହଣ କରିଛନ୍ତି %s ରେ ।" +msgstr[1] "" +"ଆପଣ %d ଟି ନୂତନ ସନ୍ଦେଶ\n" +"ଗ୍ରହଣ କରିଛନ୍ତି %s ରେ ।" #: ../plugins/mail-notification/mail-notification.c:484 -#, fuzzy, c-format +#, c-format msgid "You have received %d new message." msgid_plural "You have received %d new messages." -msgstr[0] "ଆପଣ d ନୂତନ." -msgstr[1] "ଆପଣ d ନୂତନ." +msgstr[0] "ଆପଣ %d ଟି ନୂତନ ସନ୍ଦେଶ ଗ୍ରହଣ କରିଛନ୍ତି।" +msgstr[1] "ଆପଣ %d ଟି ନୂତନ ସନ୍ଦେଶ ଗ୍ରହଣ କରିଛନ୍ତି।" #: ../plugins/mail-notification/mail-notification.c:501 #: ../plugins/mail-notification/mail-notification.c:506 @@ -17520,9 +17492,8 @@ msgid "New email" msgstr "ନୂତନ ମେଲ" #: ../plugins/mail-notification/mail-notification.c:566 -#, fuzzy msgid "Show icon in _notification area" -msgstr "ଦେଖାଅ ଚିତ୍ରସଙ୍କେତ ଇଞ୍ଚ" +msgstr "ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ରରେ ଚିତ୍ରସଙ୍କେତ ଦର୍ଶାନ୍ତୁ (_n)" #: ../plugins/mail-notification/mail-notification.c:569 #, fuzzy @@ -17548,9 +17519,8 @@ msgid "Play _sound file" msgstr "ଶବ୍ଦ ଫାଇଲକୁ ଚଲାନ୍ତୁ (_s)" #: ../plugins/mail-notification/mail-notification.c:770 -#, fuzzy msgid "Specify _filename:" -msgstr "ଫାଇଲ ନାମ:" +msgstr "ଫାଇଲ ନାମକୁ ଉଲ୍ଲେଖ କରନ୍ତୁ (_f):" #: ../plugins/mail-notification/mail-notification.c:771 msgid "Select sound file" @@ -17603,16 +17573,16 @@ msgid "" msgstr "ଚୟିତ ଉତ୍ସ ଅଟେ ପଢନ୍ତୁ ମନୋନୀତ କର ଅନ୍ଯ ଉତ୍ସ." #: ../plugins/mail-to-task/mail-to-task.c:455 -#, fuzzy, c-format +#, c-format #| msgid "Could not update object" msgid "Could not create object. %s" -msgstr "ବସ୍ତୁକୁ ଅଦ୍ଯତିତ କରିପାରିଲା ନାହିଁ" +msgstr "ବସ୍ତୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ। %s" #: ../plugins/mail-to-task/mail-to-task.c:555 -#, fuzzy, c-format +#, c-format #| msgid "Cannot open source \"{2}\"." msgid "Cannot get source list. %s" -msgstr "ଉତ୍ସ \"{2}\"କୁ ଖୋଲିପାରିବେ ନାହିଁ" +msgstr "ଉତ୍ସ ତାଲିକାକୁ ପ୍ରାପ୍ତ କରିପାରିବେ ନାହିଁ। %s" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1 #, fuzzy @@ -17623,78 +17593,64 @@ msgstr "A ର ଠାରୁ ର a ଡାକ." #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5 -#, fuzzy msgid "Convert to a Mem_o" -msgstr "ସ୍ଥିର ମୂଲ୍ଯଗୁଡି଼କ କୁ ଟାସ୍କ" +msgstr "ଗୋଟିଏ ମେମୋରେ ରୂପାନ୍ତର କରନ୍ତୁ (_o)" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6 -#, fuzzy msgid "Convert to a _Meeting" -msgstr "ସ୍ଥିର ମୂଲ୍ଯଗୁଡି଼କ କୁ" +msgstr "ଗୋଟିଏ ସାକ୍ଷାତକାରରେ ରୂପାନ୍ତର କରନ୍ତୁ (_M)" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7 -#, fuzzy msgid "Convert to a _Task" -msgstr "ସ୍ଥିର ମୂଲ୍ଯଗୁଡି଼କ କୁ ଟାସ୍କ" +msgstr "ଗୋଟିଏ କାର୍ଯ୍ୟକୁ ରୂପାନ୍ତର କରନ୍ତୁ (_T)" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8 -#, fuzzy msgid "Convert to an _Event" -msgstr "ସ୍ଥିର ମୂଲ୍ଯଗୁଡି଼କ କୁ" +msgstr "ଗୋଟିଏ ଘଟଣାକୁ ରୂପାନ୍ତର କରନ୍ତୁ (_E)" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6 -#, fuzzy msgid "Mail to task" -msgstr "ମେଲ କୁ" +msgstr "କାର୍ଯ୍ୟକୁ ମେଲ" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1 -#, fuzzy msgid "Convert the selected message to a new event" -msgstr "ରୂପାନ୍ତର କରନ୍ତୁ ଚୟିତ କୁ a ନୂତନ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶକୁ ଗୋଟିଏ ନୂତନ ଘଟଣାରେ ରୂପାନ୍ତର କରନ୍ତୁ" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2 -#, fuzzy msgid "Convert the selected message to a new meeting" -msgstr "ରୂପାନ୍ତର କରନ୍ତୁ ଚୟିତ କୁ a ନୂତନ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶକୁ ଗୋଟିଏ ନୂତନ ସାକ୍ଷାତକାରରେ ରୂପାନ୍ତର କରନ୍ତୁ" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3 -#, fuzzy msgid "Convert the selected message to a new memo" -msgstr "ରୂପାନ୍ତର କରନ୍ତୁ ଚୟିତ କୁ a ନୂତନ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶକୁ ଗୋଟିଏ ନୂତନ ମେମୋରୋ ରୂପାନ୍ତର କରନ୍ତୁ" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4 -#, fuzzy msgid "Convert the selected message to a new task" -msgstr "ରୂପାନ୍ତର କରନ୍ତୁ ଚୟିତ କୁ a ନୂତନ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶକୁ ଗୋଟିଏ ନୂତନ ତାଲିକାରେ ରୂପାନ୍ତର କରନ୍ତୁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1 -#, fuzzy msgid "Contact list _owner" -msgstr "ସମ୍ପର୍କ ତାଲିକା" +msgstr "ସମ୍ପର୍କ ତାଲିକା ମାଲିକ (_o)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2 -#, fuzzy msgid "Get list _archive" -msgstr "ପ୍ରାପ୍ତ କର ତାଲିକା" +msgstr "ତାଲିକା ଅଭିଲେଖନ ପ୍ରାପ୍ତ କରନ୍ତୁ (_a)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3 -#, fuzzy msgid "Get list _usage information" -msgstr "ପ୍ରାପ୍ତ କର ତାଲିକା" +msgstr "ତାଲିକା ବ୍ୟବହାର ପଦ୍ଧତି ସୂଚନା ପ୍ରାପ୍ତ କରନ୍ତୁ (_u)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4 -#, fuzzy msgid "Mailing List Actions" -msgstr "ତାଲିକା କାର୍ଯ୍ଯ" +msgstr "ମେଲ ତାଲିକା କାର୍ଯ୍ଯ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7 -#, fuzzy msgid "Mailing _List" -msgstr "ତାଲିକା" +msgstr "ମେଲ ତାଲିକା (_L)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6 #, fuzzy @@ -17702,9 +17658,8 @@ msgid "Provide actions for common mailing list commands (subscribe, unsubscribe. msgstr "ପାଇଁ ତାଲିକା." #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7 -#, fuzzy msgid "_Post message to list" -msgstr "ପୋଷ୍ଟ କୁ ତାଲିକା" +msgstr "ତାଲିକାରେ ସନ୍ଦେଶ ପୋଷ୍ଟ କରନ୍ତୁ (_P)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8 #, fuzzy @@ -17717,9 +17672,8 @@ msgid "_Un-subscribe to list" msgstr "କୁ ତାଲିକା" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1 -#, fuzzy msgid "Action not available" -msgstr "କାର୍ୟ୍ଯ ନୁହେଁ ଉପଲବ୍ଧ" +msgstr "କାର୍ଯ୍ୟ ଉପଲବ୍ଧ ନାହିଁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2 #, fuzzy @@ -17732,19 +17686,16 @@ msgid "" msgstr "e ଡାକ କୁ URL ଆପଣ କିମ୍ବା ଏବଂ ପ୍ରଥମ ନାଁ ଠାରୁ ତାଲିକା ପରେ." #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5 -#, fuzzy msgid "Malformed header" -msgstr "ଶୀର୍ଷକ" +msgstr "ତ୍ରୁଟିଯୁକ୍ତ ଶୀର୍ଷକ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6 -#, fuzzy msgid "No e-mail action" -msgstr "ନାଁ e ଡାକ" +msgstr "କୌଣସି ଇ-ମେଲ କାର୍ଯ୍ୟ ନାହିଁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7 -#, fuzzy msgid "Posting not allowed" -msgstr "ନୁହେଁ" +msgstr "ପଠାଇବା ଅନୁମୋଦିତ ନୁହଁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8 #, fuzzy @@ -17754,9 +17705,8 @@ msgid "" msgstr "କୁ ଏହା ତାଲିକା ଅଟେ ନୁହେଁ ଏହା ଅଟେ a ପଢନ୍ତୁ ତାଲିକା ସମ୍ପର୍କ ତାଲିକା ପାଇଁ." #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9 -#, fuzzy msgid "Send e-mail message to mailing list?" -msgstr "ପଠାଅ e ଡାକ କୁ ତାଲିକା?" +msgstr "ମେଲ ତାଲିକାକୁ ଇ-ମେଲ ସନ୍ଦେଶ ପଠାଇବେ କି?" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10 #, fuzzy @@ -17783,29 +17733,24 @@ msgid "" msgstr "ନୁହେଁ ଶୀର୍ଷକ ପାଇଁ ଏହା." #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17 -#, fuzzy msgid "_Edit message" -msgstr "ସମ୍ପାଦନ କରନ୍ତୁ" +msgstr "ସନ୍ଦେଶକୁ ସମ୍ପାଦନ କରନ୍ତୁ (_E)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18 -#, fuzzy msgid "_Send message" -msgstr "ପଠାଅ" +msgstr "ସନ୍ଦେଶ ପଠାନ୍ତୁ (_S)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1 -#, fuzzy msgid "Contact List _Owner" -msgstr "ସମ୍ପର୍କ ତାଲିକା ମାଲିକ" +msgstr "" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2 -#, fuzzy msgid "Contact the owner of the mailing list this message belongs to" msgstr "ସମ୍ପର୍କ ର ତାଲିକା ଏହା କୁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3 -#, fuzzy msgid "Get List _Archive" -msgstr "ପ୍ରାପ୍ତ କର ତାଲିକା" +msgstr "ତାଲିକା ଅଭିଲେଖନ ପ୍ରାପ୍ତ କରନ୍ତୁ (_A)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4 #, fuzzy @@ -17846,9 +17791,8 @@ msgid "_Subscribe to List" msgstr "ସମୂହରେ ପଞ୍ଜିକୃତ କରନ୍ତୁ (_S)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13 -#, fuzzy msgid "_Unsubscribe from List" -msgstr "ଅସ୍ବୀକାରକ୍ତି ଠାରୁ ତାଲିକା" +msgstr "ତାଲିକାରୁ ଅସ୍ବୀକାରକ୍ତି କରନ୍ତୁ (_U)" #: ../plugins/mark-all-read/mark-all-read.c:39 msgid "Also mark messages in subfolders?" @@ -17878,19 +17822,16 @@ msgid "Mark Me_ssages as Read" msgstr "ସନ୍ଦେଶ ମାନଙ୍କୁ ପଢିସାରିଲେ ବୋଲି ଚିହ୍ନିତ କରନ୍ତୁ (_s)" #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3 -#, fuzzy msgid "Used for marking all the messages under a folder as read" -msgstr "ବ୍ଯବହ୍ରୁତ ପାଇଁ ସମସ୍ତ a ପଢନ୍ତୁ" +msgstr "ଗୋଟିଏ ଫୋଲଡର ଅନ୍ତର୍ଗତ ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଠିତ ବୋଲି ଚିହ୍ନଟ କରିବା ପାଇଁ ବ୍ୟବହୃତ ହୋଇଥାଏ" #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1 -#, fuzzy msgid "A plugin which implements mono plugins." -msgstr "A ମୋନୋ." +msgstr "ମନୋ ପ୍ଲଗଇନଗୁଡ଼ିକୁ କାର୍ଯ୍ୟକାରୀ କରୁଥିବା ଗୋଟିଏ ପ୍ଲଗଇନ।" #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2 -#, fuzzy msgid "Mono Loader" -msgstr "ମନୋ" +msgstr "ମନୋ ଧାରଣ କର୍ତ୍ତା" #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1 #, fuzzy @@ -17967,9 +17908,8 @@ msgid "HTML _Mode" msgstr "HTML ଧାରା (_M)" #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1 -#, fuzzy msgid "Evolution Profiler" -msgstr "କ୍ରମବିକାଶ " +msgstr "Evolution ରେଖାଚିତ୍ରଣ" #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2 #, fuzzy @@ -17977,9 +17917,8 @@ msgid "Writes a log of profiling data events." msgstr "a ର ତଥ୍ଯ." #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1 -#, fuzzy msgid "Import Outlook messages from PST file" -msgstr "ଆମଦାନୀ କର ଠାରୁ ଫାଇଲ" +msgstr "Outlook ସନ୍ଦେଶଗୁଡ଼ିକୁ PST ଫାଇଲରୁ ଆମଦାନୀ କରନ୍ତୁ" #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2 msgid "Outlook PST import" @@ -17987,7 +17926,7 @@ msgstr "ଆଉଟଲୁକ PST ଆମଦାନି" #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3 msgid "Outlook personal folders (.pst)" -msgstr "" +msgstr "Outlook ବ୍ୟକ୍ତିଗତ ଫୋଲଡରଗୁଡ଼ିକ (.pst)" #. Address book #: ../plugins/pst-import/pst-importer.c:318 @@ -18005,17 +17944,14 @@ msgid "_Journal entries" msgstr "ପତ୍ରିକା ପ୍ରବିଷ୍ଟି (_J)" #: ../plugins/pst-import/pst-importer.c:352 -#, fuzzy msgid "Importing Outlook data" -msgstr "ଆମଦାନୀକରିବା ତଥ୍ଯ" +msgstr "Outlook ତଥ୍ୟକୁ ଆମଦାନୀ କରୁଅଛି" #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1 -#, fuzzy msgid "Allows calendars to be published to the web" -msgstr "କୁ କୁ" +msgstr "କ୍ୟାଲେଣ୍ଡରକୁ ୱେବରେ ପ୍ରକାଶନ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ" #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2 -#, fuzzy msgid "Calendar Publishing" msgstr "କ୍ଯାଲେଣ୍ଡର ପ୍ରକାଶନ କରୁଅଛି" @@ -18024,88 +17960,81 @@ msgid "Locations" msgstr "ଅବସ୍ଥାନ" #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1 -#, fuzzy msgid "_Publish Calendar Information" -msgstr "କ୍ଯାଲେଣ୍ଡର ସୂଚନା" +msgstr "କ୍ଯାଲେଣ୍ଡର ସୂଚନା ପ୍ରକାଶନ କରନ୍ତୁ (_P)" #: ../plugins/publish-calendar/publish-calendar.c:95 #: ../plugins/publish-calendar/publish-calendar.c:329 -#, fuzzy, c-format +#, c-format #| msgid "Could not open source" msgid "Could not open %s:" -msgstr "ଉତ୍ସକୁ ଖୋଲିପାରିଲା ନାହିଁ" +msgstr "%s କୁ ଖୋଲିହେଲା ନାହିଁ:" #: ../plugins/publish-calendar/publish-calendar.c:97 -#, fuzzy, c-format +#, c-format #| msgid "Could not parse PGP message: Unknown error" msgid "Could not open %s: Unknown error" -msgstr "PGP ସନ୍ଦେଶକୁ ବିଶ୍ଳେଷଣ କରିହେଲା ନାହିଁ: ଅଜଣା ତୃଟି" +msgstr "%s କୁ ଖୋଲିହେଲା ନାହିଁ: ଅଜଣା ତ୍ରୁଟି" #: ../plugins/publish-calendar/publish-calendar.c:117 #, c-format msgid "There was an error while publishing to %s:" -msgstr "" +msgstr "%s ରେ ପ୍ରକାଶନ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ଘଟିଛି:" #: ../plugins/publish-calendar/publish-calendar.c:119 #, c-format msgid "Publishing to %s finished successfully" -msgstr "" +msgstr "%s କୁ ପ୍ରକାଶନ ସଫଳତାର ସହିତ ସମାପ୍ତ ହୋଇଛି" #: ../plugins/publish-calendar/publish-calendar.c:160 #, c-format msgid "Mount of %s failed:" -msgstr "" +msgstr "%s ର ସ୍ଥାପନା ବିଫଳ ହୋଇଛି:" #: ../plugins/publish-calendar/publish-calendar.c:612 msgid "Are you sure you want to remove this location?" msgstr "ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ଏହି ଅବସ୍ଥାନକୁ ଅପସାରଣ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?" #: ../plugins/publish-calendar/publish-calendar.c:776 -#, fuzzy #| msgid "Could not create message." msgid "Could not create publish thread." -msgstr "ସନ୍ଦେଶ ସୃଷ୍ଟି କରିହେଲା ନାହିଁ।" +msgstr "ପ୍ରକାଶନ ଥ୍ରେଡ ସୃଷ୍ଟି କରିହେଲା ନାହିଁ।" #: ../plugins/publish-calendar/publish-calendar.glade.h:2 -#, fuzzy msgid "<span weight=\"bold\">Location</span>" -msgstr "<span weight=\"bold\"> ଅବସ୍ଥାନ</span>" +msgstr "<span weight=\"bold\">ଅବସ୍ଥାନ</span>" #: ../plugins/publish-calendar/publish-calendar.glade.h:4 -#, fuzzy msgid "<span weight=\"bold\">Sources</span>" -msgstr "<span weight=\"bold\"> ଉତ୍ସ</span>" +msgstr "<span weight=\"bold\">ଉତ୍ସଗୁଡ଼ିକ</span>" #: ../plugins/publish-calendar/publish-calendar.glade.h:6 -#, fuzzy msgid "" "Daily\n" "Weekly\n" "Manual (via Actions menu)" -msgstr "ପ୍ରତିଦିନ କାର୍ଯ୍ଯ ମେନୁ" +msgstr "" +"ପ୍ରତିଦିନ\n" +"ପ୍ରତି ସପ୍ତାହ\n" +"ହସ୍ତକୃତ (କାର୍ଯ୍ୟ ତାଲିକା ମାଧ୍ଯମରେ)" #: ../plugins/publish-calendar/publish-calendar.glade.h:9 -#, fuzzy msgid "E_nable" -msgstr "E" +msgstr "ସକ୍ରିୟ କରନ୍ତୁ (_n)" #: ../plugins/publish-calendar/publish-calendar.glade.h:10 -#, fuzzy msgid "P_ort:" -msgstr "P:" +msgstr "ସଂଯୋଗିକୀ (_o):" #: ../plugins/publish-calendar/publish-calendar.glade.h:11 -#, fuzzy msgid "Publishing Location" -msgstr "ପ୍ରକାଶନ କରୁଅଛି ଅବସ୍ଥାନ" +msgstr "ଅବସ୍ଥାନ ପ୍ରକାଶନ କରୁଅଛି" #: ../plugins/publish-calendar/publish-calendar.glade.h:12 -#, fuzzy msgid "Publishing _Frequency:" -msgstr "ପ୍ରକାଶନ କରୁଅଛି ବାରମ୍ବାରତା:" +msgstr "ବାରମ୍ବାରତା ପ୍ରକାଶନ କରୁଅଛି (_F):" #: ../plugins/publish-calendar/publish-calendar.glade.h:13 -#, fuzzy msgid "" "Secure FTP (SSH)\n" "Public FTP\n" @@ -18114,17 +18043,23 @@ msgid "" "WebDAV (HTTP)\n" "Secure WebDAV (HTTPS)\n" "Custom Location" -msgstr "FTP SSH FTP ସହିତ HTTP HTTPS ଅବସ୍ଥାନ" +msgstr "" +"ସୁରକ୍ଷିତ FTP (SSH)\n" +"ସାର୍ବଜନିକ FTP\n" +"FTP (ଲଗଇନ ସହିତ)\n" +"ୱିଣ୍ଡୋର ସହଭାଗ\n" +"WebDAV (HTTP)\n" +"ସୁରକ୍ଷିତ WebDAV (HTTPS)\n" +"ଇଚ୍ଛାମୁତାବକ ଅବସ୍ଥାନ" #: ../plugins/publish-calendar/publish-calendar.glade.h:20 msgid "Service _type:" msgstr "ସେବାର ପ୍ରକାର (_t):" #: ../plugins/publish-calendar/publish-calendar.glade.h:21 -#, fuzzy #| msgid "Time _zone:" msgid "Time _duration:" -msgstr "ସମୟ ମଣ୍ଡଳ (_z):" +msgstr "ସମୟ ଅବଧି (_d):" #: ../plugins/publish-calendar/publish-calendar.glade.h:23 msgid "_File:" @@ -18136,7 +18071,7 @@ msgstr "ପ୍ରବେଶ ସଂଙ୍କେତ (_P):" #: ../plugins/publish-calendar/publish-calendar.glade.h:25 msgid "_Publish as:" -msgstr "" +msgstr "ଭାବରେ ପ୍ରକାଶିତ (_P):" #: ../plugins/publish-calendar/publish-calendar.glade.h:26 msgid "_Remember password" @@ -18152,6 +18087,9 @@ msgid "" "weeks\n" "months" msgstr "" +"ଦିନ\n" +"ସପ୍ତାହ\n" +"ମାସ" #: ../plugins/publish-calendar/publish-calendar.glade.h:32 msgid "" @@ -18165,7 +18103,7 @@ msgstr "" #: ../plugins/publish-calendar/publish-format-ical.c:82 #, c-format msgid "Could not publish calendar: Calendar backend no longer exists" -msgstr "" +msgstr "କ୍ୟାଲେଣ୍ଡର ପ୍ରକାଶନ କରିହେଲା ନାହିଁ: କ୍ୟାଲେଣ୍ଡର ପୃଷ୍ଠଭୂମି ଏବେ ଅବସ୍ଥିତ ନାହିଁ" #: ../plugins/publish-calendar/url-editor-dialog.c:480 msgid "New Location" @@ -18180,39 +18118,33 @@ msgid "Hello Python" msgstr "Hello Python" #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2 -#, fuzzy msgid "Python Plugin Loader tests" -msgstr "Python ପ୍ଲଗ-ଇନ" +msgstr "Python ପ୍ଲଗଇନ ଧାରଣକର୍ତ୍ତା ପରୀକ୍ଷଣ" #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1 -#, fuzzy msgid "Python Test Plugin" -msgstr "Python ପରୀକ୍ଷଣ ପ୍ଲଗ-ଇନ" +msgstr "Python ପରୀକ୍ଷଣ ପ୍ଲଗଇନ" #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2 -#, fuzzy msgid "Test Plugin for Python EPlugin loader." -msgstr "ପରୀକ୍ଷଣ ପ୍ଲଗ-ଇନ ପାଇଁ Python." +msgstr "Python EPlugin ଧାରଣକର୍ତ୍ତା ପାଇଁ ପରୀକ୍ଷଣ ପ୍ଲଗଇନ।" #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1 -#, fuzzy msgid "A plugin which loads other plugins written using Python." -msgstr "A ଅନ୍ଯ Python." +msgstr "Python ବ୍ୟବହାର କରି ଲିଖିତ ଅନ୍ୟାନ୍ୟ ପ୍ଲଗଇନଗୁଡ଼ିକୁ ଧାରଣ କରୁଥିବା ଗୋଟିଏ ପ୍ଲଗଇନ।" #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2 -#, fuzzy msgid "Python Loader" -msgstr "Python" +msgstr "Python ଧାରଣକର୍ତ୍ତା" #: ../plugins/sa-junk-plugin/em-junk-filter.c:111 -#, fuzzy msgid "SpamAssassin (built-in)" -msgstr "ଇଞ୍ଚ" +msgstr "SpamAssassin (ସୁନିର୍ମିତ)" #: ../plugins/sa-junk-plugin/em-junk-filter.c:137 -#, fuzzy, c-format +#, c-format msgid "SpamAssassin not found, code: %d" -msgstr "ନୁହେଁ ମିଳିଛି d" +msgstr "SpamAssassin ମିଳୁନାହିଁ, ସଂକେତ: %d" #: ../plugins/sa-junk-plugin/em-junk-filter.c:145 #: ../plugins/sa-junk-plugin/em-junk-filter.c:153 @@ -18221,24 +18153,24 @@ msgid "Failed to create pipe: %s" msgstr "ପାଇପ ନିର୍ମାଣ କରିବାରେ ବିଫଳ: %s" #: ../plugins/sa-junk-plugin/em-junk-filter.c:192 -#, fuzzy, c-format +#, c-format msgid "Error after fork: %s" -msgstr "ତ୍ରୁଟି ପରେ" +msgstr "ବିଭାଜନ ପରେ ତ୍ରୁଟି: %s" #: ../plugins/sa-junk-plugin/em-junk-filter.c:247 -#, fuzzy, c-format +#, c-format msgid "SpamAssassin child process does not respond, killing..." -msgstr "ନିର୍ଭରକ ନୁହେଁ." +msgstr "SpamAssassin ନିମ୍ନସ୍ତର ପଦ୍ଧତି ଉତ୍ତର ଦେଉନାହିଁ, ବନ୍ଦ କରୁଅଛି..." #: ../plugins/sa-junk-plugin/em-junk-filter.c:249 -#, fuzzy, c-format +#, c-format msgid "Wait for SpamAssassin child process interrupted, terminating..." -msgstr "ପାଇଁ ନିର୍ଭରକ." +msgstr "SpamAssassin ନିମ୍ନସ୍ତର ପଦ୍ଧତି ବାଧାପ୍ରାପ୍ତ ପାଇଁ ଅପେକ୍ଷା କରନ୍ତୁ, ସମାପ୍ତ କରୁଅଛି..." #: ../plugins/sa-junk-plugin/em-junk-filter.c:258 -#, fuzzy, c-format +#, c-format msgid "Pipe to SpamAssassin failed, error code: %d" -msgstr "କୁ ତୃଟି d" +msgstr "SpamAssassin କୁ ପାଇପ ବିଫଳ ହୋଇଛି, ତ୍ରୁଟି ସଂକେତ: %d" #: ../plugins/sa-junk-plugin/em-junk-filter.c:521 #, c-format @@ -18247,12 +18179,11 @@ msgstr "SpamAssassin ଉପଲବ୍ଧ ନାହିଁ।" #: ../plugins/sa-junk-plugin/em-junk-filter.c:913 msgid "This will make SpamAssassin more reliable, but slower" -msgstr "" +msgstr "ଏହା SpamAssassin କୁ ଅଧିକ ଭରସାଯୋଗ୍ୟ କରିଥାଏ, କିନ୍ତୁ ମନ୍ଥର" #: ../plugins/sa-junk-plugin/em-junk-filter.c:919 -#, fuzzy msgid "I_nclude remote tests" -msgstr "ପ୍ରଥମ" +msgstr "ସୂଦୂର ପରୀକ୍ଷଣକୁ ଅନ୍ତର୍ଭୁକ୍ତ କରନ୍ତୁ (_n)" #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1 #, fuzzy @@ -18262,13 +18193,12 @@ msgid "" msgstr "ଫିଲ୍ଟରଗୁଡିକ କୁ." #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2 -#, fuzzy msgid "SpamAssassin Options" -msgstr "ବିକଳ୍ପଗୁଡିକ" +msgstr "SpamAssassin ବିକଳ୍ପଗୁଡିକ" #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3 msgid "SpamAssassin junk plugin" -msgstr "" +msgstr "SpamAssassin ଜଙ୍କ ପ୍ଲଗଇନ" #. #. * Translator: the %F %T is the thirth argument for a strftime function. @@ -18280,25 +18210,21 @@ msgstr "%F %T" #: ../plugins/save-calendar/csv-format.c:361 msgid "UID" -msgstr "" +msgstr "UID" #: ../plugins/save-calendar/csv-format.c:363 -#, fuzzy msgid "Description List" msgstr "ବର୍ଣ୍ଣନା ତାଲିକା" #: ../plugins/save-calendar/csv-format.c:364 -#, fuzzy msgid "Categories List" msgstr "ବିଭାଗ ତାଲିକା" #: ../plugins/save-calendar/csv-format.c:365 -#, fuzzy msgid "Comment List" msgstr "ମନ୍ତବ୍ଯ ତାଲିକା" #: ../plugins/save-calendar/csv-format.c:368 -#, fuzzy msgid "Contact List" msgstr "ସମ୍ପର୍କ ତାଲିକା" @@ -18311,7 +18237,6 @@ msgid "End" msgstr "ସମାପ୍ତ" #: ../plugins/save-calendar/csv-format.c:372 -#, fuzzy msgid "percent Done" msgstr "ପ୍ରତିଶତ ସମ୍ପୂର୍ଣ୍ଣ" @@ -18320,58 +18245,48 @@ msgid "URL" msgstr "ୟୁ.ଆର.ଏଲ." #: ../plugins/save-calendar/csv-format.c:375 -#, fuzzy msgid "Attendees List" -msgstr "ଆଟେଣ୍ଡିସ ତାଲିକା" +msgstr "ଉପସ୍ଥିତ ବ୍ୟକ୍ତିମାନଙ୍କର ତାଲିକା" #: ../plugins/save-calendar/csv-format.c:377 msgid "Modified" msgstr "ପରିବର୍ତ୍ତିତ" #: ../plugins/save-calendar/csv-format.c:532 -#, fuzzy msgid "Advanced options for the CSV format" -msgstr "ଉନ୍ନତ ବିକଳ୍ପ ମାନ ପାଇଁ" +msgstr "CSV ଶୈଳୀ ପାଇଁ ଉନ୍ନତ ବିକଳ୍ପମାନ" #: ../plugins/save-calendar/csv-format.c:539 -#, fuzzy msgid "Prepend a header" -msgstr "a ଶୀର୍ଷକ" +msgstr "ଗୋଟିଏ ଶୀର୍ଷକକୁ ପୂର୍ବରୁ ଅଟକାନ୍ତୁ" #: ../plugins/save-calendar/csv-format.c:548 -#, fuzzy msgid "Value delimiter:" -msgstr "ମୂଲ୍ଯ:" +msgstr "ମୂଲ୍ଯ ପରିସୀମକ:" #: ../plugins/save-calendar/csv-format.c:554 -#, fuzzy msgid "Record delimiter:" -msgstr "ଅଭିଲେଖ:" +msgstr "ପରିସୀମକକୁ ଲିପିବଦ୍ଧ କରନ୍ତୁ:" #: ../plugins/save-calendar/csv-format.c:560 -#, fuzzy msgid "Encapsulate values with:" -msgstr "ସହିତ :" +msgstr "ମୂଲ୍ୟଗୁଡ଼ିକୁ ଏହା ସହିତ ସମ୍ପୂଟିତ କରନ୍ତୁ:" #: ../plugins/save-calendar/csv-format.c:582 -#, fuzzy msgid "Comma separated value format (.csv)" -msgstr "କମା ମୂଲ୍ଯ" +msgstr "କମା ଦ୍ୱାରା ପୃଥକ ହୋଇଥିବା ମୂଲ୍ୟର ଶୈଳୀ (.csv)" #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1 -#, fuzzy msgid "Save Selected" -msgstr "ସଂରକ୍ଷଣ କରନ୍ତୁ ଚୟିତ" +msgstr "ବଚ୍ଛିତକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2 -#, fuzzy msgid "Saves selected calendar or tasks list to disk." -msgstr "ଚୟିତ କାଲେଣ୍ଡର କିମ୍ବା ତାଲିକା କୁ." +msgstr "ଚୟିତ କାଲେଣ୍ଡର କିମ୍ବା କାର୍ଯ୍ୟ ତାଲିକାକୁ ଡିସ୍କରେ ସଂରକ୍ଷଣ କରିଥାଏ।" #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3 -#, fuzzy msgid "_Save to Disk" -msgstr "ସଂରକ୍ଷଣ କରନ୍ତୁ କୁ ଡିସ୍କ" +msgstr "ଡିସ୍କରେ ସଂରକ୍ଷଣ କରନ୍ତୁ (_S)" #. #. * Translator: the %FT%T is the thirth argument for a strftime function. @@ -18379,57 +18294,48 @@ msgstr "ସଂରକ୍ଷଣ କରନ୍ତୁ କୁ ଡିସ୍କ" #. * Also check out http://www.w3.org/2002/12/cal/tzd #. * #: ../plugins/save-calendar/rdf-format.c:150 -#, fuzzy msgid "%FT%T" -msgstr "T" +msgstr "%FT%T" #: ../plugins/save-calendar/rdf-format.c:377 msgid "RDF format (.rdf)" -msgstr "" +msgstr "RDF ଶୈଳୀ (.rdf)" #: ../plugins/save-calendar/save-calendar.c:161 -#, fuzzy msgid "Select destination file" -msgstr "ମନୋନୀତ କର ଫାଇଲ" +msgstr "ଲକ୍ଷ୍ଯ ସ୍ଥଳ ଫାଇଲ ମନୋନୀତ କରନ୍ତୁ" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1 -#, fuzzy msgid "Select one source" -msgstr "ମନୋନୀତ କର ଉତ୍ସ" +msgstr "ଗୋଟିଏ ଉତ୍ସ ମନୋନୀତ କରନ୍ତୁ" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2 -#, fuzzy msgid "Selects a single calendar or task source for viewing." -msgstr "a କାଲେଣ୍ଡର କିମ୍ବା ଉତ୍ସ ପାଇଁ." +msgstr "ଦେଖିବା ପାଇଁ ଗୋଟିଏ କ୍ୟାଲେଣ୍ଡର କିମ୍ବା କାର୍ଯ୍ୟ ଉତ୍ସ ବାଛନ୍ତୁ।" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3 -#, fuzzy msgid "Show _only this Calendar" -msgstr "ଦେଖାଅ ଏହା କ୍ଯାଲେଣ୍ଡର" +msgstr "କେବଳ ଏହି କ୍ଯାଲେଣ୍ଡରକୁ ଦର୍ଶାନ୍ତୁ (_o)" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4 -#, fuzzy msgid "Show _only this Memo List" -msgstr "ଦେଖାଅ ଏହା ସ୍ମାରକପତ୍ର ତାଲିକା" +msgstr "କେବଳ ଏହି ସ୍ମାରକପତ୍ର ତାଲିକାକୁ ଦର୍ଶାନ୍ତୁ (_o)" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5 -#, fuzzy msgid "Show _only this Task List" -msgstr "ଦେଖାଅ ଏହା ଟାସ୍କ ତାଲିକା" +msgstr "କେବଳ ଏହି କାର୍ଯ୍ୟ ତାଲିକାକୁ ଦର୍ଶାନ୍ତୁ (_o)" #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1 -#, fuzzy msgid "Guides you through your initial account setup." -msgstr "ଗାଇଡଗୁଡିକ ବ୍ଯବସ୍ଥା." +msgstr "ଆପଣଙ୍କର ପ୍ରାରମ୍ଭିକ ଖାତା ବିନ୍ୟାସ ମଧ୍ଯ ଦେଇ ପଥପ୍ରଦର୍ଶନ କରିଥାଏ।" #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2 msgid "Setup Assistant" msgstr "ବିନ୍ୟାସ ସହାୟକ" #: ../plugins/startup-wizard/startup-wizard.c:84 -#, fuzzy msgid "Evolution Setup Assistant" -msgstr "କ୍ରମବିକାଶ ସେଟଅପ ସହକାରୀ" +msgstr "Evolution ବିନ୍ୟାସ ସହକାରୀ" #: ../plugins/startup-wizard/startup-wizard.c:87 msgid "Welcome" @@ -18452,21 +18358,20 @@ msgstr "ଫାଇଲଗୁଡ଼ିକୁ ଆମଦାନି କରୁଅଛି" #: ../plugins/startup-wizard/startup-wizard.c:117 #: ../shell/e-shell-importer.c:138 -#, fuzzy msgid "Please select the information that you would like to import:" -msgstr "ଦୟାକରି ମନୋନୀତ କର ସଦୃଶ କୁ:" +msgstr "ଆପଣ ଆମଦାନୀ କରିବାକୁ ଚାହୁଁଥିବା ସୂଚନାକୁ ଦୟାକରି ମନୋନୀତ କରନ୍ତୁ:" #: ../plugins/startup-wizard/startup-wizard.c:132 #: ../shell/e-shell-importer.c:420 -#, fuzzy, c-format +#, c-format msgid "From %s:" -msgstr "ଠାରୁ:" +msgstr "%s ଠାରୁ:" #: ../plugins/startup-wizard/startup-wizard.c:203 #: ../shell/e-shell-importer.c:530 -#, fuzzy, c-format +#, c-format msgid "Importing data." -msgstr "ଆମଦାନୀକରିବା ତଥ୍ଯ." +msgstr "ତଥ୍ଯ ଆମଦାନୀ କରୁଅଛି।" #: ../plugins/startup-wizard/startup-wizard.c:205 #: ../shell/e-shell-importer.c:544 @@ -18474,32 +18379,29 @@ msgid "Please wait" msgstr "ଦଯାକରି ଅପେକ୍ଷାକର" #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1 -#, fuzzy msgid "Indicates if threading of messages should fall back to subject." -msgstr "ର ପଛକୁ କୁ." +msgstr "ଯଦି ସନ୍ଦେଶଗୁଡ଼ିକର ବନ୍ଧନ ବିଷୟ ଅନୁସାରେ ପଡ଼ିଥାଏ ତେବେ ସୂଚାନ୍ତୁ।" #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2 -#, fuzzy msgid "Subject Threading" -msgstr "ବିଷଯ" +msgstr "ବିଷୟ ବନ୍ଧନ" #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3 -#, fuzzy msgid "Thread messages by subject" -msgstr "ସୁତା ଦ୍ବାରା" +msgstr "ସନ୍ଦେଶଗୁଡ଼ିକୁ ବିଷୟ ଅନୁସାରେ ବାନ୍ଧନ୍ତୁ" #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog #: ../plugins/subject-thread/subject-thread.c:56 -#, fuzzy msgid "F_all back to threading messages by subject" -msgstr "F ସମସ୍ତ ପଛକୁ କୁ ଦ୍ବାରା" +msgstr "ସନ୍ଦେଶଗୁଡ଼ିକୁ ବିଷୟ ଅନୁସାରେ ବାନ୍ଧିବାରେ ପଛକୁ ପଡ଼ିବା (_a)" #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1 -#, fuzzy msgid "" "List of keyword/value pairs for the Templates plugin to substitute in a " "message body." -msgstr "ତାଲିକା ର ସୂଚକ ଶବ୍ଦ ମୂଲ୍ଯ ପାଇଁ ନମୁନାଗୁଡିକ କୁ ଇଞ୍ଚ a." +msgstr "" +"ଗୋଟିଏ ସନ୍ଦେଶ ଭିତରେ ନମୁନା ପ୍ଲଗଇନକୁ ବଦଳାଇବା ପାଇଁ ସୂଚକ " +"ଶବ୍ଦ/ମୂଲ୍ୟର ତାଲିକା।" #: ../plugins/templates/templates.c:603 msgid "No title" @@ -18515,21 +18417,19 @@ msgstr "ନମୁନା ପରି ସଂରକ୍ଷଣ କରନ୍ତୁ" #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1 msgid "Drafts based template plugin" -msgstr "" +msgstr "ଡ୍ରାଫ୍ଟ ଆଧାରିତ ନମୁନା ପ୍ଲଗଇନ" #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1 -#, fuzzy msgid "A simple plugin which uses yTNEF to decode TNEF attachments." -msgstr "A ସରଳ କୁ." +msgstr "TNEF ସଂଲଗ୍ନକକୁ ସାଙ୍କେତିକରଣ କରିବା ପାଇଁ ବ୍ୟବହୃତ ସରଳ ପ୍ଲଗଇନ ଯାହାକି yTNEF କୁ ବ୍ୟବହାର କରିଥାଏ।" #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2 msgid "TNEF Attachment decoder" msgstr "TNEF ସଂଲଗ୍ନ ସାଙ୍କେତିକରଣ" #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1 -#, fuzzy msgid "A plugin to setup WebDAV contacts." -msgstr "A କୁ ବ୍ଯବସ୍ଥା." +msgstr "WebDAV ସମ୍ପର୍କଗୁଡ଼ିକୁ ବିନ୍ୟାସ କରିବା ପାଇଁ ଗୋଟିଏ ପ୍ଲଗଇନ।" #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2 msgid "WebDAV contacts" @@ -18537,36 +18437,31 @@ msgstr "WebDAV ସମ୍ପର୍କ" #: ../plugins/webdav-account-setup/webdav-contacts-source.c:68 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: ../plugins/webdav-account-setup/webdav-contacts-source.c:296 msgid "URL:" msgstr "URL:" #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323 -#, fuzzy msgid "_Avoid IfMatch (needed on Apache < 2.2.8)" -msgstr "ରେ" +msgstr "IfMatch କୁ ଏଡ଼ାଇଦିଅନ୍ତୁ (Apache < 2.2.8ରେ ଆବଶ୍ୟକ ହୋଇଥାଏ) (_A)" #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1 -#, fuzzy msgid "Evolution Shell" -msgstr "କ୍ରମବିକାଶ ସେଲ" +msgstr "Evolution ସେଲ" #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2 -#, fuzzy msgid "Evolution Shell Config factory" -msgstr "କ୍ରମବିକାଶ ସେଲ" +msgstr "Evolution ସେଲ Config କାରଖାନା" #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1 -#, fuzzy msgid "Evolution Test" -msgstr "କ୍ରମବିକାଶ ପରୀକ୍ଷଣ" +msgstr "Evolution ପରୀକ୍ଷଣ" #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2 -#, fuzzy msgid "Evolution Test component" -msgstr "କ୍ରମବିକାଶ ପରୀକ୍ଷଣ" +msgstr "Evolution ପରୀକ୍ଷଣ ଉପାଦାନ" #: ../shell/apps_evolution_shell.schemas.in.h:1 msgid "Authenticate proxy server connections" @@ -18577,34 +18472,28 @@ msgid "Automatic proxy configuration URL" msgstr "ସ୍ୱୟଂଚାଳିତ ପ୍ରକ୍ସି ବିନ୍ୟାସ URL" #: ../shell/apps_evolution_shell.schemas.in.h:3 -#, fuzzy msgid "Configuration version" -msgstr "କନଫିଗରେସନ" +msgstr "ବିନ୍ୟାସ ସଂସ୍କରଣ" #: ../shell/apps_evolution_shell.schemas.in.h:4 -#, fuzzy msgid "Default sidebar width" -msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଓସାର" +msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ପାର୍ଶ୍ୱପଟି ଓସାର" #: ../shell/apps_evolution_shell.schemas.in.h:5 -#, fuzzy msgid "Default window height" msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ୱିଣ୍ଡୋ ଉଚ୍ଚତା" #: ../shell/apps_evolution_shell.schemas.in.h:6 -#, fuzzy msgid "Default window state" -msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ୱିଣ୍ଡୋ" +msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ୱିଣ୍ଡୋ ସ୍ଥିତି" #: ../shell/apps_evolution_shell.schemas.in.h:7 -#, fuzzy msgid "Default window width" msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ୱିଣ୍ଡୋ ଓସାର" #: ../shell/apps_evolution_shell.schemas.in.h:8 -#, fuzzy msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet." -msgstr "HTTP HTTP ଇଣ୍ଟରନେଟ." +msgstr "ଇଣ୍ଟରନେଟ ଉପରେ HTTP/ସୁରକ୍ଷିତ HTTP କୁ ଅଭିଗମ୍ୟ କରିବା ସମୟରେ ପ୍ରକ୍ସି ବିନ୍ୟାସକୁ ସକ୍ରିୟ କରନ୍ତୁ।" #: ../shell/apps_evolution_shell.schemas.in.h:9 msgid "HTTP proxy host name" @@ -18623,9 +18512,8 @@ msgid "HTTP proxy username" msgstr "ଏଚ୍.ଟି.ଟି.ପି. ଛାୟା ଚାଳକନାମ" #: ../shell/apps_evolution_shell.schemas.in.h:13 -#, fuzzy msgid "ID or alias of the component to be shown by default at start-up." -msgstr "ID କିମ୍ବା ର କୁ ଦ୍ବାରା ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଏଠାରେ ଆରମ୍ଭ ଉପର." +msgstr "ଆରମ୍ଭ ସମୟରେ ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଭାବରେ ଦର୍ଶାଇବାକୁ ଥିବା ଉପାଦାନର ID କିମ୍ବା ଉପନାମ।" #: ../shell/apps_evolution_shell.schemas.in.h:14 #, fuzzy @@ -18639,36 +18527,34 @@ msgstr "" "ଗୁପ୍ତଶବ୍ଦ ଅଟେ ଠାରୁ କିମ୍ବା କ୍ରମବିକାଶ ଗୁପ୍ତଶବ୍ଦ ଫାଇଲ." #: ../shell/apps_evolution_shell.schemas.in.h:15 -#, fuzzy #| msgid "Insert Attachment" msgid "Initial attachment view" -msgstr "ସଂଲଗ୍ନ ଭର୍ତ୍ତି କରନ୍ତୁ" +msgstr "ପ୍ରାରମ୍ଭିକ ସଂଲଗ୍ନକ ଦୃଶ୍ୟ" #: ../shell/apps_evolution_shell.schemas.in.h:16 -#, fuzzy #| msgid "Install the shared folder" msgid "Initial file chooser folder" -msgstr "ସହଭାଗୀ ଫୋଲଡରକୁ ସ୍ଥାପନ କରନ୍ତୁ" +msgstr "ପ୍ରାରମ୍ଭିକ ଫାଇଲ ଚୟନକାରୀ ଫୋଲଡର" #: ../shell/apps_evolution_shell.schemas.in.h:17 msgid "Initial folder for GtkFileChooser dialogs." -msgstr "" +msgstr "GtkFileChooser ସଂଳାପଗୁଡ଼ିକ ପାଇଁ ପ୍ରାରମ୍ଭିକ ଫୋଲଡର।" #: ../shell/apps_evolution_shell.schemas.in.h:18 msgid "" "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List " "View." msgstr "" +"ସଂଲଗ୍ନକ ପଟି ୱିଜେଟ ପାଇଁ ପ୍ରାରମ୍ଭିକ ଦୃଶ୍ୟ। \"0\" ଟି ହେଉଛି ଚିତ୍ରସଂକେତ ଦୃଶ୍ୟ, \"1\" ଟି ହେଉଛି " +"ତାଲିକା ଦୃଶ୍ୟ।" #: ../shell/apps_evolution_shell.schemas.in.h:19 -#, fuzzy msgid "Last upgraded configuration version" -msgstr "ଶେଷ ବିନ୍ଯାସ" +msgstr "ଶେଷରେ ବିନ୍ଯାସିତ ସଂରଚନା ସଂସ୍କରଣ" #: ../shell/apps_evolution_shell.schemas.in.h:20 -#, fuzzy msgid "List of paths for the folders to be synchronized to disk for offline usage" -msgstr "ତାଲିକା ର ପାଇଁ କୁ କୁ ପାଇଁ ଅଫ ଲାଇନ" +msgstr "ଅଫଲାଇନ ବ୍ୟବହାର ପାଇଁ ଫୋଲଡରଗୁଡ଼ିକର ପଥର ତାଲିକାକୁ ଡିସ୍କ ସହିତ ସମକାଳୀନ କରାଯାଇଥାଏ" #: ../shell/apps_evolution_shell.schemas.in.h:21 msgid "Non-proxy hosts" @@ -18708,24 +18594,20 @@ msgid "" msgstr "ମନୋନୀତ କର ବିନ୍ଯାସ ମୋଡ ଏବଂ ତନ୍ତ୍ର ନାଁ ମେନ୍ଯୁଆଲ ବିନ୍ଯାସ ଏବଂ ବିନ୍ଯାସ ଇଞ୍ଚ." #: ../shell/apps_evolution_shell.schemas.in.h:29 -#, fuzzy msgid "Sidebar is visible" -msgstr "ଅଟେ ଦୃଶ୍ୟମାନ" +msgstr "ପାର୍ଶ୍ୱପଟିଟି ଦୃଶ୍ୟମାନ ଅଟେ" #: ../shell/apps_evolution_shell.schemas.in.h:30 -#, fuzzy msgid "Skip development warning dialog" -msgstr "ଛାଡି ଦିଅନ୍ତୁ ଚେତାବନୀ ସଂଳାପ" +msgstr "ବିକାଶ ଚେତାବନୀ ସଂଳାପକୁ ଏଡ଼ାଇଦିଅନ୍ତୁ" #: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:483 -#, fuzzy msgid "Start in offline mode" -msgstr "ଆରମ୍ଭ ଇଞ୍ଚ ଅଫ ଲାଇନ ମୋଡ" +msgstr "ଅଫ ଲାଇନ ଧାରାରେ ଆରମ୍ଭ କରନ୍ତୁ" #: ../shell/apps_evolution_shell.schemas.in.h:32 -#, fuzzy msgid "Statusbar is visible" -msgstr "ସ୍ଥିତିବାର୍ ଅଟେ ଦୃଶ୍ୟମାନ" +msgstr "ସ୍ଥିତିପଟିଟି ଦୃଶ୍ୟମାନ ଅଟେ" #: ../shell/apps_evolution_shell.schemas.in.h:33 #, fuzzy @@ -18735,19 +18617,16 @@ msgid "" msgstr "ବିନ୍ଯାସ ର କ୍ରମବିକାଶ ସହିତ ବିନ୍ଯାସ ସ୍ତର ପାଇଁ." #: ../shell/apps_evolution_shell.schemas.in.h:34 -#, fuzzy msgid "The default height for the main window, in pixels." -msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଉଚ୍ଚତା ପାଇଁ ମୂଖ୍ଯ ୱିଣ୍ଡୋ ଇଞ୍ଚ ପିକ୍ସେଲ." +msgstr "ମୂଖ୍ୟ ୱିଣ୍ଡୋର ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଉଚ୍ଚତା, ପିକ୍ସେଲରେ।" #: ../shell/apps_evolution_shell.schemas.in.h:35 -#, fuzzy msgid "The default width for the main window, in pixels." -msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଓସାର ପାଇଁ ମୂଖ୍ଯ ୱିଣ୍ଡୋ ଇଞ୍ଚ ପିକ୍ସେଲ." +msgstr "ମୂଖ୍ୟ ୱିଣ୍ଡୋର ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଓସାର, ପିକ୍ସେଲରେ।" #: ../shell/apps_evolution_shell.schemas.in.h:36 -#, fuzzy msgid "The default width for the sidebar, in pixels." -msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଓସାର ପାଇଁ ଇଞ୍ଚ ପିକ୍ସେଲ." +msgstr "ପାର୍ଶ୍ୱପଟିର ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଓସାର, ପିକ୍ସେଲରେ।" #: ../shell/apps_evolution_shell.schemas.in.h:37 #, fuzzy @@ -18790,12 +18669,14 @@ msgid "" msgstr "ରେ ଦ୍ବାରା ନେଟୱାର୍କ config ଆଧାର." #: ../shell/apps_evolution_shell.schemas.in.h:44 -#, fuzzy msgid "" "The style of the window buttons. Can be \"text\", \"icons\", \"both\", " "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined " "by the GNOME toolbar setting." -msgstr "ର ୱିଣ୍ଡୋ ପାଠ୍ଯ ଅଟେ ସେଟ ର ଅଟେ ଦ୍ବାରା ନୋମ." +msgstr "" +"ୱିଣ୍ଡୋ ବଟନର ଶୈଳୀ। \"text\", \"icons\", \"both\", " +"\"toolbar\" ହୋଇପାରେ। ଯଦି \"toolbar\" କୁ ସେଟ କରାଯାଏ, ତେବେ " +"ବଟନର ଶୈଳୀ GNOME ସାଧନ ପଟି ବିନ୍ୟାସ ଦ୍ୱାରା ନିର୍ଦ୍ଧାରଣ କରାଯାଇଥାଏ।" #: ../shell/apps_evolution_shell.schemas.in.h:45 msgid "" @@ -18809,9 +18690,8 @@ msgstr "" "ଠିକିଣା (ଆଇ.ପି.ଭି.୪ ଓ ଆଇ.ପି.ଭି.୬) ଓ ଜାଲକ ମୁଖା ସହିତ ଜାଲକ ଠିକଣା (୧୯୨.୧୬୮.୦.୦/୨୪ ଭଳି କିଛି)." #: ../shell/apps_evolution_shell.schemas.in.h:46 -#, fuzzy msgid "Toolbar is visible" -msgstr "ଟୁଲବାର ଅଟେ ଦୃଶ୍ୟମାନ" +msgstr "ସାଧନ ପଟିଟି ଦୃଶ୍ୟମାନ ଅଛି" #: ../shell/apps_evolution_shell.schemas.in.h:47 msgid "URL that provides proxy configuration values." @@ -18826,81 +18706,68 @@ msgid "User name to pass as authentication when doing HTTP proxying." msgstr "ଏଚ୍.ଟି.ଟି.ପି. ଛାୟାକରଣ ବେଳେ ବୈଧିକରଣ ପାଇଁ ଚାଳକ ନାମ." #: ../shell/apps_evolution_shell.schemas.in.h:50 -#, fuzzy msgid "Whether Evolution will start up in offline mode instead of online mode." -msgstr "କ୍ରମବିକାଶ ଆରମ୍ଭ ଉପର ଇଞ୍ଚ ଅଫ ଲାଇନ ମୋଡ ର ମୋଡ." +msgstr "Evolution ଅନଲାଇନ ଧାରା ପରିବର୍ତ୍ତେ ଅଫଲାଇନ ଧାରାରେ ଆରମ୍ଭ ହେବା ଉଚିତ କି ନୁହଁ।" #: ../shell/apps_evolution_shell.schemas.in.h:51 -#, fuzzy msgid "Whether or not the window should be maximized." -msgstr "କିମ୍ବା ନୁହେଁ ୱିଣ୍ଡୋ ଛୋଟରୁ ବଡ଼ କରାଯାଇଛି." +msgstr "ୱିଣ୍ଡୋର ଆକାର ବୃଦ୍ଧି କରିବା ଉଚିତ କି ନୁହଁ।" #: ../shell/apps_evolution_shell.schemas.in.h:52 -#, fuzzy msgid "Whether the sidebar should be visible." -msgstr "ଦୃଶ୍ୟମାନ." +msgstr "ପାର୍ଶ୍ୱପଟିଟି ଦୃଶ୍ୟମାନ ହେବା ଉଚିତ କି ନୁହଁ।" #: ../shell/apps_evolution_shell.schemas.in.h:53 -#, fuzzy msgid "Whether the status bar should be visible." -msgstr "ଦୃଶ୍ୟମାନ." +msgstr "ସ୍ଥିତିପଟିଟି ଦୃଶ୍ୟମାନ ହେବା ଉଚିତ କି ନୁହଁ।" #: ../shell/apps_evolution_shell.schemas.in.h:54 -#, fuzzy msgid "Whether the toolbar should be visible." -msgstr "ଦୃଶ୍ୟମାନ." +msgstr "ସାଧନ ପଟିଟି ଦୃଶ୍ୟମାନ ହେବା ଉଚିତ କି ନୁହଁ।" #: ../shell/apps_evolution_shell.schemas.in.h:55 -#, fuzzy msgid "Whether the warning dialog in development versions of Evolution is skipped." -msgstr "ଚେତାବନୀ ସଂଳାପ ଇଞ୍ଚ ର କ୍ରମବିକାଶ ଅଟେ." +msgstr "Evolution ର ବିକାଶ ସଂସ୍କରଣରେ ଚେତାବନୀ ସଂଳାପକୁ ଛାଡ଼ିଦିଆଯିବା ଉଚିତ କି ନୁହଁ।" #: ../shell/apps_evolution_shell.schemas.in.h:56 -#, fuzzy msgid "Whether the window buttons should be visible." -msgstr "ୱିଣ୍ଡୋ ଦୃଶ୍ୟମାନ." +msgstr "ୱିଣ୍ଡୋ ବଟନଗୁଡ଼ିକ ଦୃଶ୍ୟମାନ ହେବା ଉଚିତ କି ନୁହଁ।" #: ../shell/apps_evolution_shell.schemas.in.h:57 -#, fuzzy msgid "Window button style" -msgstr "ୱିଣ୍ଡୋ ବଟନ" +msgstr "ୱିଣ୍ଡୋ ବଟନ ଶୈଳୀ" #: ../shell/apps_evolution_shell.schemas.in.h:58 -#, fuzzy msgid "Window buttons are visible" -msgstr "ୱିଣ୍ଡୋ ଦୃଶ୍ୟମାନ" +msgstr "ୱିଣ୍ଡୋ ବଟନଗୁଡ଼ିକ ଦୃଶ୍ୟମାନ ହେଉଛି" #: ../shell/e-active-connection-dialog.glade.h:1 -#, fuzzy msgid "<b>Active Connections</b>" -msgstr "<b> ସକ୍ରିୟ ସଂଯୋଗ</b>" +msgstr "<b> ସକ୍ରିୟ ସଂଯୋଗଗୁଡ଼ିକ</b>" #: ../shell/e-active-connection-dialog.glade.h:2 -#, fuzzy msgid "Active Connections" -msgstr "ସକ୍ରିୟ ସଂଯୋଗ" +msgstr "ସକ୍ରିୟ ସଂଯୋଗଗୁଡ଼ିକ" #: ../shell/e-active-connection-dialog.glade.h:3 -#, fuzzy msgid "Click OK to close these connections and go offline" -msgstr "ଠିକ ଅଛି କୁ ବନ୍ଦ କରନ୍ତୁ ଏବଂ ଅଫ ଲାଇନ" +msgstr "ଏହି ସଂଯୋଗଗୁଡ଼ିକୁ ବନ୍ଦ କରିବା ପାଇଁ OK କ୍ଲିକ କରନ୍ତୁ ଏବଂ ଅଫଲାଇନ ଯାଆନ୍ତୁ" #: ../shell/e-shell-importer.c:128 -#, fuzzy msgid "Choose the type of importer to run:" -msgstr "ବାଛ ପ୍ରକାର ର କୁ:" +msgstr "ଚଲାଇବା ପାଇଁ ଆମଦାନୀ ପ୍ରକାରକୁ ବାଛନ୍ତୁ:" #: ../shell/e-shell-importer.c:131 -#, fuzzy msgid "" "Choose the file that you want to import into Evolution, and select what type " "of file it is from the list." -msgstr "ବାଛ ଫାଇଲ କୁ କ୍ରମବିକାଶ ଏବଂ ମନୋନୀତ କର ପ୍ରକାର ର ଫାଇଲ ଅଟେ ଠାରୁ ତାଲିକା." +msgstr "" +"Evolution ମଧ୍ଯକୁ ଆମଦାନୀ କରିବାକୁ ଚାହୁଁଥିବା ଫାଇଲକୁ ବାଛନ୍ତୁ, ଏବଂ " +"ତାଲିକାରୁ ଫାଇଲ ପ୍ରକାର ବାଛନ୍ତୁ।" #: ../shell/e-shell-importer.c:135 -#, fuzzy msgid "Choose the destination for this import" -msgstr "ବାଛ ପାଇଁ ଏହା" +msgstr "ଏହି ଆମଦାନୀ ପାଇଁ ଲକ୍ଷ୍ଯ ସ୍ଥଳ ବାଛନ୍ତୁ" #: ../shell/e-shell-importer.c:141 #, fuzzy @@ -18914,37 +18781,32 @@ msgstr "" "ବଟନ ନାଁ" #: ../shell/e-shell-importer.c:296 -#, fuzzy msgid "F_ilename:" -msgstr "F:" +msgstr "ଫାଇଲ ନାମ (_i):" #: ../shell/e-shell-importer.c:301 msgid "Select a file" msgstr "ଏକ ଫାଇଲ ମନୋନୀତ କର" #: ../shell/e-shell-importer.c:310 -#, fuzzy msgid "File _type:" -msgstr "ଫାଇଲ ପ୍ରକାର:" +msgstr "ଫାଇଲ ପ୍ରକାର (_t):" #: ../shell/e-shell-importer.c:358 -#, fuzzy msgid "Import data and settings from _older programs" -msgstr "ଆମଦାନୀ କର ତଥ୍ଯ ଏବଂ ଠାରୁ" +msgstr "ପୁରୁଣା ପ୍ରଗ୍ରାମଗୁଡ଼ିକରୁ ତଥ୍ୟ ଏବଂ ସଂରଚନାଗୁଡ଼ିକୁ ଆମଦାନୀ କରନ୍ତୁ (_o)" #: ../shell/e-shell-importer.c:361 -#, fuzzy msgid "Import a _single file" -msgstr "ଆମଦାନୀ କର a ଫାଇଲ" +msgstr "ଗୋଟିଏ ଫାଇଲ ଆମଦାନୀ କରନ୍ତୁ (_s)" #: ../shell/e-shell-importer.c:725 msgid "_Import" msgstr "ଆୟତ କରନ୍ତୁ (_I)" #: ../shell/e-shell-settings-dialog.c:313 -#, fuzzy msgid "Evolution Preferences" -msgstr "କ୍ରମବିକାଶ ପସନ୍ଦ" +msgstr "Evolution ପସନ୍ଦ" #. To translators: This is the window title and %s is the #. component name. Most translators will want to keep it as is. @@ -18954,24 +18816,21 @@ msgid "%s - Evolution" msgstr "%s - Evolution" #: ../shell/e-shell-window-commands.c:75 -#, fuzzy msgid "The GNOME Pilot tools do not appear to be installed on this system." -msgstr "ନୋମ ନୁହେଁ କୁ ରେ ଏହା ତନ୍ତ୍ର." +msgstr "GNOME ପଥପ୍ରଦର୍ଶକ ସାଧନଗୁଡ଼ିକ ଏହି ତନ୍ତ୍ରରେ ସ୍ଥାପିତ ହେବାପରି ଦୃଶ୍ୟମାନ ହେଉନାହିଁ।" #: ../shell/e-shell-window-commands.c:83 -#, fuzzy, c-format +#, c-format msgid "Error executing %s." -msgstr "ତ୍ରୁଟି." +msgstr "%s କୁ ନିଷ୍ପାଦନ କରିବାରେ ତ୍ରୁଟି।" #: ../shell/e-shell-window-commands.c:139 -#, fuzzy msgid "Bug buddy is not installed." -msgstr "ଅଟେ ନୁହେଁ." +msgstr "Bug buddy ସ୍ଥାପିତ ହୋଇ ନାହିଁ।" #: ../shell/e-shell-window-commands.c:142 -#, fuzzy msgid "Bug buddy could not be run." -msgstr "ନୁହେଁ." +msgstr "Bug buddy କୁ ଚଲାଇ ପାରିଲା ନାହିଁ।" #. The translator-credits string is for translators to list #. * per-language credits for translation, displayed in the @@ -18985,71 +18844,66 @@ msgid "Evolution Website" msgstr "Evolution କ୍ଯାଲେଣ୍ଡର ବସ୍ତୁ" #: ../shell/e-shell-window-commands.c:1171 -#, fuzzy msgid "_Work Online" -msgstr "କାର୍ଯ୍ଯ ଅନ ଲାଇନ" +msgstr "ଅନଲାଇନରେ କାର୍ଯ୍ୟ କରନ୍ତୁ (_W)" #: ../shell/e-shell-window-commands.c:1184 ../ui/evolution.xml.h:57 -#, fuzzy msgid "_Work Offline" msgstr "ଅଫଲାଇନରେ କାର୍ଯ୍ୟ କରନ୍ତୁ (_W)" #: ../shell/e-shell-window-commands.c:1197 -#, fuzzy msgid "Work Offline" -msgstr "କାର୍ଯ୍ଯ ଅଫଲାଇନ" +msgstr "ଅଫଲାଇନରେ କାର୍ଯ୍ଯ କରନ୍ତୁ" #: ../shell/e-shell-window.c:375 -#, fuzzy msgid "" "Evolution is currently online.\n" "Click on this button to work offline." -msgstr "କ୍ରମବିକାଶ ଅଟେ ରେ ଏହା ବଟନ କୁ ଅଫ ଲାଇନ." +msgstr "" +"Evolution ବର୍ତ୍ତମାନ ଅନଲାଇନ ଅଛି।\n" +"ଅଫଲାଇନରେ କାର୍ଯ୍ୟକରିବା ପାଇଁ ଏହି ବଟନ ଉପରେ କ୍ଲିକ କରନ୍ତୁ।" #: ../shell/e-shell-window.c:382 -#, fuzzy msgid "Evolution is in the process of going offline." -msgstr "କ୍ରମବିକାଶ ଅଟେ ଇଞ୍ଚ ର ଅଫ ଲାଇନ." +msgstr "Evolution ଅଫଲାଇନରେ ଯିବା ପାଇଁ ପ୍ରସ୍ତୁତ ହେଉଛି।" #: ../shell/e-shell-window.c:389 -#, fuzzy msgid "" "Evolution is currently offline.\n" "Click on this button to work online." -msgstr "କ୍ରମବିକାଶ ଅଟେ ଅଫ ଲାଇନ ରେ ଏହା ବଟନ କୁ." +msgstr "" +"Evolution ବର୍ତ୍ତମାନ ଅଫଲାଇନରେ ଅଛି।\n" +"ଅନଲାଇନରେ କାର୍ଯ୍ୟକରିବା ପାଇଁ ଏହି ବଟନ ଉପରେ କ୍ଲିକ କରନ୍ତୁ।" #: ../shell/e-shell-window.c:783 -#, fuzzy, c-format +#, c-format msgid "Switch to %s" -msgstr "ସ୍ୱିଚ କୁ" +msgstr "%s କୁ ବଦଳାନ୍ତୁ" #: ../shell/e-shell.c:639 msgid "Unknown system error." msgstr "ଅଜଣା ତନ୍ତ୍ର ତ୍ରୁଟି।" #: ../shell/e-shell.c:837 ../shell/e-shell.c:838 -#, fuzzy, c-format +#, c-format msgid "%ld KB" -msgstr "KB" +msgstr "%ld KB" #: ../shell/e-shell.c:1260 ../widgets/misc/e-cell-date-edit.c:324 msgid "OK" msgstr "ଠିକ ଅଛି" #: ../shell/e-shell.c:1262 -#, fuzzy msgid "Invalid arguments" -msgstr "ଅବୈଧ" +msgstr "ଅବୈଧ ସ୍ୱତନ୍ତ୍ରଚର" #: ../shell/e-shell.c:1264 -#, fuzzy msgid "Cannot register on OAF" -msgstr "ରେ" +msgstr "OAF ଉପରେ ପଞ୍ଜିକରଣ କରିପାରିବେ ନାହିଁ" #: ../shell/e-shell.c:1266 -#, fuzzy msgid "Configuration Database not found" -msgstr "କନଫିଗରେସନ ତଥ୍ଯସଂଚଯ ନୁହେଁ ମିଳିଛି " +msgstr "ସଂରଚନା ତଥ୍ୟାଧାର ମିଳିଲାନାହିଁ" #: ../shell/e-user-creatable-items-handler.c:677 #: ../shell/e-user-creatable-items-handler.c:687 @@ -19058,7 +18912,6 @@ msgid "New" msgstr "ନୂତନ" #: ../shell/test/evolution-test-component.c:105 -#, fuzzy msgid "New Test" msgstr "ନୂତନ ପରୀକ୍ଷଣ" @@ -19068,50 +18921,46 @@ msgid "_Test" msgstr "ପରୀକ୍ଷଣ (_T)" #: ../shell/test/evolution-test-component.c:107 -#, fuzzy msgid "Create a new test item" -msgstr "ସୃଷ୍ଟି କର a ନୂତନ ବସ୍ତୁ" +msgstr "ଗୋଟିଏ ନୂତନ ପରୀକ୍ଷଣ ବସ୍ତୁ ସୃଷ୍ଟି କରନ୍ତୁ" #: ../shell/import.glade.h:1 -#, fuzzy msgid "Click \"Import\" to begin importing the file into Evolution. " -msgstr "ଆମଦାନୀ କର କୁ ଫାଇଲ କ୍ରମବିକାଶ " +msgstr "Evolution ମଧ୍ଯକୁ ଫାଇଲ ଆମଦାନୀ କରିବା ଆରମ୍ଭ କରିବା ପାଇଁ \"Import\" କୁ କ୍ଲିକ କରନ୍ତୁ।" #: ../shell/import.glade.h:2 -#, fuzzy msgid "Evolution Import Assistant" -msgstr "କ୍ରମବିକାଶ ଆମଦାନୀ କର ସହକାରୀ" +msgstr "Evolution ଆମଦାନୀ ସହାୟକ" #: ../shell/import.glade.h:3 msgid "Import File" msgstr "ପାଇଲ୍ ଆମଦାନୀକର" #: ../shell/import.glade.h:4 -#, fuzzy msgid "Import Location" -msgstr "ଆମଦାନୀ କର ଅବସ୍ଥାନ" +msgstr "ଅବସ୍ଥାନ ଆମଦାନୀ କରନ୍ତୁ" #: ../shell/import.glade.h:5 -#, fuzzy msgid "Importer Type" -msgstr "ପ୍ରକାର" +msgstr "ଆମଦାନୀର ପ୍ରକାର" #: ../shell/import.glade.h:6 msgid "Select Information to Import" msgstr "ଆମଦାନୀ କରିବା ପାଇଁ ସୂଚନା ବାଛନ୍ତୁ" #: ../shell/import.glade.h:7 -#, fuzzy msgid "Select a File" -msgstr "ମନୋନୀତ କର a ଫାଇଲ" +msgstr "ଗୋଟିଏ ଫାଇଲ ବାଛନ୍ତୁ" #: ../shell/import.glade.h:8 -#, fuzzy msgid "" "Welcome to the Evolution Import Assistant.\n" "With this assistant you will be guided through the process of\n" "importing external files into Evolution." -msgstr "ସ୍ବାଗତମ କୁ କ୍ରମବିକାଶ ଆମଦାନୀ କର ସହକାରୀ ଏହା ର ଫାଇଲ ମାନ କ୍ରମବିକାଶ ." +msgstr "" +"Evolution ଆମଦାନୀ ସହାୟକରେ ଆପଣଙ୍କୁ ସ୍ୱାଗତ କରୁଅଛୁ।\n" +"ଏହି ସହାୟତା ସହିତ ଆପଣ ବାହ୍ୟ ଫାଇଲକୁ Evolution ମଧ୍ଯକୁ\n" +"ଆମଦାନୀ କରିବାର ପଦ୍ଧତି ବିଷୟରେ ପଥପ୍ରଦର୍ଶନ କରାଯିବ।" #. Preview/Alpha/Beta version warning message #: ../shell/main.c:221 @@ -19137,70 +18986,61 @@ msgstr "" "କ୍ରମବିକାଶ କୁ ଏବଂ ନାଁ ଖୋଜନ୍ତୁ କୁ us ଏଠାରେ ସହିତ ନାଁ ଏବଂ ଅଟେ ନୁହେଁ ପାଇଁ କୁ ର ନାଁ ର ଏବଂ ନାଁ" #: ../shell/main.c:245 -#, fuzzy msgid "" "Thanks\n" "The Evolution Team\n" -msgstr "କ୍ରମବିକାଶ ନାଁ" +msgstr "" +"ଧନ୍ୟବାଦ\n" +"Evolution ଦଳ\n" #: ../shell/main.c:252 -#, fuzzy msgid "Do not tell me again" -msgstr "ନୁହେଁ" +msgstr "ମୋତେ ପୁଣିଥରେ ପଚାରନ୍ତୁ ନାହିଁ" #: ../shell/main.c:481 -#, fuzzy msgid "Start Evolution activating the specified component" -msgstr "ଆରମ୍ଭ କ୍ରମବିକାଶ " +msgstr "ଉଲ୍ଲିଖିତ ଉପାଦାନଗୁଡ଼ିକୁ ସକ୍ରିୟ କରି Evolution କୁ ଆରମ୍ଭ କରନ୍ତୁ" #: ../shell/main.c:485 -#, fuzzy msgid "Start in online mode" -msgstr "ଆରମ୍ଭ ଇଞ୍ଚ ମୋଡ" +msgstr "ଅନଲାଇନ ଧାରାରେ ଆରମ୍ଭ କରନ୍ତୁ" #: ../shell/main.c:488 -#, fuzzy msgid "Forcibly shut down all Evolution components" -msgstr "ତଳ ସମସ୍ତ କ୍ରମବିକାଶ " +msgstr "ସମସ୍ତ Evolution ଉପାଦାନଗୁଡ଼ିକୁ ବାଧ୍ଯତାମୂଳକ ଭାବରେ ବନ୍ଦ କରନ୍ତୁ" #: ../shell/main.c:492 -#, fuzzy msgid "Forcibly re-migrate from Evolution 1.4" -msgstr "NULL ଠାରୁ କ୍ରମବିକାଶ ୪" +msgstr "Evolution 1.4 ରୁ ବାଧ୍ୟତାମୂଳକ ଭାବରେ ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" #: ../shell/main.c:495 -#, fuzzy msgid "Send the debugging output of all components to a file." -msgstr "ପଠାଅ ର ସମସ୍ତ କୁ a ଫାଇଲ." +msgstr "" #: ../shell/main.c:497 -#, fuzzy msgid "Disable loading of any plugins." -msgstr "ନିଷ୍କ୍ରିୟ ର କୌଣସି." +msgstr "ଯେକୌଣସି ପ୍ଲଗଇନଗୁଡ଼ିକର ଧାରଣକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ।" #: ../shell/main.c:499 -#, fuzzy msgid "Disable preview pane of Mail, Contacts and Tasks." -msgstr "ନିଷ୍କ୍ରିୟ ର ମେଲ ଯୋଗାଯୋଗ ଏବଂ କାର୍ଯ୍ଯ." +msgstr "ମେଲ, ଯୋଗାଯୋଗ ଏବଂ କାର୍ଯ୍ୟର ପ୍ରାକଦର୍ଶନ ପଟ୍ଟିକାକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ।" #: ../shell/main.c:586 -#, fuzzy msgid "- The Evolution PIM and Email Client" -msgstr "କ୍ରମବିକାଶ PIM ଏବଂ ଇ-ଡାକ ଗ୍ରାହକ" +msgstr "- Evolution PIM ଏବଂ ଇମେଲ ଗ୍ରାହକ" #: ../shell/main.c:614 -#, fuzzy, c-format +#, c-format msgid "" "%s: --online and --offline cannot be used together.\n" " Use %s --help for more information.\n" msgstr "" -"ଏବଂ ଅଫ ଲାଇନ ବ୍ଯବହୃତ\n" -" ବ୍ଯବହାର କର ସାହାୟ୍ଯ ପାଇଁ ନାଁ" +"%s: --online ଏବଂ --offline କୁ ଏକ ସଙ୍ଗରେ ବ୍ୟବହାର କରିହେବ ନାହିଁ।\n" +" ଅଧିକ ସୂଚନା ପାଇଁ %s --help ବ୍ୟବହାର କରନ୍ତୁ।\n" #: ../shell/shell.error.xml.h:1 -#, fuzzy msgid "Are you sure you want to forget all remembered passwords?" -msgstr "କୁ ସମସ୍ତ?" +msgstr "ଆପଣ ନିଶ୍ଚିତ କି ଯେ ଆପଣ ମନେଥିବା ସମସ୍ତ ପ୍ରବେଶ ସଂକେତଗୁଡ଼ିକୁ ଭୁଲିବାକୁ ଚାହୁଁଛନ୍ତି?" #: ../shell/shell.error.xml.h:2 msgid "Cannot start Evolution" @@ -19211,31 +19051,28 @@ msgid "Continue" msgstr "ଆଗକୁ ବଢନ୍ତୁ" #: ../shell/shell.error.xml.h:4 -#, fuzzy msgid "Delete old data from version {0}?" -msgstr "ବିଲୋପ କର ତଥ୍ଯ ଠାରୁ?" +msgstr "ସଂସ୍କରଣ {0}ରୁ ପୁରୁଣା ତଥ୍ୟକୁ ଅପସାରଣ କରନ୍ତୁ?" #: ../shell/shell.error.xml.h:5 -#, fuzzy msgid "Evolution can not start." -msgstr "କ୍ରମବିକାଶ ନୁହେଁ ଆରମ୍ଭ." +msgstr "Evolution ଆରମ୍ଭ କରିପାରିବେ ନାହିଁ।" #: ../shell/shell.error.xml.h:6 -#, fuzzy msgid "" "Forgetting your passwords will clear all remembered passwords. You will be " "reprompted next time they are needed." -msgstr "ପରିଷ୍କାର କର ସମସ୍ତ ଆପଣ." +msgstr "" +"ଆପଣଙ୍କର ପ୍ରବେଶ ସଂକେତ ଭୁଲିବା ଦ୍ୱାରା ମନେ ଥିବା ସମସ୍ତ ପ୍ରବେଶ ସଂକେତକୁ ସଫାକରନ୍ତୁ। ପରବର୍ତ୍ତି ସମୟରେ " +"ଆବଶ୍ୟକ ହେଲେ ଆପଣଙ୍କୁ ପଚରାଯିବ।" #: ../shell/shell.error.xml.h:8 -#, fuzzy msgid "Insufficient disk space for upgrade." -msgstr "ଖାଲି ସ୍ଥାନ (space) ପାଇଁ." +msgstr "ଉନ୍ନୟନ ପାଇଁ ଯଥେଷ୍ଟ ଖାଲି ସ୍ଥାନ ନାହିଁ।" #: ../shell/shell.error.xml.h:9 -#, fuzzy msgid "Really delete old data?" -msgstr "ବିଲୋପ କର ତଥ୍ଯ?" +msgstr "ପ୍ରକୃତରେ ପୁରୁଣା ତଥ୍ୟକୁ ଅପସାରଣ କରିବେ?" #: ../shell/shell.error.xml.h:10 #, fuzzy @@ -19268,12 +19105,10 @@ msgstr "" "ହସ୍ତକୃତ ଭାବରେ କାଢ଼ନ୍ତୁ ର"" ଏଠାରେ ନାଁ" #: ../shell/shell.error.xml.h:20 -#, fuzzy msgid "Upgrade from previous version failed: {0}" -msgstr "ଶ୍ରେଣୀଉଚ୍ଚକର ଠାରୁ" +msgstr "ପୂର୍ବ ସଂସ୍କରଣରୁ ଉନ୍ନୟନ ବିଫଳ ହୋଇଛି: {0}" #: ../shell/shell.error.xml.h:21 -#, fuzzy msgid "" "Upgrading your data and settings will require up to {0} of disk space, but " "you only have {1} available.\n" @@ -19281,56 +19116,64 @@ msgid "" "You will need to make more space available in your home directory before you " "can continue." msgstr "" -"ଅପ୍ଗ୍ରେଡ୍ କରାହେଉଛି ତଥ୍ଯ ଏବଂ ଉପର କୁ ର ଖାଲି ସ୍ଥାନ (space) ଉପଲବ୍ଧ ନାଁ କୁ ଖାଲି ସ୍ଥାନ (space) " -"ଉପଲବ୍ଧ ଇଞ୍ଚ ମୂଳସ୍ଥାନ ଡିରେକ୍ଟୋରୀ ପୂର୍ବରୁ." #: ../shell/shell.error.xml.h:24 -#, fuzzy msgid "" "Your system configuration does not match your Evolution configuration.\n" "\n" "Click help for details" -msgstr "ତନ୍ତ୍ର ବିନ୍ଯାସ ନୁହେଁ କ୍ରମବିକାଶ ବିନ୍ଯାସ ନାଁ ସାହାୟ୍ଯ ପାଇଁ" +msgstr "" +"ଆପଣଙ୍କର ତନ୍ତ୍ର ସଂରଚନା ଆପଣଙ୍କର Evolution ସଂରଚନା ସହିତ ମେଳ ଖାଉନାହିଁ:\n" +"\n" +"ବିସ୍ତୃତ ବିବରଣୀ ପାଇଁ ସହାୟତାକୁ କ୍ଲିକ କରନ୍ତୁ" #: ../shell/shell.error.xml.h:27 -#, fuzzy msgid "" "Your system configuration does not match your Evolution configuration:\n" "\n" "{0}\n" "\n" "Click help for details." -msgstr "ତନ୍ତ୍ର ବିନ୍ଯାସ ନୁହେଁ କ୍ରମବିକାଶ ବିନ୍ଯାସ ନାଁ ନାଁ ନାଁ ସାହାୟ୍ଯ ପାଇଁ." +msgstr "" +"ଆପଣଙ୍କର ତନ୍ତ୍ର ସଂରଚନା ଆପଣଙ୍କର Evolution ସଂରଚନା ସହିତ ମେଳ ଖାଉନାହିଁ:\n" +"\n" +"{0}\n" +"\n" +"ବିସ୍ତୃତ ବିବରଣୀ ପାଇଁ ସହାୟତାକୁ କ୍ଲିକ କରନ୍ତୁ।" #: ../shell/shell.error.xml.h:32 msgid "_Forget" msgstr "" #: ../shell/shell.error.xml.h:33 -#, fuzzy msgid "_Keep Data" -msgstr "ରଖନ୍ତୁ ତଥ୍ଯ" +msgstr "ତଥ୍ଯ ରଖନ୍ତୁ (_K)" #: ../shell/shell.error.xml.h:34 msgid "_Remind Me Later" msgstr "" #: ../shell/shell.error.xml.h:35 -#, fuzzy msgid "" "{1}\n" "\n" "If you choose to continue, you may not have access to some of your old " "data.\n" -msgstr "ନାଁ କୁ ନୁହେଁ ଅଭିଗମ କରନ୍ତୁ କୁ ର ତଥ୍ଯ ନାଁ" +msgstr "" +"{1}\n" +"\n" +"ଯଦି ଆପଣ ଅଗ୍ରସର ହେବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଆପଣଙ୍କ ପାଖରେ କିଛି ପୁରୁଣା ତଥ୍ୟ ପାଇଁ ଅଭିଗମ୍ୟତା ନଥାଇପାରେ।\n" #: ../smime/gui/ca-trust-dialog.c:102 -#, fuzzy, c-format +#, c-format msgid "" "Certificate '%s' is a CA certificate.\n" "\n" "Edit trust settings:" -msgstr "ଅଟେ a ନାଁ:" +msgstr "" +"ପ୍ରମାଣପତ୍ର '%s' ଟି ଗୋଟିଏ CA ପ୍ରମାଣପତ୍ର।\n" +"\n" +"ବିଶ୍ୱାସ ସଂରଚନାଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ:" #: ../smime/gui/cert-trust-dialog.c:151 msgid "" @@ -19783,9 +19626,8 @@ msgid "PKCS12 File Password" msgstr "PKCS12 ଫାଇଲ ପ୍ରବେଶ ସଙ୍କେତ" #: ../smime/lib/e-pkcs12.c:249 -#, fuzzy msgid "Enter password for PKCS12 file:" -msgstr "ପ୍ରବେଶ କରନ୍ତୁ (Enter) ଗୁପ୍ତଶବ୍ଦ ପାଇଁ ଫାଇଲ:" +msgstr "PKCS12 ଫାଇଲ ପାଇଁ ପ୍ରବେଶ ସଂକେତ ଭରଣ କରନ୍ତୁ:" #: ../smime/lib/e-pkcs12.c:348 msgid "Imported Certificate" @@ -20062,9 +19904,8 @@ msgid "Next" msgstr "ପରବର୍ତ୍ତୀ" #: ../ui/evolution-calendar.xml.h:18 -#, fuzzy msgid "Previews the calendar to be printed" -msgstr "ପ୍ରାକ୍ଦର୍ଶନରାଜି କାଲେଣ୍ଡର କୁ" +msgstr "ମୁଦ୍ରଣ ହେବାକୁ ଥିବା କ୍ୟାଲେଣ୍ଡରକୁ ପ୍ରାକଦର୍ଶନ କରନ୍ତୁ" #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74 #: ../widgets/misc/e-calendar.c:171 @@ -20076,14 +19917,12 @@ msgid "Print this calendar" msgstr "ଏହି କାଲେଣ୍ଡରକୁ ମୁଦ୍ରଣ କରନ୍ତୁ" #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17 -#, fuzzy msgid "Purg_e" -msgstr "e" +msgstr "ସଫାକରନ୍ତୁ (_e)" #: ../ui/evolution-calendar.xml.h:24 -#, fuzzy msgid "Purge old appointments and meetings" -msgstr "ଏବଂ" +msgstr "ପୁରୁଣା ସାକ୍ଷାତକାର ଏବଂ ବୈଠକକୁ ସଫାକରନ୍ତୁ" #: ../ui/evolution-calendar.xml.h:25 msgid "Select _Date" @@ -20094,9 +19933,8 @@ msgid "Select _Today" msgstr "ଆଜିକୁ ମନୋନୀତ କରନ୍ତୁ (_T)" #: ../ui/evolution-calendar.xml.h:27 -#, fuzzy msgid "Select a specific date" -msgstr "ମନୋନୀତ କର a" +msgstr "ଗୋଟିଏ ନିର୍ଦ୍ଦିଷ୍ଟ ତାରିଖ ବାଛନ୍ତୁ" #: ../ui/evolution-calendar.xml.h:28 msgid "Select today" @@ -20123,14 +19961,12 @@ msgid "Show the working week" msgstr "କାର୍ଯ୍ୟ ଦିବସ ସପ୍ତାହ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-calendar.xml.h:35 -#, fuzzy msgid "View the current appointment" -msgstr "ଦୃଶ୍ଯ" +msgstr "ପ୍ରଚଳିତ ସାକ୍ଷାତକାରକୁ ଦେଖନ୍ତୁ" #: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19 -#, fuzzy msgid "View the debug console for log messages" -msgstr "ଦୃଶ୍ଯ ପାଇଁ" +msgstr "ଲଗ ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ତ୍ରୁଟି ନିବାରଣ କୋନସୋଲକୁ ଦେଖନ୍ତୁ" #: ../ui/evolution-calendar.xml.h:37 msgid "Week" @@ -20149,19 +19985,16 @@ msgid "_Open Appointment" msgstr "ସାକ୍ଷାତକାର ଖୋଲନ୍ତୁ (_O)" #: ../ui/evolution-mail-global.xml.h:2 -#, fuzzy msgid "Cancel the current mail operation" -msgstr "ବାତିଲ କରନ୍ତୁ ଡାକ" +msgstr "ପ୍ରଚଳିତ ମେଲ ପ୍ରୟୋଗକୁ ବାତିଲ କରନ୍ତୁ" #: ../ui/evolution-mail-global.xml.h:3 -#, fuzzy msgid "Copy the selected folder into another folder" -msgstr "ନକଲ କରନ୍ତୁ ଚୟିତ" +msgstr "ବଚ୍ଛିତ ଫୋଲଡରକୁ ଅନ୍ୟ ଏକ ଫୋଲଡରରେ ନକଲ କରନ୍ତୁ" #: ../ui/evolution-mail-global.xml.h:4 -#, fuzzy msgid "Create a new folder for storing mail" -msgstr "ସୃଷ୍ଟି କର a ନୂତନ ପାଇଁ ଡାକ" +msgstr "ମେଲ ସଂରକ୍ଷଣ ପାଇଁ ନୂତନ ଫୋଲଡର ନିର୍ମାଣ କରନ୍ତୁ" #: ../ui/evolution-mail-global.xml.h:5 msgid "Create or edit Search Folder definitions" @@ -20172,9 +20005,8 @@ msgid "Create or edit rules for filtering new mail" msgstr "ସୃଷ୍ଟି କର କିମ୍ବା ସମ୍ପାଦନ କରନ୍ତୁ ପାଇଁ ନୂତନ ଡାକ" #: ../ui/evolution-mail-global.xml.h:7 -#, fuzzy msgid "Download messages of accounts/folders marked for offline" -msgstr "ଆହରଣ ର ଆକାଉଣ୍ଟ ଗୁଡିକ ପାଇଁ ଅଫ ଲାଇନ" +msgstr "ଅଫଲାଇନ ପାଇଁ ଚିହ୍ନିତ ଖାତା/ଫୋଲଡରଗୁଡ଼ିକର ସନ୍ଦେଶଗୁଡ଼ିକୁ ଆହରଣ କରନ୍ତୁ" #: ../ui/evolution-mail-global.xml.h:8 msgid "Empty _Trash" @@ -20185,15 +20017,13 @@ msgid "F_older" msgstr "ଫୋଲଡର (_o)" #: ../ui/evolution-mail-global.xml.h:10 -#, fuzzy msgid "Move the selected folder into another folder" -msgstr "ଘୁଞ୍ଚାଅ ଚୟିତ" +msgstr "ବଚ୍ଛିତ ଫୋଲଡରକୁ ଅନ୍ୟ ଏକ ଫୋଲଡର ମଧ୍ଯକୁ ଘୁଞ୍ଚାନ୍ତୁ" #. Alphabetical by name, yo #: ../ui/evolution-mail-global.xml.h:12 -#, fuzzy msgid "Permanently remove all deleted messages from all folders" -msgstr "କାଢ଼ନ୍ତୁ ସମସ୍ତ ବିଲୋପ ହୋଇଛି ଠାରୁ ସମସ୍ତ" +msgstr "ସମସ୍ତ ଫୋଲଡରରୁ ସମସ୍ତ ଅପସାରିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ସବୁଦିନ ପାଇଁ କାଢ଼ନ୍ତୁ" #: ../ui/evolution-mail-global.xml.h:13 msgid "Search F_olders" @@ -20204,24 +20034,20 @@ msgid "Show Message _Preview" msgstr "ସନ୍ଦେଶ ପୂର୍ବଦୃଶ୍ଯ ଦେଖାନ୍ତୁ (_P)" #: ../ui/evolution-mail-global.xml.h:15 -#, fuzzy msgid "Show message preview below the message list" -msgstr "ଦେଖାଅ ତଳ ତାଲିକା" +msgstr "ସନ୍ଦେଶ ପ୍ରାକଦର୍ଶନକୁ ସନ୍ଦେଶ ତାଲିକା ତଳେ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-global.xml.h:16 -#, fuzzy msgid "Show message preview side-by-side with the message list" -msgstr "ଦେଖାଅ ଦ୍ବାରା ସହିତ ତାଲିକା" +msgstr "ସନ୍ଦେଶ ପ୍ରାକଦର୍ଶନକୁ ସନ୍ଦେଶ ତାଲିକା ସହିତ ପାଖକୁ ପାଖ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-global.xml.h:17 -#, fuzzy msgid "Show message preview window" -msgstr "ଦେଖାଅ ୱିଣ୍ଡୋ" +msgstr "ସନ୍ଦେଶ ପ୍ରାକଦର୍ଶନ ୱିଣ୍ଡୋ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-global.xml.h:18 -#, fuzzy msgid "Subscribe or unsubscribe to folders on remote servers" -msgstr "କିଣନ୍ତୁ କିମ୍ବା କୁ ରେ" +msgstr "ସୁଦୂର ସର୍ଭରଗୁଡ଼ିକରେ ଥିବା ଫୋଲଡରଗୁଡ଼ିକୁ କିଣନ୍ତୁ ଅଥବା କିଣନ୍ତୁ ନାହିଁ" #: ../ui/evolution-mail-global.xml.h:20 msgid "_Classic View" @@ -20263,24 +20089,20 @@ msgid "_Vertical View" msgstr "ଲମ୍ବରୂପ ଦୃଶ୍ଯ (_V)" #: ../ui/evolution-mail-list.xml.h:1 -#, fuzzy msgid "Change the name of this folder" -msgstr "ପରିବର୍ତ୍ତନକର ନାମ ର ଏହା" +msgstr "ଏହି ଫୋଲଡରର ନାମକୁ ଲୁଚାନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:2 -#, fuzzy msgid "Change the properties of this folder" -msgstr "ପରିବର୍ତ୍ତନକର ଗୁଣଧର୍ମ ର ଏହା" +msgstr "ଏହି ଫୋଲଡରର ଗୁଣଧର୍ମକୁ ଲୁଚାନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:3 -#, fuzzy msgid "Collapse All _Threads" -msgstr "ଭାଙ୍ଗିୟିବା ସମସ୍ତ" +msgstr "ସମସ୍ତ ଥ୍ରେଡ଼ଗୁଡ଼ିକୁ ଭାଙ୍ଗନ୍ତୁ (_T)" #: ../ui/evolution-mail-list.xml.h:4 -#, fuzzy msgid "Collapse all message threads" -msgstr "ଭାଙ୍ଗିୟିବା ସମସ୍ତ" +msgstr "ସମସ୍ତ ସନ୍ଦେଶ ଥ୍ରେଡ଼ଗୁଡ଼ିକୁ ଭାଙ୍ଗନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:5 msgid "Copy selected message(s) to the clipboard" @@ -20288,9 +20110,8 @@ msgstr "କ୍ଲିପବୋର୍ଡରେ ଚୟିତ ସନ୍ଦେଶଗ #. Alphabetical by name, yo #: ../ui/evolution-mail-list.xml.h:7 -#, fuzzy msgid "Cut selected message(s) to the clipboard" -msgstr "କାଟ ଚୟିତ କୁ କ୍ଲିପବୋର୍ଡ " +msgstr "କ୍ଲିପବୋର୍ଡରେ ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ କାଟିକରି ଲଗାନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:8 msgid "E_xpand All Threads" @@ -20313,47 +20134,40 @@ msgid "Hide _Deleted Messages" msgstr "ବିଲୋପ ହୋଇଥିବା ସନ୍ଦେଶଗୁଡ଼ିକୁ ଲୁଚାନ୍ତୁ (_D)" #: ../ui/evolution-mail-list.xml.h:14 -#, fuzzy msgid "Hide _Read Messages" -msgstr "ଲୁଚାଅ ପଢନ୍ତୁ" +msgstr "ପଢ଼ାଯାଇଥିବା ସନ୍ଦେଶଗୁଡ଼ିକୁ ଲୁଚାନ୍ତୁ (_R)" #: ../ui/evolution-mail-list.xml.h:15 -#, fuzzy msgid "Hide deleted messages rather than displaying them with a line through them" -msgstr "ଲୁଚାଅ ବିଲୋପ ହୋଇଛି ସହିତ a" +msgstr "ଅପସାରିତ ସନ୍ଦେଶଗୁଡ଼ିକ ମଧ୍ଯରେ ଗାର ପକାଇ ଦର୍ଶାଇବା ବଦଳରେ ସେମାନଙ୍କୁ ଲୁଚାନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:16 -#, fuzzy msgid "Mar_k All Messages as Read" -msgstr "ମାର୍ଚ୍ଚ ସମସ୍ତ ପଢନ୍ତୁ" +msgstr "ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଢ଼ାହୋଇଥିବା ପରି ଚିହ୍ନଟ କରନ୍ତୁ (_k)" #: ../ui/evolution-mail-list.xml.h:17 msgid "Mark all messages in the folder as read" msgstr "ସନ୍ଦେଶ ମାନଙ୍କୁ ପଢିସାରିଲେ ବୋଲି ଚିହ୍ନିତ କରନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:18 -#, fuzzy msgid "Paste message(s) from the clipboard" -msgstr "ଲଗାନ୍ତୁ ଠାରୁ କ୍ଲିପବୋର୍ଡ " +msgstr "କ୍ଲିପବୋର୍ଡରୁ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଲଗାନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:19 -#, fuzzy msgid "Permanently remove all deleted messages from this folder" -msgstr "କାଢ଼ନ୍ତୁ ସମସ୍ତ ବିଲୋପ ହୋଇଛି ଠାରୁ ଏହା" +msgstr "ଏହି ଫୋଲଡରରୁ ସମସ୍ତ ଅପସାରିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ସବୁଦିନ ପାଇଁ କାଢ଼ିଦିଅନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:20 -#, fuzzy msgid "Permanently remove this folder" -msgstr "କାଢ଼ନ୍ତୁ ଏହା" +msgstr "ଏହି ଫୋଲଡରକୁ ସବୁଦିନ ପାଇଁ କାଢ଼ିଦିଅନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:22 msgid "Refresh the folder" msgstr "ଫୋଲଡରକୁ ସତେଜନ କରନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:23 -#, fuzzy msgid "Select Message S_ubthread" -msgstr "ମନୋନୀତ କର ସନ୍ଦେଶ S" +msgstr "ସନ୍ଦେଶ ଉପ ଥ୍ରେଡ଼କୁ ବାଛନ୍ତୁ (_u)" #: ../ui/evolution-mail-list.xml.h:24 msgid "Select Message _Thread" @@ -20364,43 +20178,36 @@ msgid "Select _All Messages" msgstr "ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ମନୋନୀତ କରନ୍ତୁ (_A)" #: ../ui/evolution-mail-list.xml.h:26 -#, fuzzy msgid "Select all and only the messages that are not currently selected" -msgstr "ମନୋନୀତ କର ସମସ୍ତ ଏବଂ ନୁହେଁ ଚୟିତ" +msgstr "ସମସ୍ତ ଏବଂ କେବଳ ବର୍ତ୍ତମାନ ବଛାହୋଇନଥିବା ସନ୍ଦେଶଗୁଡ଼ିକୁ ବାଛନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:27 -#, fuzzy msgid "Select all messages in the same thread as the selected message" -msgstr "ମନୋନୀତ କର ସମସ୍ତ ଇଞ୍ଚ ଚୟିତ" +msgstr "ଏକା ଥ୍ରେଡ଼ରେ ଥିବା ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ବଚ୍ଛିତ ସନ୍ଦେଶ ପରି ଚୟନ କରନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:28 -#, fuzzy msgid "Select all replies to the currently selected message" -msgstr "ମନୋନୀତ କର ସମସ୍ତ କୁ ଚୟିତ" +msgstr "ବର୍ତ୍ତମାନ ବଛାହୋଇଥିବା ସନ୍ଦେଶରେ ସମସ୍ତଙ୍କୁ ଉତ୍ତର ଦିଅନ୍ତୁ ବିକଳ୍ପକୁ ଚୟନ କରନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:29 msgid "Select all visible messages" msgstr "ସମସ୍ତ ଦୃଶ୍ୟମାନ ମନୋନୀତ କରନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:30 -#, fuzzy msgid "Show Hidde_n Messages" -msgstr "ଦେଖାଅ ନାଁ" +msgstr "ଲୁକ୍କାଇତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (_n)" #: ../ui/evolution-mail-list.xml.h:31 -#, fuzzy msgid "Show messages that have been temporarily hidden" -msgstr "ଦେଖାଅ ଗୁପ୍ତ" +msgstr "ଅସ୍ଥାୟୀ ଭାବରେ ଲୁଚାହୋଇଥିବା ସନ୍ଦେଶଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:32 -#, fuzzy msgid "Temporarily hide all messages that have already been read" -msgstr "ସମସ୍ତ ପଢନ୍ତୁ" +msgstr "ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅସ୍ଥାୟୀ ଭାବରେ ଲୁଚାନ୍ତୁ ଯାହାକୁ ପୂର୍ବରୁ ପଢ଼ାସରିଛି" #: ../ui/evolution-mail-list.xml.h:33 -#, fuzzy msgid "Temporarily hide the selected messages" -msgstr "ଚୟିତ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅସ୍ଥାୟୀ ଭାବରେ ଲୁଚାନ୍ତୁ" #: ../ui/evolution-mail-list.xml.h:34 msgid "Threaded Message list" @@ -20416,14 +20223,12 @@ msgid "_Message" msgstr "ସନ୍ଦେଶ (_M)" #: ../ui/evolution-mail-message.xml.h:1 -#, fuzzy msgid "A_dd Sender to Address Book" -msgstr "A ପ୍ରେରକ କୁ ଠିକଣା ପୁସ୍ତକ" +msgstr "ଠିକଣା ବହିରେ ପ୍ରେରକ ଯୋଗ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:2 -#, fuzzy msgid "A_pply Filters" -msgstr "A ଫିଲ୍ଟରଗୁଡିକ" +msgstr "ଛାଣକଗୁଡ଼ିକୁ ପ୍ରୟୋଗ କରନ୍ତୁ (_p)" #. Alphabetical by name, yo #: ../ui/evolution-mail-message.xml.h:4 @@ -20435,131 +20240,108 @@ msgid "All Message _Headers" msgstr "ସମସ୍ତ ସନ୍ଦେଶ ଶୀର୍ଷକଗୁଡିକ (_H)" #: ../ui/evolution-mail-message.xml.h:6 -#, fuzzy msgid "Apply filter rules to the selected messages" -msgstr "ପ୍ରଯୋଗ କର କୁ ଚୟିତ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶ ପାଇଁ ଛିଣକ ନିୟମ ପ୍ରୟୋଗ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:7 msgid "Check for _Junk" msgstr "Junk ପାଇଁ ଯାଞ୍ଚ କରନ୍ତୁ (_J)" #: ../ui/evolution-mail-message.xml.h:8 -#, fuzzy msgid "Compose _New Message" -msgstr "ଲେଖନ୍ତୁ ନୂତନ ସନ୍ଦେଶ" +msgstr "ନୂତନ ସନ୍ଦେଶ ଲେଖନ୍ତୁ (_N)" #: ../ui/evolution-mail-message.xml.h:9 -#, fuzzy msgid "Compose a reply to all of the recipients of the selected message" -msgstr "ଲେଖନ୍ତୁ a କୁ ସମସ୍ତ ର ର ଚୟିତ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶର ଗ୍ରାହକ ପାଇଁ ଗୋଟିଏ ଉତ୍ତର ଲେଖନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:10 -#, fuzzy msgid "Compose a reply to the mailing list of the selected message" -msgstr "ଲେଖନ୍ତୁ a କୁ ତାଲିକା ର ଚୟିତ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶର ମେଲ ତାଲିକା ପାଇଁ ଗୋଟିଏ ଉତ୍ତର ଲେଖନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:11 -#, fuzzy msgid "Compose a reply to the sender of the selected message" -msgstr "ଲେଖନ୍ତୁ a କୁ ର ଚୟିତ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶର ପ୍ରେରକଙ୍କ ପାଖକୁ ଗୋଟିଏ ଉତ୍ତର ଲେଖନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:12 -#, fuzzy msgid "Copy selected messages to another folder" -msgstr "ନକଲ କରନ୍ତୁ ଚୟିତ କୁ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅନ୍ୟ ଏକ ଫୋଲଡରରେ ନକଲ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:13 -#, fuzzy msgid "Copy selected messages to the clipboard" -msgstr "ନକଲ କରନ୍ତୁ ଚୟିତ କୁ କ୍ଲିପବୋର୍ଡ " +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ କ୍ଲିପବୋର୍ଡରେ ନକଲ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:14 msgid "Create R_ule" msgstr "ନିୟମ ସୃଷ୍ଟି କରନ୍ତୁ (_u)" #: ../ui/evolution-mail-message.xml.h:15 -#, fuzzy msgid "Create a Search Folder for these recipients" -msgstr "ସୃଷ୍ଟି କର a ଖୋଜନ୍ତୁ ଫୋଲଡର ପାଇଁ" +msgstr "ଏହି ଗ୍ରାହକ ପାଇଁ ଗୋଟିଏ ସନ୍ଧାନ ଫୋଲଡର ନିର୍ମାଣ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:16 -#, fuzzy msgid "Create a Search Folder for this mailing list" -msgstr "ସୃଷ୍ଟି କର a ଖୋଜନ୍ତୁ ଫୋଲଡର ପାଇଁ ଏହା ତାଲିକା" +msgstr "ଏହି ମେଲ ତାଲିକା ପାଇଁ ଗୋଟିଏ ସନ୍ଧାନ ଫୋଲଡର ନିର୍ମାଣ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:17 -#, fuzzy msgid "Create a Search Folder for this sender" -msgstr "ସୃଷ୍ଟି କର a ଖୋଜନ୍ତୁ ଫୋଲଡର ପାଇଁ ଏହା" +msgstr "ଏହି ପ୍ରେରକ ପାଇଁ ଗୋଟିଏ ସନ୍ଧାନ ଫୋଲଡର ନିର୍ମାଣ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:18 -#, fuzzy msgid "Create a Search Folder for this subject" -msgstr "ସୃଷ୍ଟି କର a ଖୋଜନ୍ତୁ ଫୋଲଡର ପାଇଁ ଏହା" +msgstr "ଏହି ବିଷୟ ପାଇଁ ଗୋଟିଏ ସନ୍ଧାନ ଫୋଲଡର ନିର୍ମାଣ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:19 -#, fuzzy msgid "Create a rule to filter messages from this sender" -msgstr "ସୃଷ୍ଟି କର a ନିୟମ କୁ ଠାରୁ ଏହା" +msgstr "ଏହି ପ୍ରେରକମାନଙ୍କ ପାଇଁ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଛାଣିବା ପାଇଁ ଗୋଟିଏ ନିୟମ ସୃଷ୍ଟି କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:20 -#, fuzzy msgid "Create a rule to filter messages to these recipients" -msgstr "ସୃଷ୍ଟି କର a ନିୟମ କୁ କୁ" +msgstr "ଏହି ଗ୍ରାହକମାନଙ୍କ ପାଇଁ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଛାଣିବା ପାଇଁ ଗୋଟିଏ ନିୟମ ସୃଷ୍ଟି କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:21 -#, fuzzy msgid "Create a rule to filter messages to this mailing list" -msgstr "ସୃଷ୍ଟି କର a ନିୟମ କୁ କୁ ଏହା ତାଲିକା" +msgstr "ଏହି ମେଲ ତାଲିକାକୁ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଛାଣିବା ପାଇଁ ଗୋଟିଏ ନିୟମ ସୃଷ୍ଟି କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:22 -#, fuzzy msgid "Create a rule to filter messages with this subject" -msgstr "ସୃଷ୍ଟି କର a ନିୟମ କୁ ସହିତ ଏହା" +msgstr "ଏହି ବିଷୟ ସହିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଛାଣିବା ପାଇଁ ଗୋଟିଏ ନିୟମ ସୃଷ୍ଟି କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:23 -#, fuzzy msgid "Cut selected messages to the clipboard" -msgstr "କାଟ ଚୟିତ କୁ କ୍ଲିପବୋର୍ଡ " +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ କ୍ଲିପବୋର୍ଡକୁ କାଟନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:24 msgid "Decrease the text size" msgstr "ପାଠ୍ୟର ଆକାର କମ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:26 -#, fuzzy msgid "Display the next important message" -msgstr "ପ୍ରଦର୍ଶନ" +msgstr "ପରବର୍ତ୍ତି ଦରକାରୀ ସନ୍ଦେଶକୁ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:27 -#, fuzzy msgid "Display the next message" -msgstr "ପ୍ରଦର୍ଶନ" +msgstr "ପରବର୍ତ୍ତି ସନ୍ଦେଶକୁ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:28 -#, fuzzy msgid "Display the next thread" -msgstr "ପ୍ରଦର୍ଶନ" +msgstr "ପରବର୍ତ୍ତି ଥ୍ରେଡ଼କୁ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:29 -#, fuzzy msgid "Display the next unread message" -msgstr "ପ୍ରଦର୍ଶନ ଅପଠିତ" +msgstr "ପରବର୍ତ୍ତି ଅପଠିତ ସନ୍ଦେଶକୁ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:30 -#, fuzzy msgid "Display the previous important message" -msgstr "ପ୍ରଦର୍ଶନ" +msgstr "ପୂର୍ବର ଦରକାରୀ ସନ୍ଦେଶକୁ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:31 -#, fuzzy msgid "Display the previous message" -msgstr "ପ୍ରଦର୍ଶନ" +msgstr "ପୂର୍ବ ସନ୍ଦେଶକୁ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:32 -#, fuzzy msgid "Display the previous unread message" -msgstr "ପ୍ରଦର୍ଶନ ଅପଠିତ" +msgstr "ପୂର୍ବରୁ ପଢ଼ାହୋଇନଥିବା ସନ୍ଦେଶକୁ ଦର୍ଶାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:33 msgid "F_orward As..." @@ -20570,57 +20352,48 @@ msgid "Filter on Mailing _List..." msgstr "ମେଲିଙ୍ଗ ତାଲିକାରେ ଛାଣନ୍ତୁ (_L)..." #: ../ui/evolution-mail-message.xml.h:35 -#, fuzzy msgid "Filter on Se_nder..." -msgstr "ଫିଲଟର ରେ." +msgstr "ପ୍ରେରକ ଅନୁସାରେ ଛାଣନ୍ତୁ (_n)..." #: ../ui/evolution-mail-message.xml.h:36 msgid "Filter on _Recipients..." msgstr "ଗ୍ରହଣ କର୍ତ୍ତା ପାଖରେ ଛାଣନ୍ତୁ (_R)..." #: ../ui/evolution-mail-message.xml.h:37 -#, fuzzy msgid "Filter on _Subject..." -msgstr "ଫିଲଟର ରେ ବିଷଯ." +msgstr "ବିଷୟ ଅନୁସାରେ ଛାଣନ୍ତୁ (_S)..." #: ../ui/evolution-mail-message.xml.h:38 -#, fuzzy msgid "Filter the selected messages for junk status" -msgstr "ଫିଲଟର ଚୟିତ ପାଇଁ" +msgstr "ଅଦରକାରୀ ସ୍ଥିତି ପାଇଁ ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଛାଣନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:39 -#, fuzzy msgid "Flag selected messages for follow-up" -msgstr "ଚୟିତ ପାଇଁ ଅନୁସରଣକର ଉପର" +msgstr "ଅନୁସରଣ କରିବା ପାଇଁ ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ସୂଚାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:40 msgid "Follow _Up..." msgstr "ଅନୁସରଣ କରନ୍ତୁ (_U)..." #: ../ui/evolution-mail-message.xml.h:41 -#, fuzzy msgid "Force images in HTML mail to be loaded" -msgstr " ବଳ ଇଞ୍ଚ HTML ଡାକ କୁ" +msgstr "HTML ମେଲରେ ଥିବା ପ୍ରତିଛବିଗୁଡ଼ିକୁ ଧାରଣ ହେବା ପାଇଁ ବାଧ୍ଯକରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:43 -#, fuzzy msgid "Forward the selected message in the body of a new message" -msgstr "ଆଗକୁ ଚୟିତ ଇଞ୍ଚ ର a ନୂତନ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଗୋଟିଏ ନୂତନ ସନ୍ଦେଶ ଭିତରେ ପଠାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:44 -#, fuzzy msgid "Forward the selected message quoted like a reply" -msgstr "ଆଗକୁ ଚୟିତ ସଦୃଶ a" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଉତ୍ତର ପରି ଉଦ୍ଧୃତ କରି ପଠାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:45 -#, fuzzy msgid "Forward the selected message to someone" -msgstr "ଆଗକୁ ଚୟିତ କୁ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ କାହା ପାଖକୁ ପଠାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:46 -#, fuzzy msgid "Forward the selected message to someone as an attachment" -msgstr "ଆଗକୁ ଚୟିତ କୁ ସଂଲଗ୍ନକ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ କାହା ପାଖକୁ ସଂଲଗ୍ନ କରି ପଠାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:47 msgid "Increase the text size" @@ -20631,44 +20404,36 @@ msgid "Mar_k as" msgstr "ପରି ଚିହ୍ନଟ କରନ୍ତୁ (_k)" #: ../ui/evolution-mail-message.xml.h:50 -#, fuzzy msgid "Mark the selected messages as having been read" -msgstr "ଚୟିତ ପଢନ୍ତୁ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଢ଼ାହୋଇଥିବା ପରି ଚିହ୍ନଟ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:51 -#, fuzzy msgid "Mark the selected messages as important" -msgstr "ଚୟିତ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଦରକାରୀ ପରି ଚିହ୍ନଟ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:52 -#, fuzzy msgid "Mark the selected messages as junk" -msgstr "ଚୟିତ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅଦରକାରୀ ପରି ଚିହ୍ନଟ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:53 -#, fuzzy msgid "Mark the selected messages as not being junk" -msgstr "ଚୟିତ ନୁହେଁ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅଦରକାରୀ ନୁହଁ ପରି ଚିହ୍ନଟ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:54 -#, fuzzy msgid "Mark the selected messages as not having been read" -msgstr "ଚୟିତ ନୁହେଁ ପଢନ୍ତୁ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଢ଼ାହୋଇନଥିବା ପରି ଚିହ୍ନଟ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:55 -#, fuzzy msgid "Mark the selected messages as unimportant" -msgstr "ଚୟିତ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅଦରକାରୀ ପରି ଚିହ୍ନଟ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:56 -#, fuzzy msgid "Mark the selected messages for deletion" -msgstr "ଚୟିତ ପାଇଁ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅପସାରଣ ପାଇଁ ଚିହ୍ନଟ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:57 -#, fuzzy msgid "Move selected messages to another folder" -msgstr "ଘୁଞ୍ଚାଅ ଚୟିତ କୁ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅନ୍ୟ ଏକ ଫୋଲଡରକୁ ଘୁଞ୍ଚାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:59 msgid "Next _Important Message" @@ -20687,19 +20452,16 @@ msgid "Not Junk" msgstr "Junk ନୁହଁ" #: ../ui/evolution-mail-message.xml.h:63 -#, fuzzy msgid "Open a window for composing a mail message" -msgstr "ଖୋଲନ୍ତୁ a ୱିଣ୍ଡୋ ପାଇଁ a ଡାକ" +msgstr "ମେଲ ସନ୍ଦେଶ ଲେଖିବା ପାଇଁ ଗୋଟିଏ ୱିଣ୍ଡୋ ଖୋଲନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:64 -#, fuzzy msgid "Open the selected messages in a new window" -msgstr "ଖୋଲନ୍ତୁ ଚୟିତ ଇଞ୍ଚ a ନୂତନ ୱିଣ୍ଡୋ" +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଗୋଟିଏ ନୂତନ ୱିଣ୍ଡୋରେ ଖୋଲନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:65 -#, fuzzy msgid "Open the selected messages in the composer for editing" -msgstr "ଖୋଲନ୍ତୁ ଚୟିତ ଇଞ୍ଚ ପାଇଁ" +msgstr "ସମ୍ପାଦନ ପାଇଁ ରଚୟିତାରେ ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଖୋଲନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:66 msgid "P_revious Unread Message" @@ -20718,24 +20480,20 @@ msgid "Post a Repl_y" msgstr "ଉତ୍ତର ଦାଖଲ କରନ୍ତୁ (_y)" #: ../ui/evolution-mail-message.xml.h:70 -#, fuzzy msgid "Post a message to a Public folder" -msgstr "ପୋଷ୍ଟ a କୁ a ସାର୍ବଜନୀନ" +msgstr "ଗୋଟିଏ ସାର୍ବଜନୀନ ଫୋଲଡରରେ ସନ୍ଦେଶ ପଠାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:71 -#, fuzzy msgid "Post a reply to a message in a Public folder" -msgstr "ପୋଷ୍ଟ a କୁ a ଇଞ୍ଚ a ସାର୍ବଜନୀନ" +msgstr "ଗୋଟିଏ ସାର୍ବଜନୀନ ଫୋଲଡରରେ ସନ୍ଦେଶ ପାଇଁ ଉତ୍ତର ପୋଷ୍ଟ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:72 -#, fuzzy msgid "Pr_evious Important Message" -msgstr "ଗୁରୁତ୍ବପୂର୍ଣ୍ଣ ସନ୍ଦେଶ" +msgstr "ପୂର୍ବତନ ଗୁରୁତ୍ବପୂର୍ଣ୍ଣ ସନ୍ଦେଶ (_e)" #: ../ui/evolution-mail-message.xml.h:73 -#, fuzzy msgid "Preview the message to be printed" -msgstr "ପୂର୍ବଦୃଶ୍ଯ କୁ" +msgstr "ମୁଦ୍ରଣ କରିବାକୁ ଥିବା ସନ୍ଦେଶକୁ ପ୍ରାକଦର୍ଶନ କରନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:77 msgid "Print this message" @@ -20743,12 +20501,11 @@ msgstr "ଏହି ସନ୍ଦେଶକୁ ମୁଦ୍ରଣ କରନ୍ତୁ #: ../ui/evolution-mail-message.xml.h:78 msgid "Re_direct" -msgstr "" +msgstr "ପୁଣି ପଠାନ୍ତୁ (_d)" #: ../ui/evolution-mail-message.xml.h:79 -#, fuzzy msgid "Redirect (bounce) the selected message to someone" -msgstr "ପୁଣି ପଠାନ୍ତୁ ଚୟିତ କୁ" +msgstr "ଚୟିତ ସନ୍ଦେଶକୁ କେହି ଜଣକ ପାଖକୁ ପୁଣି ପଠାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:84 msgid "Reset the text to its original size" @@ -21406,7 +21163,6 @@ msgid "Type of view:" msgstr "ପ୍ରଦର୍ଶନ କରିବାର ପ୍ରକାର:" #: ../widgets/misc/e-attachment.c:936 -#, fuzzy #| msgid "Attached message" #| msgid_plural "%d attached messages" msgid "Attached message" @@ -21415,95 +21171,88 @@ msgstr "ସଂଲଗ୍ନିତ ସନ୍ଦେଶ" #. Translators: Default attachment filename. #: ../widgets/misc/e-attachment.c:1709 ../widgets/misc/e-attachment.c:2258 #: ../widgets/misc/e-attachment-store.c:627 -#, fuzzy #| msgid "attachment" msgid "attachment.dat" -msgstr "ସଂଲଗ୍ନକ" +msgstr "attachment.dat" #: ../widgets/misc/e-attachment.c:1756 ../widgets/misc/e-attachment.c:2560 msgid "A load operation is already in progress" -msgstr "" +msgstr "ଗୋଟିଏ ଧାରଣ ପ୍ରୟୋଗ ପୂର୍ବରୁ ଅଗ୍ରସର ହେଉଛି" #: ../widgets/misc/e-attachment.c:1764 ../widgets/misc/e-attachment.c:2568 msgid "A save operation is already in progress" msgstr "" #: ../widgets/misc/e-attachment.c:1857 -#, fuzzy, c-format +#, c-format #| msgid "Could not load address book" msgid "Could not load '%s'" -msgstr "ଠିକଣା ପୁସ୍ତିକାକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ" +msgstr "'%s' କୁ ଧାରଣ କରିପାରିଲା ନାହିଁ" #: ../widgets/misc/e-attachment.c:1860 -#, fuzzy, c-format +#, c-format #| msgid "Could not open the link." msgid "Could not load the attachment" -msgstr "ସଂଯୋଗକୁ ଖୋଲିପାରିଲା ନାହିଁ।" +msgstr "ସଂଲଗ୍ନକକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ" #: ../widgets/misc/e-attachment.c:2135 -#, fuzzy, c-format +#, c-format #| msgid "Could not open source" msgid "Could not open '%s'" -msgstr "ଉତ୍ସକୁ ଖୋଲିପାରିଲା ନାହିଁ" +msgstr "'%s' କୁ ଖୋଲିପାରିଲା ନାହିଁ" #: ../widgets/misc/e-attachment.c:2138 -#, fuzzy, c-format +#, c-format #| msgid "Could not open the link." msgid "Could not open the attachment" -msgstr "ସଂଯୋଗକୁ ଖୋଲିପାରିଲା ନାହିଁ।" +msgstr "ସଂଲଗ୍ନକକୁ ଖୋଲିପାରିଲା ନାହିଁ" #: ../widgets/misc/e-attachment.c:2576 -#, fuzzy #| msgid "Attachment Reminder" msgid "Attachment contents not loaded" -msgstr "ସଂଲଗ୍ନକ ସ୍ମରଣକର୍ତ୍ତା" +msgstr "ସଂଲଗ୍ନକ ବିଷୟବସ୍ତୁଗୁଡ଼ିକୁ ଧାରଣ କରାଯାଇନାହିଁ" #: ../widgets/misc/e-attachment.c:2653 -#, fuzzy, c-format +#, c-format #| msgid "Could not execute '%s': %s\n" msgid "Could not save '%s'" -msgstr "Could not execute '%s': %s\n" +msgstr "'%s' କୁ ସଂରକ୍ଷଣ କରିପାରିଲା ନାହିଁ" #: ../widgets/misc/e-attachment.c:2656 -#, fuzzy, c-format +#, c-format #| msgid "Select folder to save all attachments" msgid "Could not save the attachment" -msgstr "ସମସ୍ତ ସଂଲଗ୍ନଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ଫୋଲଡର ମନୋନୀତ କରନ୍ତୁ" +msgstr "ସଂଲଗ୍ନକକୁ ସଂରକ୍ଷଣ କରିପାରିଲା ନାହିଁ" #: ../widgets/misc/e-attachment-dialog.c:305 msgid "Attachment Properties" msgstr "ସଂଲଗ୍ନ ବିଶେଷତାଗୁଡିକ" #: ../widgets/misc/e-attachment-dialog.c:328 -#, fuzzy msgid "_Filename:" -msgstr "F:" +msgstr "ଫାଇଲ ନାମ (_F):" #: ../widgets/misc/e-attachment-dialog.c:363 -#, fuzzy #| msgid "MIME Type" msgid "MIME Type:" -msgstr "MIME ପ୍ରକାର" +msgstr "MIME ପ୍ରକାର:" #: ../widgets/misc/e-attachment-handler-image.c:95 -#, fuzzy #| msgid "Set as _Background" msgid "Could not set as background" -msgstr "ପ୍ରୁଷ୍ଠଭୂମି ଭାବରେ ବିନ୍ଯାସ କରନ୍ତୁ (_B)" +msgstr "ପୃଷ୍ଠଭୂମି ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ" #: ../widgets/misc/e-attachment-icon-view.c:473 #: ../widgets/misc/e-attachment-tree-view.c:517 -#, fuzzy #| msgid "Loading..." msgid "Loading" -msgstr "ଧାରଣ କରୁଅଛି..." +msgstr "ଧାରଣ କରୁଅଛି" #: ../widgets/misc/e-attachment-icon-view.c:485 #: ../widgets/misc/e-attachment-tree-view.c:529 -#, fuzzy #| msgid "Shading" msgid "Saving" -msgstr "ଛାୟା" +msgstr "ସଂରକ୍ଷଣ କରୁଅଛି" #: ../widgets/misc/e-attachment-paned.c:80 msgid "Hide _Attachment Bar" @@ -21515,38 +21264,35 @@ msgid "Show _Attachment Bar" msgstr "ସଂଲଗ୍ନ ପଟି ଦେଖାନ୍ତୁ (_A)" #: ../widgets/misc/e-attachment-store.c:533 -#, fuzzy #| msgid "Attachment" #| msgid_plural "Attachments" msgid "Add Attachment" -msgstr "ସଂଲଗ୍ନ" +msgstr "ସଂଲଗ୍ନକକୁ ଯୋଗ କରନ୍ତୁ" #: ../widgets/misc/e-attachment-store.c:536 msgid "A_ttach" msgstr "ସଂଲଗ୍ନ କରନ୍ତୁ (_t)" #: ../widgets/misc/e-attachment-store.c:598 -#, fuzzy msgid "Save Attachment" msgid_plural "Save Attachments" -msgstr[0] "ସଂରକ୍ଷଣ କରନ୍ତୁ" -msgstr[1] "ସଂରକ୍ଷଣ କରନ୍ତୁ" +msgstr[0] "ସଂଲଗ୍ନକକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" +msgstr[1] "ସଂଲଗ୍ନକଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" #: ../widgets/misc/e-attachment-view.c:299 msgid "S_ave All" msgstr "ସମସ୍ତଙ୍କୁ ସଂରକ୍ଷଣ କରନ୍ତୁ (_a)" #: ../widgets/misc/e-attachment-view.c:325 -#, fuzzy #| msgid "_Add attachment..." msgid "A_dd Attachment..." -msgstr "ସଂଲଗ୍ନକ ଯୋଗ କରନ୍ତୁ (_A)..." +msgstr "ସଂଲଗ୍ନକ ଯୋଗ କରନ୍ତୁ (_d)..." #: ../widgets/misc/e-attachment-view.c:648 -#, fuzzy, c-format +#, c-format #| msgid "Save attachment as" msgid "Open this attachment in %s" -msgstr "ସଂଲଗ୍ନକକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ " +msgstr "ଏହି ସଂଲଗ୍ନକକୁ %s ରେ ଖୋଲନ୍ତୁ" #. This is a strftime() format. %B = Month name, %Y = Year. #: ../widgets/misc/e-calendar-item.c:1267 @@ -22025,10 +21771,9 @@ msgid "_All information" msgstr "ସମସ୍ତ ସୂଚନା (_A)" #: ../widgets/misc/e-send-options.glade.h:30 -#, fuzzy #| msgid "_Classification" msgid "_Classification:" -msgstr "ବିଭାଜନ (_C)" +msgstr "ଶ୍ରେଣୀ ବିଭାଜନ (_C):" #. To translators: This means Delay the message delivery for some time #: ../widgets/misc/e-send-options.glade.h:32 @@ -22232,6 +21977,8 @@ msgid "" "To add a column to your table, drag it into\n" "the location in which you want it to appear." msgstr "" +"ଆପଣଙ୍କ ସାରଣୀରେ ଗୋଟିଏ ସ୍ତମ୍ଭ ଯୋଡ଼ିବା ପାଇଁ, ତାହାକୁ\n" +"ଆପଣ ଚାହୁଁଥିବା ସ୍ଥାନକୁ ଟାଣନ୍ତୁ।" #: ../widgets/table/e-table-group-container.c:343 #, c-format diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index fa0de9c5c1..474dba871d 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -59,7 +59,7 @@ struct _EComponentRegistryClass { enum _EComponentRegistryField { ECR_FIELD_ID, ECR_FIELD_ALIAS, - ECR_FIELD_SCHEMA, + ECR_FIELD_SCHEMA }; struct _EComponentInfo { diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 224dd67171..289c5cbea8 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -27,7 +27,6 @@ #include <gtk/gtk.h> #include <glib/gprintf.h> -#include <libgnome/gnome-exec.h> #include <glib/gi18n.h> #include <gio/gio.h> @@ -60,27 +59,25 @@ /* Utility functions. */ static void -launch_pilot_settings (const char *extra_arg) +launch_pilot_settings (void) { - char *args[] = { - "gpilotd-control-applet", - (char *) extra_arg, - NULL - }; - int pid; - - args[0] = g_find_program_in_path ("gpilotd-control-applet"); - if (!args[0]) { + GError* error = NULL; + + gchar* args = g_find_program_in_path ("gpilotd-control-applet"); + if (args == NULL) { e_notice (NULL, GTK_MESSAGE_ERROR, - _("The GNOME Pilot tools do not appear to be installed on this system.")); + _("The GNOME Pilot tools do not appear to be installed on this system.")); return; - } + } - pid = gnome_execute_async (NULL, extra_arg ? 2 : 1, args); - g_free (args[0]); + g_spawn_command_line_async (args, &error); + g_free (args); - if (pid == -1) - e_notice (NULL, GTK_MESSAGE_ERROR, _("Error executing %s."), args[0]); + if (error != NULL) { + e_notice (NULL, GTK_MESSAGE_ERROR, + _("Error executing %s. (%s)"), args, error->message); + g_error_free (error); + } } @@ -1082,7 +1079,7 @@ command_pilot_settings (BonoboUIComponent *uih, EShellWindow *window, const char *path) { - launch_pilot_settings (NULL); + launch_pilot_settings (); } diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 9d6905203b..548e987588 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -913,7 +913,7 @@ store_window_size (GtkWidget* widget) g_object_unref(client); E_SHELL_WINDOW (widget)->priv->store_window_size_timer = 0; - return FALSE; // remove this timeout + return FALSE; /* remove this timeout */ } static void diff --git a/shell/es-event.h b/shell/es-event.h index ca12eb22dd..ed248d11df 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -49,7 +49,7 @@ enum _es_event_target_t { /* Flags that qualify TARGET_STATE */ enum { ES_EVENT_STATE_ONLINE = 1<<0, - ES_EVENT_STATE_OFFLINE = 1<<1, + ES_EVENT_STATE_OFFLINE = 1<<1 }; typedef struct _ESEventTargetState ESEventTargetState; diff --git a/shell/es-menu.h b/shell/es-menu.h index 7ea4df5576..89f60112c6 100644 --- a/shell/es-menu.h +++ b/shell/es-menu.h @@ -39,13 +39,13 @@ typedef struct _ESMenuClass ESMenuClass; /* Current target description */ /* Types of popup tagets */ enum _es_menu_target_t { - ES_MENU_TARGET_SHELL, + ES_MENU_TARGET_SHELL }; /* Flags that describe a TARGET_SHELL */ enum { ES_MENU_SHELL_ONLINE = 1<<0, - ES_MENU_SHELL_OFFLINE = 1<<1, + ES_MENU_SHELL_OFFLINE = 1<<1 }; typedef struct _ESMenuTargetShell ESMenuTargetShell; diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h index 130d90920c..542a211745 100644 --- a/smime/gui/e-cert-selector.h +++ b/smime/gui/e-cert-selector.h @@ -54,7 +54,7 @@ struct _ECertSelectorClass { enum _e_cert_selector_type { E_CERT_SELECTOR_SIGNER, - E_CERT_SELECTOR_RECIPIENT, + E_CERT_SELECTOR_RECIPIENT }; GType e_cert_selector_get_type (void); diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h index b761730ec3..d0cdb05d27 100644 --- a/smime/lib/e-asn1-object.h +++ b/smime/lib/e-asn1-object.h @@ -65,7 +65,7 @@ enum { E_ASN1_OBJECT_TYPE_HIGH_TAG_NUMBER = 31, E_ASN1_OBJECT_TYPE_CONTEXT_SPECIFIC = 32, E_ASN1_OBJECT_TYPE_APPLICATION = 33, - E_ASN1_OBJECT_TYPE_PRIVATE = 34, + E_ASN1_OBJECT_TYPE_PRIVATE = 34 }; struct _EASN1Object { diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index cbede0a5fe..2146fc3d32 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -1225,10 +1225,10 @@ e_cert_get_asn1_struct (ECert *cert) gboolean e_cert_mark_for_deletion (ECert *cert) { - // nsNSSShutDownPreventionLock locker; + /* nsNSSShutDownPreventionLock locker; */ #if 0 - // make sure user is logged in to the token + /* make sure user is logged in to the token */ nsCOMPtr<nsIInterfaceRequestor> ctx = new PipUIContext(); #endif diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 98f16d6e75..759a7fd1d6 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -271,7 +271,7 @@ import_from_file_helper (EPKCS12 *pkcs12, PK11SlotInfo *slot, #ifdef notyet /* XXX we need this to check the gerror */ if (NS_ERROR_ABORT == rv) { - // inputToDecoder indicated a NSS error + /* inputToDecoder indicated a NSS error */ srv = SECFailure; } #else diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml index 0acbc44647..f90e737c24 100644 --- a/ui/evolution-mail-message.xml +++ b/ui/evolution-mail-message.xml @@ -127,13 +127,6 @@ _tip="Open the selected messages in a new window" accel="*Control*o"/> - <cmd name="MailPost" - _tip="Post a message to a Public folder"/> - - <cmd name="MessagePostReply" - _tip="Post a reply to a message in a Public folder" - accel=""/> - <cmd name="MessageRedirect" _tip="Redirect (bounce) the selected message to someone" accel=""/> @@ -301,7 +294,6 @@ <submenu name="Message" _label="_Message"> <placeholder name="MessageTopActions"> <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/> - <menuitem name="MailPost" verb="" _label="Pos_t New Message to Folder"/> <menuitem name="MessageOpen" verb="" _label="_Open in New Window"/> <menuitem name="MessageEdit" verb="" _label="_Edit as New Message..."/> <menuitem name="AddSenderToAddressbook" verb="" _label="A_dd Sender to Address Book"/> @@ -325,7 +317,6 @@ <menuitem name="MessageReplySender" verb="" _label="_Reply to Sender"/> <menuitem name="MessageReplyList" verb="" _label="Reply to _List"/> <menuitem name="MessageReplyAll" verb="" _label="Reply to _All"/> - <menuitem name="MessagePostReply" verb="" _label="Post a Repl_y"/> <menuitem name="MessageForward" verb="" _label="_Forward"/> <submenu name="ForwardAs" _label="F_orward As..."> <menuitem verb="MessageForwardAttached" _label="_Attached"/> diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 142806d514..bad4c20bc6 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -35,7 +35,7 @@ G_DEFINE_TYPE (GalViewInstanceSaveAsDialog, gal_view_instance_save_as_dialog, GT /* The arguments we take */ enum { PROP_0, - PROP_INSTANCE, + PROP_INSTANCE }; enum { diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index ebde2b5c0e..21f30b697c 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -57,7 +57,7 @@ account_combo_box_has_dupes (GList *list, for (iter = list; iter != NULL; iter = iter->next) { EAccount *account = iter->data; - if (strcmp (account->id->address, address) == 0) + if (g_ascii_strcasecmp (account->id->address, address) == 0) count++; } diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 9d0fe6d21e..216a60d32a 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -360,12 +360,35 @@ e_attachment_store_add_to_multipart (EAttachmentStore *store, CamelMultipart *multipart, const gchar *default_charset) { + GList *list, *iter; + + g_return_if_fail (E_IS_ATTACHMENT_STORE (store)); + g_return_if_fail (CAMEL_MULTIPART (multipart)); + + list = e_attachment_store_get_attachments (store); + + for (iter = list; iter != NULL; iter = iter->next) { + EAttachment *attachment = iter->data; + + /* Skip the attachment if it's still loading. */ + if (!e_attachment_get_loading (attachment)) + e_attachment_add_to_multipart ( + attachment, multipart, default_charset); + } + + g_list_foreach (list, (GFunc) g_object_unref, NULL); + g_list_free (list); +} + +GList * +e_attachment_store_get_attachments (EAttachmentStore *store) +{ + GList *list = NULL; GtkTreeModel *model; GtkTreeIter iter; gboolean valid; - g_return_if_fail (E_IS_ATTACHMENT_STORE (store)); - g_return_if_fail (CAMEL_MULTIPART (multipart)); + g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), NULL); model = GTK_TREE_MODEL (store); valid = gtk_tree_model_get_iter_first (model, &iter); @@ -377,15 +400,12 @@ e_attachment_store_add_to_multipart (EAttachmentStore *store, column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; gtk_tree_model_get (model, &iter, column_id, &attachment, -1); - /* Skip the attachment if it's still loading. */ - if (!e_attachment_get_loading (attachment)) - e_attachment_add_to_multipart ( - attachment, multipart, default_charset); - - g_object_unref (attachment); + list = g_list_prepend (list, attachment); valid = gtk_tree_model_iter_next (model, &iter); } + + return g_list_reverse (list); } const gchar * @@ -422,60 +442,48 @@ e_attachment_store_get_num_attachments (EAttachmentStore *store) guint e_attachment_store_get_num_loading (EAttachmentStore *store) { - GtkTreeModel *model; - GtkTreeIter iter; + GList *list, *iter; guint num_loading = 0; - gboolean valid; g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), 0); - model = GTK_TREE_MODEL (store); - valid = gtk_tree_model_get_iter_first (model, &iter); + list = e_attachment_store_get_attachments (store); - while (valid) { - EAttachment *attachment; - gint column_id; + for (iter = list; iter != NULL; iter = iter->next) { + EAttachment *attachment = iter->data; - column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; - gtk_tree_model_get (model, &iter, column_id, &attachment, -1); if (e_attachment_get_loading (attachment)) num_loading++; - g_object_unref (attachment); - - valid = gtk_tree_model_iter_next (model, &iter); } + g_list_foreach (list, (GFunc) g_object_unref, NULL); + g_list_free (list); + return num_loading; } goffset e_attachment_store_get_total_size (EAttachmentStore *store) { - GtkTreeModel *model; - GtkTreeIter iter; + GList *list, *iter; goffset total_size = 0; - gboolean valid; g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), 0); - model = GTK_TREE_MODEL (store); - valid = gtk_tree_model_get_iter_first (model, &iter); + list = e_attachment_store_get_attachments (store); - while (valid) { - EAttachment *attachment; + for (iter = list; iter != NULL; iter = iter->next) { + EAttachment *attachment = iter->data; GFileInfo *file_info; - gint column_id; - column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; - gtk_tree_model_get (model, &iter, column_id, &attachment, -1); file_info = e_attachment_get_file_info (attachment); if (file_info != NULL) total_size += g_file_info_get_size (file_info); - g_object_unref (attachment); - - valid = gtk_tree_model_iter_next (model, &iter); } + g_list_foreach (list, (GFunc) g_object_unref, NULL); + g_list_free (list); + return total_size; } @@ -839,11 +847,13 @@ e_attachment_store_get_uris_async (EAttachmentStore *store, /* Any remaining attachments in the list should have MIME parts * only, so we need to save them all to a temporary directory. - * We use a directory so the files can retain their basenames. */ + * We use a directory so the files can retain their basenames. + * XXX This could trigger a blocking temp directory cleanup. */ template = g_strdup_printf (PACKAGE "-%s-XXXXXX", g_get_user_name ()); path = e_mkdtemp (template); g_free (template); + /* XXX Let's hope errno got set property. */ if (path == NULL) { GSimpleAsyncResult *simple; @@ -871,6 +881,7 @@ e_attachment_store_get_uris_async (EAttachmentStore *store, uri_context); g_object_unref (temp_directory); + g_free (path); } gchar ** diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h index e7f89b7f6c..9fdd74d493 100644 --- a/widgets/misc/e-attachment-store.h +++ b/widgets/misc/e-attachment-store.h @@ -84,6 +84,8 @@ void e_attachment_store_add_to_multipart (EAttachmentStore *store, CamelMultipart *multipart, const gchar *default_charset); +GList * e_attachment_store_get_attachments + (EAttachmentStore *store); const gchar * e_attachment_store_get_current_folder (EAttachmentStore *store); void e_attachment_store_set_current_folder diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 27ef5d84a8..48292cfbc3 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -1038,6 +1038,12 @@ e_attachment_view_remove_selected (EAttachmentView *view, store = e_attachment_view_get_store (view); model = GTK_TREE_MODEL (store); + /* Remove attachments in reverse order to avoid invalidating + * tree paths as we iterate over the list. Note, the list is + * probably already sorted but we sort again just to be safe. */ + selected = g_list_reverse (g_list_sort ( + selected, (GCompareFunc) gtk_tree_path_compare)); + for (item = selected; item != NULL; item = item->next) { EAttachment *attachment; GtkTreePath *path = item->data; diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 537a3470d7..e4e336e58b 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -418,6 +418,10 @@ attachment_progress_cb (goffset current_num_bytes, goffset total_num_bytes, EAttachment *attachment) { + /* Avoid dividing by zero. */ + if (total_num_bytes == 0) + return; + attachment->priv->percent = (current_num_bytes * 100) / total_num_bytes; @@ -1493,6 +1497,12 @@ attachment_load_finish (LoadContext *load_context) if (disposition != NULL) camel_mime_part_set_disposition (mime_part, disposition); + /* Correctly report the size of zero length special files. */ + if (g_file_info_get_size (file_info) == 0) { + g_file_info_set_size (file_info, size); + attachment_set_file_info (attachment, file_info); + } + g_simple_async_result_set_op_res_gpointer ( simple, mime_part, (GDestroyNotify) camel_object_unref); @@ -2015,16 +2025,18 @@ attachment_open_save_finished_cb (EAttachment *attachment, static void attachment_open_save_temporary (OpenContext *open_context) { - GFile *file; + GFile *temp_directory; gchar *template; gchar *path; GError *error = NULL; errno = 0; - /* XXX This could trigger a blocking temp directory cleanup. */ + /* Save the file to a temporary directory. + * We use a directory so the files can retain their basenames. + * XXX This could trigger a blocking temp directory cleanup. */ template = g_strdup_printf (PACKAGE "-%s-XXXXXX", g_get_user_name ()); - path = e_mktemp (template); + path = e_mkdtemp (template); g_free (template); /* XXX Let's hope errno got set properly. */ @@ -2038,15 +2050,15 @@ attachment_open_save_temporary (OpenContext *open_context) if (attachment_open_check_for_error (open_context, error)) return; - file = g_file_new_for_path (path); - - g_free (path); + temp_directory = g_file_new_for_path (path); e_attachment_save_async ( - open_context->attachment, file, (GAsyncReadyCallback) + open_context->attachment, + temp_directory, (GAsyncReadyCallback) attachment_open_save_finished_cb, open_context); - g_object_unref (file); + g_object_unref (temp_directory); + g_free (path); } void diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 77cad661e1..4d300f01d4 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -74,7 +74,7 @@ enum { PROP_X1, PROP_X2, PROP_Y1, - PROP_Y2, + PROP_Y2 }; static void diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 3cb85c5839..903331576e 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -837,7 +837,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id) if (func) func(info->item, flags, info->id); g_message ("ECANVAS: free info (2): item %p, id %p", - info->item, info->id); + (gpointer) info->item, (gpointer) info->id); g_object_unref (info->item); g_free(info); } @@ -851,7 +851,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id) info->item = item; g_object_ref (info->item); info->id = id; - g_message ("ECANVAS: new info item %p, id %p", item, id); + g_message ("ECANVAS: new info item %p, id %p", (gpointer) item, (gpointer) id); flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR; func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item), @@ -920,7 +920,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id) info->item = item; g_object_ref (info->item); info->id = id; - g_message ("ECANVAS: new info (2): item %p, id %p", item, id); + g_message ("ECANVAS: new info (2): item %p, id %p", (gpointer) item, (gpointer) id); func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item), "ECanvasItem::selection_callback"); @@ -967,7 +967,7 @@ e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id) canvas->cursor = NULL; g_message ("ECANVAS: removing info: item %p, info %p", - info->item, info->id); + (gpointer) info->item, (gpointer) info->id); g_object_unref (info->item); g_free(info); g_list_free_1(list); diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index cf3f758ce7..87652974cb 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -49,7 +49,7 @@ typedef enum { E_CHARSET_TURKISH, E_CHARSET_UNICODE, E_CHARSET_WESTERN_EUROPEAN, - E_CHARSET_WESTERN_EUROPEAN_NEW, + E_CHARSET_WESTERN_EUROPEAN_NEW } ECharsetClass; static const char *classnames[] = { diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index a52756943c..ac5012b7d2 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -49,7 +49,7 @@ static ESearchBarClass *parent_class = NULL; enum { PROP_0, PROP_QUERY, - PROP_STATE, + PROP_STATE }; diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index e1d4fc7def..be7e26c83b 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -98,7 +98,7 @@ enum { E_FILTERBAR_CURRENT_MESSAGE_ID = -6, E_FILTERBAR_CURRENT_FOLDER_ID = -7, E_FILTERBAR_CURRENT_ACCOUNT_ID = -8, - E_FILTERBAR_ALL_ACCOUNTS_ID = -9, + E_FILTERBAR_ALL_ACCOUNTS_ID = -9 }; #define E_FILTERBAR_SAVE { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, 0 } diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 30cba7f074..9cf158021c 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -60,7 +60,7 @@ enum { PROP_0, PROP_ITEM_ID, PROP_SUBITEM_ID, - PROP_TEXT, + PROP_TEXT }; diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 1f7072d988..105777311c 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -49,7 +49,7 @@ G_BEGIN_DECLS enum _ESearchBarItemType { ESB_ITEMTYPE_NORMAL, ESB_ITEMTYPE_CHECK, - ESB_ITEMTYPE_RADIO, + ESB_ITEMTYPE_RADIO }; typedef enum _ESearchBarItemType ESearchBarItemType; diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index b9a8544f57..f6cb11e509 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -152,15 +152,15 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, /* Now cause our subcells to draw their contents, shifted by subcell_offset pixels */ int width = allotted_width * hbox_view->def_size_cols[i] / 100; - //e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); -// if (width < hbox_view->def_size_cols[i]) - // width = hbox_view->def_size_cols[i]; -// printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); + /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); + if (width < hbox_view->def_size_cols[i]) + width = hbox_view->def_size_cols[i]; + printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */ e_cell_draw (hbox_view->subcell_views[i], drawable, hbox_view->model_cols[i], view_col, row, flags, x1 + subcell_offset , y1, x1 + subcell_offset + width, y2); - subcell_offset += width; //e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); + subcell_offset += width; /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); */ } } diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 8d90267a5e..892ff7cc5d 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -31,7 +31,7 @@ G_DEFINE_TYPE (ETableCol, e_table_col, G_TYPE_OBJECT) enum { PROP_0, - PROP_COMPARE_COL, + PROP_COMPARE_COL }; static void diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 5becaa30f2..510b5074f6 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -54,7 +54,7 @@ enum { enum { PROP_0, - PROP_STATE, + PROP_STATE }; enum { diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 69a300d950..f8321011b2 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -656,7 +656,7 @@ e_table_setup_header (ETable *e_table) gtk_widget_show (GTK_WIDGET (e_table->header_canvas)); - pointer = g_strdup_printf("%p", e_table); + pointer = g_strdup_printf("%p", (gpointer) e_table); e_table->header_item = gnome_canvas_item_new ( gnome_canvas_root (e_table->header_canvas), diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 4eef7a9ad6..2b903ca0bc 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -36,7 +36,7 @@ enum { PROP_CURSOR_ROW, PROP_CURSOR_COL, PROP_MODEL, - PROP_ETTA, + PROP_ETTA }; struct ETreeSelectionModelPriv { diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 10c29fbf10..416f8aa026 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -757,16 +757,6 @@ etta_proxy_no_change (ETreeModel *etm, ETreeTableAdapter *etta) e_table_model_no_change(E_TABLE_MODEL(etta)); } -static gboolean -remove_all (gpointer key, gpointer value, gpointer data) -{ - GNode *gn = (GNode *) data; - if (data) - g_free (gn->data); - - return TRUE; -} - static void etta_proxy_rebuilt (ETreeModel *etm, ETreeTableAdapter *etta) { diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 0963229c94..2eba9d4a82 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -704,7 +704,7 @@ e_tree_setup_header (ETree *e_tree) gtk_widget_show (GTK_WIDGET (e_tree->priv->header_canvas)); - pointer = g_strdup_printf("%p", e_tree); + pointer = g_strdup_printf("%p", (gpointer) e_tree); e_tree->priv->header_item = gnome_canvas_item_new ( gnome_canvas_root (e_tree->priv->header_canvas), |