From 766adb9bff7a5c8ada0d18cafd3643e647fb6f23 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 01 Feb 2010 17:13:46 +0000 Subject: Assorted string fixes Assorted string fixes, fixing some missing words, incorrect capitalisation; and converting ellipses and dashes into the appropriate Unicode characters. --- diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c index 88c7b0c..e26db4a 100644 --- a/backend/djvu/djvu-document.c +++ b/backend/djvu/djvu-document.c @@ -170,7 +170,7 @@ djvu_document_load (EvDocument *document, g_set_error_literal (error, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_INVALID, - _("DJVU document has incorrect format")); + _("DjVu document has incorrect format")); return FALSE; } @@ -248,7 +248,7 @@ djvu_document_load (EvDocument *document, G_FILE_ERROR, G_FILE_ERROR_EXIST, _("The document is composed of several files. " - "One or more of such files cannot be accessed.")); + "One or more of these files cannot be accessed.")); return FALSE; } diff --git a/backend/djvu/djvudocument.evince-backend.in b/backend/djvu/djvudocument.evince-backend.in index 716dabf..485af11 100644 --- a/backend/djvu/djvudocument.evince-backend.in +++ b/backend/djvu/djvudocument.evince-backend.in @@ -1,4 +1,4 @@ [Evince Backend] Module=djvudocument -_TypeDescription=Djvu Documents +_TypeDescription=DjVu Documents MimeType=image/vnd.djvu diff --git a/backend/impress/zip.c b/backend/impress/zip.c index 6d06f10..b1f25c8 100644 --- a/backend/impress/zip.c +++ b/backend/impress/zip.c @@ -56,13 +56,13 @@ zip_error (int err) ret = _("Not enough memory"); break; case ZIP_NOSIG: - ret = _("Cannot find zip signature"); + ret = _("Cannot find ZIP signature"); break; case ZIP_BADZIP: - ret = _("Invalid zip file"); + ret = _("Invalid ZIP file"); break; case ZIP_NOMULTI: - ret = _("Multi file zips are not supported"); + ret = _("Multi file ZIPs are not supported"); break; case ZIP_EOPEN: ret = _("Cannot open the file"); @@ -71,7 +71,7 @@ zip_error (int err) ret = _("Cannot read data from file"); break; case ZIP_NOFILE: - ret = _("Cannot find file in the zip archive"); + ret = _("Cannot find file in the ZIP archive"); break; default: ret = _("Unknown error"); diff --git a/data/evince.desktop.in.in b/data/evince.desktop.in.in index 91ab97f..512767e 100644 --- a/data/evince.desktop.in.in +++ b/data/evince.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] _Name=Document Viewer _GenericName=Document Viewer -_Comment=View multipage documents +_Comment=View multi-page documents TryExec=evince Exec=evince %U StartupNotify=true diff --git a/libview/ev-print-operation.c b/libview/ev-print-operation.c index 0f6e607..85ba06c 100644 --- a/libview/ev-print-operation.c +++ b/libview/ev-print-operation.c @@ -338,11 +338,11 @@ ev_print_operation_update_status (EvPrintOperation *op, if (page == -1) { /* Initial state */ - op->status = g_strdup (_("Preparing to print ...")); + op->status = g_strdup (_("Preparing to print…")); } else if (page > n_pages) { - op->status = g_strdup (_("Finishing...")); + op->status = g_strdup (_("Finishing…")); } else { - op->status = g_strdup_printf (_("Printing page %d of %d..."), + op->status = g_strdup_printf (_("Printing page %d of %d…"), page, n_pages); } @@ -1234,7 +1234,7 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog *dial "%s", _("Invalid page selection")); gtk_window_set_title (GTK_WINDOW (message_dialog), _("Warning")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog), - "%s", _("Your print range selection does not include any page")); + "%s", _("Your print range selection does not include any pages")); g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); @@ -1903,7 +1903,7 @@ ev_print_operation_print_create_custom_widget (EvPrintOperationPrint *print, "• \"None\": No page scaling is performed.\n" "\n" "• \"Shrink to Printable Area\": Document pages larger than the printable area" - " are reduced fit the printable area of the printer page.\n" + " are reduced to fit the printable area of the printer page.\n" "\n" "• \"Fit to Printable Area\": Document pages are enlarged or reduced as" " required to fit the printable area of the printer page.\n")); diff --git a/libview/ev-view.c b/libview/ev-view.c index 7314740..760cf04 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -3923,7 +3923,7 @@ draw_loading_text (EvView *view, gint width, height; if (!view->loading_text) { - const gchar *loading_text = _("Loading..."); + const gchar *loading_text = _("Loading…"); PangoLayout *layout; PangoFontDescription *font_desc; PangoRectangle logical_rect; diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c index 0b73100..23d477e 100644 --- a/properties/ev-properties-view.c +++ b/properties/ev-properties-view.c @@ -281,11 +281,11 @@ ev_regular_paper_size (const EvDocumentInfo *info) units = get_default_user_units (); if (units == GTK_UNIT_MM) { - exact_size = g_strdup_printf(_("%.0f x %.0f mm"), + exact_size = g_strdup_printf(_("%.0f × %.0f mm"), info->paper_width, info->paper_height); } else { - exact_size = g_strdup_printf (_("%.2f x %.2f inch"), + exact_size = g_strdup_printf (_("%.2f × %.2f inch"), info->paper_width / 25.4f, info->paper_height / 25.4f); } diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c index a71e423..4935b67 100644 --- a/shell/ev-password-view.c +++ b/shell/ev-password-view.c @@ -374,7 +374,7 @@ ev_password_view_ask_password (EvPasswordView *password_view) gtk_widget_show (choice); group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice)); - choice = gtk_radio_button_new_with_mnemonic (group, _("Remember password until you _logout")); + choice = gtk_radio_button_new_with_mnemonic (group, _("Remember password until you _log out")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (choice), password_view->priv->password_save == G_PASSWORD_SAVE_FOR_SESSION); g_object_set_data (G_OBJECT (choice), "password-save", diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c index 1670616..c3a9c0a 100644 --- a/shell/ev-properties-fonts.c +++ b/shell/ev-properties-fonts.c @@ -159,7 +159,7 @@ update_progress_label (GtkWidget *label, double progress) { if (progress > 0) { char *progress_text; - progress_text = g_strdup_printf (_("Gathering font information... %3d%%"), + progress_text = g_strdup_printf (_("Gathering font information… %3d%%"), (int) (progress * 100)); gtk_label_set_text (GTK_LABEL (label), progress_text); g_free (progress_text); diff --git a/shell/ev-sidebar-layers.c b/shell/ev-sidebar-layers.c index 5f16895..5c9bbbd 100644 --- a/shell/ev-sidebar-layers.c +++ b/shell/ev-sidebar-layers.c @@ -122,7 +122,7 @@ ev_sidebar_layers_create_loading_model (void) G_TYPE_INT); gtk_list_store_append (GTK_LIST_STORE (retval), &iter); - markup = g_strdup_printf ("%s", _("Loading...")); + markup = g_strdup_printf ("%s", _("Loading…")); gtk_list_store_set (GTK_LIST_STORE (retval), &iter, EV_DOCUMENT_LAYERS_COLUMN_TITLE, markup, EV_DOCUMENT_LAYERS_COLUMN_VISIBLE, FALSE, diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index 6eb7e23..4c2b7fe 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -259,7 +259,7 @@ create_loading_model (void) G_TYPE_STRING); gtk_list_store_append (GTK_LIST_STORE (retval), &iter); - markup = g_strdup_printf ("%s", _("Loading...")); + markup = g_strdup_printf ("%s", _("Loading…")); gtk_list_store_set (GTK_LIST_STORE (retval), &iter, EV_DOCUMENT_LINKS_COLUMN_MARKUP, markup, EV_DOCUMENT_LINKS_COLUMN_EXPAND, FALSE, @@ -332,7 +332,7 @@ build_popup_menu (EvSidebarLinks *sidebar) menu = gtk_menu_new (); item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL); - gtk_label_set_label (GTK_LABEL (GTK_BIN (item)->child), _("Print...")); + gtk_label_set_label (GTK_LABEL (GTK_BIN (item)->child), _("Print…")); gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "activate", diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c index ca2429b..2fcb3d9 100644 --- a/shell/ev-window-title.c +++ b/shell/ev-window-title.c @@ -159,7 +159,7 @@ ev_window_title_update (EvWindowTitle *window_title) gtk_window_set_title (window, title); break; case EV_WINDOW_TITLE_PASSWORD: - password_title = g_strdup_printf (_("%s - Password Required"), title); + password_title = g_strdup_printf (_("%s — Password Required"), title); gtk_window_set_title (window, password_title); g_free (password_title); break; diff --git a/shell/ev-window.c b/shell/ev-window.c index 3714831..9d1f99a 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -830,7 +830,7 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link) } if (find_task.chapter) - link_title = g_strdup_printf (_("Page %s - %s"), page_label, find_task.chapter); + link_title = g_strdup_printf (_("Page %s — %s"), page_label, find_task.chapter); else link_title = g_strdup_printf (_("Page %s"), page_label); @@ -4195,7 +4195,7 @@ build_comments_string (void) } return g_strdup_printf (_("Document Viewer.\n" - "Using poppler %s (%s)"), + "Using Poppler %s (%s)"), version, backend_name); #else return g_strdup_printf (_("Document Viewer")); @@ -5007,19 +5007,19 @@ static const GtkActionEntry entries[] = { { "Help", NULL, N_("_Help") }, /* File menu */ - { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "O", + { "FileOpen", GTK_STOCK_OPEN, N_("_Open…"), "O", N_("Open an existing document"), G_CALLBACK (ev_window_cmd_file_open) }, { "FileOpenCopy", NULL, N_("Op_en a Copy"), "N", N_("Open a copy of the current document in a new window"), G_CALLBACK (ev_window_cmd_file_open_copy) }, - { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "S", + { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy…"), "S", N_("Save a copy of the current document"), G_CALLBACK (ev_window_cmd_save_as) }, - { "FilePageSetup", GTK_STOCK_PAGE_SETUP, N_("Page Set_up..."), NULL, - N_("Setup the page settings for printing"), + { "FilePageSetup", GTK_STOCK_PAGE_SETUP, N_("Page Set_up…"), NULL, + N_("Set up the page settings for printing"), G_CALLBACK (ev_window_cmd_file_print_setup) }, - { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "P", + { "FilePrint", GTK_STOCK_PRINT, N_("_Print…"), "P", N_("Print this document"), G_CALLBACK (ev_window_cmd_file_print) }, { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "Return", NULL, @@ -5032,7 +5032,7 @@ static const GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_edit_copy) }, { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "A", NULL, G_CALLBACK (ev_window_cmd_edit_select_all) }, - { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "F", + { "EditFind", GTK_STOCK_FIND, N_("_Find…"), "F", N_("Find a word or phrase in the document"), G_CALLBACK (ev_window_cmd_edit_find) }, { "EditFindNext", NULL, N_("Find Ne_xt"), "G", NULL, @@ -5187,7 +5187,7 @@ static const GtkActionEntry view_popup_entries [] = { NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) }, { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL, NULL, G_CALLBACK (ev_view_popup_cmd_copy_link_address) }, - { "SaveImageAs", NULL, N_("_Save Image As..."), NULL, + { "SaveImageAs", NULL, N_("_Save Image As…"), NULL, NULL, G_CALLBACK (ev_view_popup_cmd_save_image_as) }, { "CopyImage", NULL, N_("Copy _Image"), NULL, NULL, G_CALLBACK (ev_view_popup_cmd_copy_image) }, @@ -5196,7 +5196,7 @@ static const GtkActionEntry view_popup_entries [] = { static const GtkActionEntry attachment_popup_entries [] = { { "OpenAttachment", GTK_STOCK_OPEN, N_("_Open Attachment"), NULL, NULL, G_CALLBACK (ev_attachment_popup_cmd_open_attachment) }, - { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As..."), NULL, + { "SaveAttachmentAs", GTK_STOCK_SAVE_AS, N_("_Save Attachment As…"), NULL, NULL, G_CALLBACK (ev_attachment_popup_cmd_save_attachment_as) }, }; @@ -5275,7 +5275,7 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) action = g_object_new (EV_TYPE_OPEN_RECENT_ACTION, "name", "FileOpenRecent", - "label", _("_Open..."), + "label", _("_Open…"), "tooltip", _("Open an existing document"), "stock_id", GTK_STOCK_OPEN, NULL); diff --git a/shell/main.c b/shell/main.c index e906ac6..2b926c9 100644 --- a/shell/main.c +++ b/shell/main.c @@ -83,7 +83,7 @@ static const GOptionEntry goption_options[] = { "unlink-tempfile", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL }, { "print-settings", 't', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &print_settings, NULL, NULL }, { "version", 0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, option_version_cb, NULL, NULL }, - { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") }, + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE…]") }, { NULL } }; diff --git a/thumbnailer/evince-thumbnailer.schemas.in b/thumbnailer/evince-thumbnailer.schemas.in index 5644067..40221be 100644 --- a/thumbnailer/evince-thumbnailer.schemas.in +++ b/thumbnailer/evince-thumbnailer.schemas.in @@ -9,7 +9,7 @@ true Enable thumbnailing of PDF Documents - Boolean options available, true enables thumbnailing and false disables the creation of new thumbnails + Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails @@ -22,7 +22,7 @@ evince-thumbnailer -s %s %u %o Thumbnail command for PDF Documents - Valid command plus arguments for the PDF Document thumbnailer. See nautilus thumbnailer documentation for more information. + Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. @@ -34,7 +34,7 @@ true Enable thumbnailing of PDF Documents - Boolean options available, true enables thumbnailing and false disables the creation of new thumbnails + Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails @@ -47,7 +47,7 @@ evince-thumbnailer -s %s %u %o Thumbnail command for PDF Documents - Valid command plus arguments for the PDF Document thumbnailer. See nautilus thumbnailer documentation for more information. + Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. @@ -59,7 +59,7 @@ true Enable thumbnailing of PDF Documents - Boolean options available, true enables thumbnailing and false disables the creation of new thumbnails + Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails @@ -72,7 +72,7 @@ evince-thumbnailer -s %s %u %o Thumbnail command for PDF Documents - Valid command plus arguments for the PDF Document thumbnailer. See nautilus thumbnailer documentation for more information. + Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. -- cgit v0.9.1