Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xreader for openSUSE:Factory checked in at 2021-06-22 20:44:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xreader (Old) and /work/SRC/openSUSE:Factory/.xreader.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xreader" Tue Jun 22 20:44:53 2021 rev:29 rq:897763 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xreader/xreader.changes 2021-01-30 13:57:52.410407792 +0100 +++ /work/SRC/openSUSE:Factory/.xreader.new.2625/xreader.changes 2021-06-22 20:44:55.314821965 +0200 @@ -1,0 +2,19 @@ +Thu Jun 3 09:12:57 UTC 2021 - andy great <andythe_gr...@pm.me> + +- Update to version 3.0.0. + * Fixes #457. Allows space bar to scroll document forward + * Move metadata to non-legacy path + * Fixes #463. Moves annotations below the text. + * packaging: Fix metadata location. + * Fixes #473. Jump to Page functionality + * enter event on presentation mode + * readme updated + * show the total number of words matching the search result + * fix segfault in epub backend when opening a filename containing a hash + * epub: Fix unescaping of '#' (#487) + * control+f and space behaviours fixed in search bar (#488) + * Fix grammar error spotted by lintian (#489) + * l10n: Don't include gsettings schema in translations + * l10n: Update POT + +------------------------------------------------------------------- Old: ---- xreader-2.8.3.tar.gz New: ---- xreader-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xreader.spec ++++++ --- /var/tmp/diff_new_pack.1Fd5Tm/_old 2021-06-22 20:44:55.806822506 +0200 +++ /var/tmp/diff_new_pack.1Fd5Tm/_new 2021-06-22 20:44:55.810822511 +0200 @@ -20,7 +20,7 @@ %define typelib1 typelib-1_0-XreaderDocument-1_5 %define typelib2 typelib-1_0-XreaderView-1_5 Name: xreader -Version: 2.8.3 +Version: 3.0.0 Release: 0 Summary: Document viewer for documents like PDF/PostScript License: GPL-2.0-only AND LGPL-2.0-only @@ -258,8 +258,8 @@ %{_datadir}/dbus-1/services/*.service %{_datadir}/glib-2.0/schemas/*.xml %{_datadir}/applications/%{name}.desktop -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/xreader.appdata.xml %{_datadir}/icons/hicolor/*/*/* %{_datadir}/help/C/%{name} %{_mandir}/man?/*.?%{?ext_man} ++++++ xreader-2.8.3.tar.gz -> xreader-3.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/README new/xreader-3.0.0/README --- old/xreader-2.8.3/README 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/README 2021-06-01 15:28:13.000000000 +0200 @@ -124,9 +124,15 @@ Requirements to Run Tests ------------------------- +1) Install prerequisites: + - python-dogtail [ https://fedorahosted.org/dogtail/ ] - python-pyatspi2 [ http://download.gnome.org/sources/pyatspi/ ] +2) Now you can run GUI test: + + ninja test -C debian/build/ + Optional Programs ----------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/backend/epub/epub-document.c new/xreader-3.0.0/backend/epub/epub-document.c --- old/xreader-2.8.3/backend/epub/epub-document.c 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/backend/epub/epub-document.c 2021-06-01 15:28:13.000000000 +0200 @@ -1283,7 +1283,8 @@ pagelink->str = g_uri_unescape_string (escaped,NULL); g_free(escaped); - if ((end = g_strrstr(pagelink->str,"#")) != NULL) { + // cut off fragment after '#', only in the last segment of path + if ((end = g_strrstr(pagelink->str,"#")) != NULL && (end > g_strrstr(pagelink->str,"/"))) { fragment = g_strdup(g_strrstr(pagelink->str,"#")); *end = '\0'; } @@ -1630,7 +1631,7 @@ contentListNode *pagedata; guint flag=0; - while (!flag) { + while (!flag && listiter != NULL) { pagedata = listiter->data; if (link_present_on_page(Link->pagelink, pagedata->value)) { flag=1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/backend/pdf/ev-poppler.cc new/xreader-3.0.0/backend/pdf/ev-poppler.cc --- old/xreader-2.8.3/backend/pdf/ev-poppler.cc 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/backend/pdf/ev-poppler.cc 2021-06-01 15:28:13.000000000 +0200 @@ -2991,13 +2991,13 @@ PopplerQuadrilateral *quad = &g_array_index (quads, PopplerQuadrilateral, i); quad->p1.x = r->x1; - quad->p1.y = height - r->y2; + quad->p1.y = height - r->y1; quad->p2.x = r->x2; - quad->p2.y = height - r->y2; + quad->p2.y = height - r->y1; quad->p3.x = r->x1; - quad->p3.y = height - r->y1; + quad->p3.y = height - r->y2; quad->p4.x = r->x2; - quad->p4.y = height - r->y1; + quad->p4.y = height - r->y2; poppler_rectangle_free (r); if (!bbox) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/cut-n-paste/synctex/synctex_parser.c new/xreader-3.0.0/cut-n-paste/synctex/synctex_parser.c --- old/xreader-2.8.3/cut-n-paste/synctex/synctex_parser.c 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/cut-n-paste/synctex/synctex_parser.c 2021-06-01 15:28:13.000000000 +0200 @@ -2075,7 +2075,7 @@ available = 1; status = _synctex_buffer_get_available_size(scanner,&available); if (status<SYNCTEX_STATUS_OK && available>0){ - _synctex_error("Uncomplete sheet(0)"); + _synctex_error("Incomplete sheet(0)"); SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); } goto prepare_loop; @@ -2104,7 +2104,7 @@ _synctex_error("Unexpected end of vbox, ignored."); } if (_synctex_next_line(scanner)<SYNCTEX_STATUS_OK) { - _synctex_error("Uncomplete sheet."); + _synctex_error("Incomplete sheet."); SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); } # if SYNCTEX_VERBOSE @@ -2156,7 +2156,7 @@ _synctex_error("Unexpected end of hbox, ignored."); } if (_synctex_next_line(scanner)<SYNCTEX_STATUS_OK) { - _synctex_error("Uncomplete sheet."); + _synctex_error("Incomplete sheet."); SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); } # if SYNCTEX_VERBOSE @@ -2332,7 +2332,7 @@ available = 1; status = _synctex_buffer_get_available_size(scanner,&available); if (status<SYNCTEX_STATUS_OK && available>0){ - _synctex_error("Uncomplete sheet(0)"); + _synctex_error("Incomplete sheet(0)"); SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); } else { goto child_loop; @@ -2566,7 +2566,7 @@ if (status<SYNCTEX_STATUS_OK && available>0){ goto sibling_loop; } else { - _synctex_error("Uncomplete sheet(2)"); + _synctex_error("Incomplete sheet(2)"); SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); } } @@ -2608,7 +2608,7 @@ return status; } if (_synctex_next_line(scanner)<SYNCTEX_STATUS_OK) { - _synctex_error("Uncomplete Content."); + _synctex_error("Incomplete Content."); return SYNCTEX_STATUS_ERROR; } if (status == SYNCTEX_STATUS_NOT_OK) { @@ -2642,7 +2642,7 @@ } status = _synctex_next_line(scanner); if (status<SYNCTEX_STATUS_OK) { - _synctex_error("Uncomplete file."); + _synctex_error("Incomplete file."); goto bail; } status = _synctex_scan_sheet(scanner,sheet); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/data/meson.build new/xreader-3.0.0/data/meson.build --- old/xreader-2.8.3/data/meson.build 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/data/meson.build 2021-06-01 15:28:13.000000000 +0200 @@ -46,7 +46,7 @@ output: 'xreader.appdata.xml', command: [intltool_merge, '-x', '-u', po_dir, '@INPUT@', '@OUTPUT@'], install: true, - install_dir: join_paths(datadir, 'appdata'), + install_dir: join_paths(datadir, 'metainfo'), ) install_data( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/debian/changelog new/xreader-3.0.0/debian/changelog --- old/xreader-2.8.3/debian/changelog 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/debian/changelog 2021-06-01 15:28:13.000000000 +0200 @@ -1,3 +1,43 @@ +xreader (3.0.0) uma; urgency=medium + + [ icarter09 ] + * Fixes #457. Allows space bar to scroll document forward + + [ Soapux ] + * Move metadata to non-legacy path + + [ icarter09 ] + * Fixes #463. Moves annotations below the text. + + [ Michael Webster ] + * packaging: Fix metadata location. + + [ icarter09 ] + * Fixes #473. Jump to Page functionality + + [ musa ] + * enter event on presentation mode + + [ m8 ] + * readme updated + * show the total number of words matching the search result + + [ dejj ] + * fix segfault in epub backend when opening a filename containing a hash + * epub: Fix unescaping of '#' (#487) + + [ Musa Unal ] + * control+f and space behaviours fixed in search bar (#488) + + [ Joshua Peisach ] + * Fix grammar error spotted by lintian (#489) + + [ Clement Lefebvre ] + * l10n: Don't include gsettings schema in translations + * l10n: Update POT + + -- Clement Lefebvre <r...@linuxmint.com> Tue, 01 Jun 2021 14:27:53 +0100 + xreader (2.8.3) ulyssa; urgency=medium [ Isaac Carter ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/debian/xreader-common.install new/xreader-3.0.0/debian/xreader-common.install --- old/xreader-2.8.3/debian/xreader-common.install 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/debian/xreader-common.install 2021-06-01 15:28:13.000000000 +0200 @@ -1,4 +1,4 @@ -usr/share/appdata/ +usr/share/metainfo/ usr/share/xreader/ #usr/share/gtk-doc/ docs temporarily disabled because it doesn't work for meson < 0.48 usr/share/help/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/libview/ev-jobs.c new/xreader-3.0.0/libview/ev-jobs.c --- old/xreader-2.8.3/libview/ev-jobs.c 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/libview/ev-jobs.c 2021-06-01 15:28:13.000000000 +0200 @@ -1410,6 +1410,8 @@ job_find->pages[job_find->current_page] = matches; } + job_find->total_count += g_list_length(job_find->pages[job_find->current_page]); + g_signal_emit (job_find, job_find_signals[FIND_UPDATED], 0, job_find->current_page); job_find->current_page = (job_find->current_page + 1) % job_find->n_pages; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/libview/ev-jobs.h new/xreader-3.0.0/libview/ev-jobs.h --- old/xreader-2.8.3/libview/ev-jobs.h 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/libview/ev-jobs.h 2021-06-01 15:28:13.000000000 +0200 @@ -349,6 +349,7 @@ gint start_page; gint current_page; gint n_pages; + guint total_count; GList **pages; guint *results; gchar *text; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/libview/ev-view-presentation.c new/xreader-3.0.0/libview/ev-view-presentation.c --- old/xreader-2.8.3/libview/ev-view-presentation.c 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/libview/ev-view-presentation.c 2021-06-01 15:28:13.000000000 +0200 @@ -650,9 +650,9 @@ GtkWindow *toplevel, *goto_window; toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pview))); - goto_window = GTK_WINDOW (pview->goto_window); if (pview->goto_window) { + goto_window = GTK_WINDOW (pview->goto_window); if (gtk_window_has_group (toplevel)) gtk_window_group_add_window (gtk_window_get_group (toplevel), goto_window); else if (gtk_window_has_group (goto_window)) @@ -662,6 +662,7 @@ } pview->goto_window = gtk_window_new (GTK_WINDOW_POPUP); + goto_window = GTK_WINDOW (pview->goto_window); gtk_window_set_screen (goto_window, gtk_widget_get_screen (GTK_WIDGET (pview))); if (gtk_window_has_group (toplevel)) @@ -1486,6 +1487,9 @@ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0, "change_page", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0, + "change_page", 1, + GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0, "change_page", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/libview/ev-view.c new/xreader-3.0.0/libview/ev-view.c --- old/xreader-2.8.3/libview/ev-view.c 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/libview/ev-view.c 2021-06-01 15:28:13.000000000 +0200 @@ -5763,6 +5763,10 @@ "activate", 0); gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0, "activate", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, + GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, + GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/meson.build new/xreader-3.0.0/meson.build --- old/xreader-2.8.3/meson.build 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/meson.build 2021-06-01 15:28:13.000000000 +0200 @@ -1,4 +1,4 @@ -project('xreader', 'c', 'cpp', version : '2.8.3') +project('xreader', 'c', 'cpp', version : '3.0.0') gnome = import('gnome') i18n = import('i18n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/po/POTFILES.in new/xreader-3.0.0/po/POTFILES.in --- old/xreader-2.8.3/po/POTFILES.in 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/po/POTFILES.in 2021-06-01 15:28:13.000000000 +0200 @@ -22,7 +22,6 @@ cut-n-paste/zoom-control/ephy-zoom.h data/xreader.appdata.xml.in data/xreader.desktop.in.in -[type: gettext/gsettings]data/org.x.reader.gschema.xml previewer/ev-previewer.c previewer/ev-previewer-window.c libmisc/ev-page-action.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/shell/eggfindbar.c new/xreader-3.0.0/shell/eggfindbar.c --- old/xreader-2.8.3/shell/eggfindbar.c 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/shell/eggfindbar.c 2021-06-01 15:28:13.000000000 +0200 @@ -271,13 +271,6 @@ widget = gtk_widget_get_parent (widget); } - /* if widget == bar, the new focus widget is in the bar, so we - * don't deactivate. - */ - if (widget != wbar) - { - g_signal_emit (bar, find_bar_signals[CLOSE], 0); - } } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/shell/ev-window.c new/xreader-3.0.0/shell/ev-window.c --- old/xreader-2.8.3/shell/ev-window.c 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/shell/ev-window.c 2021-06-01 15:28:13.000000000 +0200 @@ -4029,13 +4029,6 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window) { - if (gtk_widget_is_visible (ev_window->priv->find_bar)) - { - update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE); - update_chrome_visibility (ev_window); - return; - } - if (ev_window->priv->document == NULL || !EV_IS_DOCUMENT_FIND (ev_window->priv->document)) { g_error ("Find action should be insensitive since document doesn't support find"); return; @@ -4924,6 +4917,12 @@ if (window->priv->document && !window->priv->document->iswebdocument && window->priv->view) ev_view_autoscroll_stop (EV_VIEW (window->priv->view)); + if (gtk_widget_is_visible (window->priv->find_bar)) { + update_chrome_flag (window, EV_CHROME_FINDBAR, FALSE); + update_chrome_visibility (window); + return; + } + widget = gtk_window_get_focus (GTK_WINDOW (window)); if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) { update_chrome_flag (window, EV_CHROME_FINDBAR, FALSE); @@ -5500,10 +5499,10 @@ /* TRANS: Sometimes this could be better translated as "%d hit(s) on this page". Therefore this string contains plural cases. */ - message = g_strdup_printf (ngettext ("%d found on this page", - "%d found on this page", - n_results), - n_results); + message = g_strdup_printf (ngettext ("%d found on this page (%d total)", + "%d found on this page (%d total)", + n_results), + n_results, job_find->total_count); } else { message = g_strdup (_("Not found")); } @@ -8061,6 +8060,10 @@ G_CALLBACK (find_bar_next_cb), ev_window); g_signal_connect (ev_window->priv->find_bar, + "close", + G_CALLBACK (find_bar_close_cb), + ev_window); + g_signal_connect (ev_window->priv->find_bar, "notify::search-string", G_CALLBACK (find_bar_search_changed_cb), ev_window); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-2.8.3/xreader.pot new/xreader-3.0.0/xreader.pot --- old/xreader-2.8.3/xreader.pot 2021-01-12 12:23:41.000000000 +0100 +++ new/xreader-3.0.0/xreader.pot 2021-06-01 15:28:13.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-27 17:14+0000\n" +"POT-Creation-Date: 2021-06-01 14:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -62,7 +62,7 @@ msgid "No images found in archive %s" msgstr "" -#: ../backend/comics/comics-document.c:866 ../backend/epub/epub-document.c:1812 +#: ../backend/comics/comics-document.c:866 ../backend/epub/epub-document.c:1813 #, c-format msgid "There was an error deleting ???%s???." msgstr "" @@ -345,7 +345,7 @@ msgstr "" #. translators: this is the label for toolbar button -#: ../cut-n-paste/zoom-control/ephy-zoom.h:49 ../shell/ev-window.c:6733 +#: ../cut-n-paste/zoom-control/ephy-zoom.h:49 ../shell/ev-window.c:6732 msgid "Best Fit" msgstr "" @@ -353,7 +353,7 @@ msgid "Fit Page Width" msgstr "" -#: ../cut-n-paste/zoom-control/ephy-zoom.h:51 ../shell/ev-window.c:6285 +#: ../cut-n-paste/zoom-control/ephy-zoom.h:51 ../shell/ev-window.c:6284 msgid "Expand Window to Fit" msgstr "" @@ -435,40 +435,6 @@ msgid "View multi-page documents" msgstr "" -#: ../data/org.x.reader.gschema.xml.h:1 -msgid "Override document restrictions" -msgstr "" - -#: ../data/org.x.reader.gschema.xml.h:2 -msgid "Override document restrictions, like restriction to copy or to print." -msgstr "" - -#: ../data/org.x.reader.gschema.xml.h:3 -msgid "Automatically reload the document" -msgstr "" - -#: ../data/org.x.reader.gschema.xml.h:4 -msgid "Whether the document is automatically reloaded on file change." -msgstr "" - -#: ../data/org.x.reader.gschema.xml.h:5 -msgid "The URI of the directory last used to open or save a document." -msgstr "" - -#: ../data/org.x.reader.gschema.xml.h:6 -msgid "The URI of the directory last used to save a picture." -msgstr "" - -#: ../data/org.x.reader.gschema.xml.h:7 -msgid "Page cache size in MiB" -msgstr "" - -#: ../data/org.x.reader.gschema.xml.h:8 -msgid "" -"The maximum size that will be used to cache rendered pages, limits maximum " -"zoom level." -msgstr "" - #: ../previewer/ev-previewer.c:34 msgid "Delete the temporary file" msgstr "" @@ -491,32 +457,32 @@ msgstr "" #. Go menu -#: ../previewer/ev-previewer-window.c:281 ../shell/ev-window.c:6294 +#: ../previewer/ev-previewer-window.c:281 ../shell/ev-window.c:6293 msgid "_Previous Page" msgstr "" -#: ../previewer/ev-previewer-window.c:282 ../shell/ev-window.c:6296 +#: ../previewer/ev-previewer-window.c:282 ../shell/ev-window.c:6295 msgid "Go to the previous page" msgstr "" -#: ../previewer/ev-previewer-window.c:284 ../shell/ev-window.c:6298 +#: ../previewer/ev-previewer-window.c:284 ../shell/ev-window.c:6297 msgid "_Next Page" msgstr "" -#: ../previewer/ev-previewer-window.c:285 ../shell/ev-window.c:6300 +#: ../previewer/ev-previewer-window.c:285 ../shell/ev-window.c:6299 msgid "Go to the next page" msgstr "" -#: ../previewer/ev-previewer-window.c:288 ../shell/ev-window.c:6273 +#: ../previewer/ev-previewer-window.c:288 ../shell/ev-window.c:6272 msgid "Enlarge the document" msgstr "" -#: ../previewer/ev-previewer-window.c:291 ../shell/ev-window.c:6277 +#: ../previewer/ev-previewer-window.c:291 ../shell/ev-window.c:6276 msgid "Shrink the document" msgstr "" #. translators: this is the label for toolbar button -#: ../previewer/ev-previewer-window.c:294 ../shell/ev-window.c:6729 +#: ../previewer/ev-previewer-window.c:294 ../shell/ev-window.c:6728 msgid "Original size" msgstr "" @@ -526,31 +492,31 @@ msgid "Print" msgstr "" -#: ../previewer/ev-previewer-window.c:298 ../shell/ev-window.c:6212 +#: ../previewer/ev-previewer-window.c:298 ../shell/ev-window.c:6211 msgid "Print this document" msgstr "" -#: ../previewer/ev-previewer-window.c:341 ../shell/ev-window.c:6496 +#: ../previewer/ev-previewer-window.c:341 ../shell/ev-window.c:6495 msgid "_Best Fit" msgstr "" -#: ../previewer/ev-previewer-window.c:342 ../shell/ev-window.c:6498 +#: ../previewer/ev-previewer-window.c:342 ../shell/ev-window.c:6497 msgid "Make the current document fill the window" msgstr "" -#: ../previewer/ev-previewer-window.c:344 ../shell/ev-window.c:6500 +#: ../previewer/ev-previewer-window.c:344 ../shell/ev-window.c:6499 msgid "Fit Page _Width" msgstr "" -#: ../previewer/ev-previewer-window.c:345 ../shell/ev-window.c:6502 +#: ../previewer/ev-previewer-window.c:345 ../shell/ev-window.c:6501 msgid "Make the current document fill the window width" msgstr "" -#: ../previewer/ev-previewer-window.c:561 ../shell/ev-window.c:6677 +#: ../previewer/ev-previewer-window.c:561 ../shell/ev-window.c:6676 msgid "Page" msgstr "" -#: ../previewer/ev-previewer-window.c:562 ../shell/ev-window.c:6678 +#: ../previewer/ev-previewer-window.c:562 ../shell/ev-window.c:6677 msgid "Select Page" msgstr "" @@ -655,7 +621,7 @@ msgid "Page Handling" msgstr "" -#: ../libview/ev-jobs.c:1739 +#: ../libview/ev-jobs.c:1741 #, c-format msgid "Failed to print page %d: %s" msgstr "" @@ -680,11 +646,11 @@ msgid "Document View" msgstr "" -#: ../libview/ev-view-presentation.c:692 +#: ../libview/ev-view-presentation.c:693 msgid "Jump to page:" msgstr "" -#: ../libview/ev-view-presentation.c:996 +#: ../libview/ev-view-presentation.c:997 msgid "End of presentation. Click to exit." msgstr "" @@ -732,31 +698,31 @@ msgid "Launch %s" msgstr "" -#: ../shell/eggfindbar.c:304 +#: ../shell/eggfindbar.c:297 msgid "Find:" msgstr "" -#: ../shell/eggfindbar.c:325 ../shell/ev-window.c:6244 +#: ../shell/eggfindbar.c:318 ../shell/ev-window.c:6243 msgid "Find Pre_vious" msgstr "" -#: ../shell/eggfindbar.c:329 +#: ../shell/eggfindbar.c:322 msgid "Find previous occurrence of the search string" msgstr "" -#: ../shell/eggfindbar.c:333 ../shell/ev-window.c:6240 +#: ../shell/eggfindbar.c:326 ../shell/ev-window.c:6239 msgid "Find Ne_xt" msgstr "" -#: ../shell/eggfindbar.c:337 +#: ../shell/eggfindbar.c:330 msgid "Find next occurrence of the search string" msgstr "" -#: ../shell/eggfindbar.c:344 +#: ../shell/eggfindbar.c:337 msgid "Case Sensitive" msgstr "" -#: ../shell/eggfindbar.c:347 +#: ../shell/eggfindbar.c:340 msgid "Toggle case sensitive search" msgstr "" @@ -875,16 +841,16 @@ msgstr "" #: ../shell/ev-history.c:474 ../shell/ev-sidebar-bookmarks.c:314 -#: ../shell/ev-window.c:924 ../shell/ev-window.c:4843 +#: ../shell/ev-window.c:924 ../shell/ev-window.c:4836 #, c-format msgid "Page %s" msgstr "" -#: ../shell/ev-history-action-widget.c:215 ../shell/ev-window.c:6312 +#: ../shell/ev-history-action-widget.c:215 ../shell/ev-window.c:6311 msgid "Go to previous history item" msgstr "" -#: ../shell/ev-history-action-widget.c:219 ../shell/ev-window.c:6316 +#: ../shell/ev-history-action-widget.c:219 ../shell/ev-window.c:6315 msgid "Go to next history item" msgstr "" @@ -893,7 +859,7 @@ msgid "Password for document %s" msgstr "" -#: ../shell/ev-landing-view.c:389 ../shell/ev-window.c:6195 +#: ../shell/ev-landing-view.c:389 ../shell/ev-window.c:6194 msgid "Favorites" msgstr "" @@ -953,7 +919,7 @@ msgid "Toolbar" msgstr "" -#: ../shell/ev-preferences-dialog.c:139 ../shell/ev-window.c:6260 +#: ../shell/ev-preferences-dialog.c:139 ../shell/ev-window.c:6259 msgid "Preferences" msgstr "" @@ -1242,15 +1208,15 @@ msgid "Close _after Printing" msgstr "" -#: ../shell/ev-window.c:4258 +#: ../shell/ev-window.c:4251 msgid "Presentation mode is not supported for ePub documents" msgstr "" -#: ../shell/ev-window.c:4899 +#: ../shell/ev-window.c:4892 msgid "There was an error displaying help" msgstr "" -#: ../shell/ev-window.c:5176 +#: ../shell/ev-window.c:5175 msgid "" "Xreader is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -1258,7 +1224,7 @@ "version.\n" msgstr "" -#: ../shell/ev-window.c:5180 +#: ../shell/ev-window.c:5179 msgid "" "Xreader is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -1266,402 +1232,402 @@ "details.\n" msgstr "" -#: ../shell/ev-window.c:5184 +#: ../shell/ev-window.c:5183 msgid "" "You should have received a copy of the GNU General Public License along with " "Xreader; if not, write to the Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-1301 USA\n" msgstr "" -#: ../shell/ev-window.c:5195 +#: ../shell/ev-window.c:5194 msgid "Xreader" msgstr "" #. TRANS: Sometimes this could be better translated as #. "%d hit(s) on this page". Therefore this string #. contains plural cases. -#: ../shell/ev-window.c:5503 +#: ../shell/ev-window.c:5502 #, c-format -msgid "%d found on this page" -msgid_plural "%d found on this page" +msgid "%d found on this page (%d total)" +msgid_plural "%d found on this page (%d total)" msgstr[0] "" msgstr[1] "" -#: ../shell/ev-window.c:5508 ../shell/ev-window.c:5631 +#: ../shell/ev-window.c:5507 ../shell/ev-window.c:5630 msgid "Not found" msgstr "" -#: ../shell/ev-window.c:5514 +#: ../shell/ev-window.c:5513 #, c-format msgid "%3d%% remaining to search" msgstr "" -#: ../shell/ev-window.c:6189 +#: ../shell/ev-window.c:6188 msgid "_File" msgstr "" -#: ../shell/ev-window.c:6190 +#: ../shell/ev-window.c:6189 msgid "_Edit" msgstr "" -#: ../shell/ev-window.c:6191 +#: ../shell/ev-window.c:6190 msgid "_View" msgstr "" -#: ../shell/ev-window.c:6192 +#: ../shell/ev-window.c:6191 msgid "_Go" msgstr "" -#: ../shell/ev-window.c:6193 +#: ../shell/ev-window.c:6192 msgid "_Bookmarks" msgstr "" -#: ../shell/ev-window.c:6194 +#: ../shell/ev-window.c:6193 msgid "_Help" msgstr "" -#: ../shell/ev-window.c:6196 +#: ../shell/ev-window.c:6195 msgid "Recents" msgstr "" #. File menu -#: ../shell/ev-window.c:6198 ../shell/ev-window.c:6691 +#: ../shell/ev-window.c:6197 ../shell/ev-window.c:6690 msgid "_Open???" msgstr "" -#: ../shell/ev-window.c:6200 ../shell/ev-window.c:6692 +#: ../shell/ev-window.c:6199 ../shell/ev-window.c:6691 msgid "Open an existing document" msgstr "" -#: ../shell/ev-window.c:6202 +#: ../shell/ev-window.c:6201 msgid "Op_en a Copy" msgstr "" -#: ../shell/ev-window.c:6204 +#: ../shell/ev-window.c:6203 msgid "Open a copy of the current document in a new window" msgstr "" -#: ../shell/ev-window.c:6206 +#: ../shell/ev-window.c:6205 msgid "_Save a Copy???" msgstr "" -#: ../shell/ev-window.c:6208 +#: ../shell/ev-window.c:6207 msgid "Save a copy of the current document" msgstr "" -#: ../shell/ev-window.c:6210 +#: ../shell/ev-window.c:6209 msgid "_Print???" msgstr "" -#: ../shell/ev-window.c:6214 +#: ../shell/ev-window.c:6213 msgid "P_roperties" msgstr "" -#: ../shell/ev-window.c:6218 +#: ../shell/ev-window.c:6217 msgid "_Close All Windows" msgstr "" -#: ../shell/ev-window.c:6222 +#: ../shell/ev-window.c:6221 msgid "_Close" msgstr "" #. Edit menu -#: ../shell/ev-window.c:6228 +#: ../shell/ev-window.c:6227 msgid "_Copy" msgstr "" -#: ../shell/ev-window.c:6232 +#: ../shell/ev-window.c:6231 msgid "Select _All" msgstr "" -#: ../shell/ev-window.c:6236 +#: ../shell/ev-window.c:6235 msgid "_Find???" msgstr "" -#: ../shell/ev-window.c:6238 +#: ../shell/ev-window.c:6237 msgid "Find a word or phrase in the document" msgstr "" -#: ../shell/ev-window.c:6248 +#: ../shell/ev-window.c:6247 msgid "Rotate _Left" msgstr "" -#: ../shell/ev-window.c:6252 +#: ../shell/ev-window.c:6251 msgid "Rotate _Right" msgstr "" -#: ../shell/ev-window.c:6256 +#: ../shell/ev-window.c:6255 msgid "Save Current Settings as _Default" msgstr "" #. View menu -#: ../shell/ev-window.c:6267 +#: ../shell/ev-window.c:6266 msgid "_Original size" msgstr "" -#: ../shell/ev-window.c:6269 +#: ../shell/ev-window.c:6268 msgid "View the document at its original size" msgstr "" -#: ../shell/ev-window.c:6271 +#: ../shell/ev-window.c:6270 msgid "Zoom _In" msgstr "" -#: ../shell/ev-window.c:6275 +#: ../shell/ev-window.c:6274 msgid "Zoom _Out" msgstr "" -#: ../shell/ev-window.c:6279 +#: ../shell/ev-window.c:6278 msgid "_Reload" msgstr "" -#: ../shell/ev-window.c:6281 +#: ../shell/ev-window.c:6280 msgid "Reload the document" msgstr "" -#: ../shell/ev-window.c:6283 +#: ../shell/ev-window.c:6282 msgid "_Expand Window to Fit" msgstr "" -#: ../shell/ev-window.c:6288 +#: ../shell/ev-window.c:6287 msgid "Auto_scroll" msgstr "" -#: ../shell/ev-window.c:6302 +#: ../shell/ev-window.c:6301 msgid "_First Page" msgstr "" -#: ../shell/ev-window.c:6304 +#: ../shell/ev-window.c:6303 msgid "Go to the first page" msgstr "" -#: ../shell/ev-window.c:6306 +#: ../shell/ev-window.c:6305 msgid "_Last Page" msgstr "" -#: ../shell/ev-window.c:6308 +#: ../shell/ev-window.c:6307 msgid "Go to the last page" msgstr "" -#: ../shell/ev-window.c:6310 +#: ../shell/ev-window.c:6309 msgid "Previous History Item" msgstr "" -#: ../shell/ev-window.c:6314 +#: ../shell/ev-window.c:6313 msgid "Next History Item" msgstr "" #. Bookmarks menu -#: ../shell/ev-window.c:6320 +#: ../shell/ev-window.c:6319 msgid "_Add Bookmark" msgstr "" -#: ../shell/ev-window.c:6322 +#: ../shell/ev-window.c:6321 msgid "Add a bookmark for the current page" msgstr "" #. Help menu -#: ../shell/ev-window.c:6326 +#: ../shell/ev-window.c:6325 msgid "_Contents" msgstr "" -#: ../shell/ev-window.c:6331 +#: ../shell/ev-window.c:6330 msgid "_About" msgstr "" #. Toolbar-only -#: ../shell/ev-window.c:6337 +#: ../shell/ev-window.c:6336 msgid "Leave Fullscreen" msgstr "" -#: ../shell/ev-window.c:6339 +#: ../shell/ev-window.c:6338 msgid "Leave fullscreen mode" msgstr "" -#: ../shell/ev-window.c:6341 +#: ../shell/ev-window.c:6340 msgid "Start Presentation" msgstr "" -#: ../shell/ev-window.c:6343 +#: ../shell/ev-window.c:6342 msgid "Start a presentation" msgstr "" #. View Menu -#: ../shell/ev-window.c:6460 +#: ../shell/ev-window.c:6459 msgid "_Menubar" msgstr "" -#: ../shell/ev-window.c:6462 +#: ../shell/ev-window.c:6461 msgid "Show or hide the menubar" msgstr "" -#: ../shell/ev-window.c:6464 +#: ../shell/ev-window.c:6463 msgid "_Toolbar" msgstr "" -#: ../shell/ev-window.c:6466 +#: ../shell/ev-window.c:6465 msgid "Show or hide the toolbar" msgstr "" -#: ../shell/ev-window.c:6468 +#: ../shell/ev-window.c:6467 msgid "Side _Pane" msgstr "" -#: ../shell/ev-window.c:6470 +#: ../shell/ev-window.c:6469 msgid "Show or hide the side pane" msgstr "" -#: ../shell/ev-window.c:6472 +#: ../shell/ev-window.c:6471 msgid "_Continuous" msgstr "" -#: ../shell/ev-window.c:6474 +#: ../shell/ev-window.c:6473 msgid "Show the entire document" msgstr "" -#: ../shell/ev-window.c:6476 +#: ../shell/ev-window.c:6475 msgid "_Dual (Even pages left)" msgstr "" -#: ../shell/ev-window.c:6478 +#: ../shell/ev-window.c:6477 msgid "Show two pages at once with even pages on the left" msgstr "" -#: ../shell/ev-window.c:6480 +#: ../shell/ev-window.c:6479 msgid "Dual (_Odd pages left)" msgstr "" -#: ../shell/ev-window.c:6482 +#: ../shell/ev-window.c:6481 msgid "Show two pages at once with odd pages on the left" msgstr "" -#: ../shell/ev-window.c:6484 +#: ../shell/ev-window.c:6483 msgid "Right to Left" msgstr "" -#: ../shell/ev-window.c:6486 +#: ../shell/ev-window.c:6485 msgid "Browse the document from right to left" msgstr "" -#: ../shell/ev-window.c:6488 +#: ../shell/ev-window.c:6487 msgid "_Fullscreen" msgstr "" -#: ../shell/ev-window.c:6490 +#: ../shell/ev-window.c:6489 msgid "Expand the window to fill the screen" msgstr "" -#: ../shell/ev-window.c:6492 +#: ../shell/ev-window.c:6491 msgid "Pre_sentation" msgstr "" -#: ../shell/ev-window.c:6494 +#: ../shell/ev-window.c:6493 msgid "Run document as a presentation" msgstr "" -#: ../shell/ev-window.c:6504 +#: ../shell/ev-window.c:6503 msgid "_Inverted Colors" msgstr "" -#: ../shell/ev-window.c:6506 +#: ../shell/ev-window.c:6505 msgid "Show page contents with the colors inverted" msgstr "" #. Links -#: ../shell/ev-window.c:6514 +#: ../shell/ev-window.c:6513 msgid "_Open Link" msgstr "" -#: ../shell/ev-window.c:6516 +#: ../shell/ev-window.c:6515 msgid "_Go To" msgstr "" -#: ../shell/ev-window.c:6518 +#: ../shell/ev-window.c:6517 msgid "Open in New _Window" msgstr "" -#: ../shell/ev-window.c:6520 +#: ../shell/ev-window.c:6519 msgid "_Copy Link Address" msgstr "" -#: ../shell/ev-window.c:6522 +#: ../shell/ev-window.c:6521 msgid "_Save Image As???" msgstr "" -#: ../shell/ev-window.c:6524 +#: ../shell/ev-window.c:6523 msgid "Copy _Image" msgstr "" -#: ../shell/ev-window.c:6526 +#: ../shell/ev-window.c:6525 msgid "Annotation Properties???" msgstr "" -#: ../shell/ev-window.c:6528 +#: ../shell/ev-window.c:6527 msgid "Remove Annotation" msgstr "" -#: ../shell/ev-window.c:6533 +#: ../shell/ev-window.c:6532 msgid "_Open Attachment" msgstr "" -#: ../shell/ev-window.c:6535 +#: ../shell/ev-window.c:6534 msgid "_Save Attachment As???" msgstr "" #. translators: this is the label for toolbar button -#: ../shell/ev-window.c:6712 +#: ../shell/ev-window.c:6711 msgid "Previous" msgstr "" #. translators: this is the label for toolbar button -#: ../shell/ev-window.c:6717 +#: ../shell/ev-window.c:6716 msgid "Next" msgstr "" #. translators: this is the label for toolbar button -#: ../shell/ev-window.c:6721 +#: ../shell/ev-window.c:6720 msgid "Zoom In" msgstr "" #. translators: this is the label for toolbar button -#: ../shell/ev-window.c:6725 +#: ../shell/ev-window.c:6724 msgid "Zoom Out" msgstr "" #. translators: this is the label for toolbar button -#: ../shell/ev-window.c:6737 +#: ../shell/ev-window.c:6736 msgid "Fit Width" msgstr "" -#: ../shell/ev-window.c:6914 ../shell/ev-window.c:6930 +#: ../shell/ev-window.c:6913 ../shell/ev-window.c:6929 msgid "Unable to launch external application." msgstr "" -#: ../shell/ev-window.c:6988 +#: ../shell/ev-window.c:6987 msgid "Unable to open external link" msgstr "" -#: ../shell/ev-window.c:7189 +#: ../shell/ev-window.c:7188 msgid "Couldn't find appropriate format to save image" msgstr "" -#: ../shell/ev-window.c:7220 +#: ../shell/ev-window.c:7219 msgid "The image could not be saved." msgstr "" -#: ../shell/ev-window.c:7253 +#: ../shell/ev-window.c:7252 msgid "Save Image" msgstr "" -#: ../shell/ev-window.c:7403 +#: ../shell/ev-window.c:7402 msgid "Unable to open attachment" msgstr "" -#: ../shell/ev-window.c:7460 +#: ../shell/ev-window.c:7459 msgid "The attachment could not be saved." msgstr "" -#: ../shell/ev-window.c:7506 +#: ../shell/ev-window.c:7505 msgid "Save Attachment" msgstr ""