From cf96d52790bc8d05a9e556e33af0b6fec1a4cb0e Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Tue, 28 May 2013 17:00:37 +0200 Subject: [PATCH 01/45] Report missing plugin/unsupported file type --- document.c | 1 + zathura.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/document.c b/document.c index 2e6e557..7ca21ff 100644 --- a/document.c +++ b/document.c @@ -110,6 +110,7 @@ zathura_document_open(zathura_plugin_manager_t* plugin_manager, const char* if (plugin == NULL) { girara_error("unknown file type\n"); + error = ZATHURA_ERROR_UNKNOWN; goto error_free; } diff --git a/zathura.c b/zathura.c index cdf4eac..a0a8f57 100644 --- a/zathura.c +++ b/zathura.c @@ -562,6 +562,9 @@ document_open(zathura_t* zathura, const char* path, const char* password, zathura_document_t* document = zathura_document_open(zathura->plugins.manager, path, password, &error); if (document == NULL) { + if (error == NULL ) { + girara_notify(zathura->ui.session, GIRARA_ERROR, _("Unsupported file type. Please install the necessary plugin."), false, NULL, NULL, NULL); + } if (error == ZATHURA_ERROR_INVALID_PASSWORD) { zathura_password_dialog_info_t* password_dialog_info = malloc(sizeof(zathura_password_dialog_info_t)); if (password_dialog_info != NULL) { From cdece5922982b06e1a86dfb7dfc8cf3d225f06f0 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Tue, 28 May 2013 18:12:15 +0200 Subject: [PATCH 02/45] Fix previous commit --- zathura.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zathura.c b/zathura.c index a0a8f57..2ea324b 100644 --- a/zathura.c +++ b/zathura.c @@ -562,9 +562,6 @@ document_open(zathura_t* zathura, const char* path, const char* password, zathura_document_t* document = zathura_document_open(zathura->plugins.manager, path, password, &error); if (document == NULL) { - if (error == NULL ) { - girara_notify(zathura->ui.session, GIRARA_ERROR, _("Unsupported file type. Please install the necessary plugin."), false, NULL, NULL, NULL); - } if (error == ZATHURA_ERROR_INVALID_PASSWORD) { zathura_password_dialog_info_t* password_dialog_info = malloc(sizeof(zathura_password_dialog_info_t)); if (password_dialog_info != NULL) { @@ -581,6 +578,9 @@ document_open(zathura_t* zathura, const char* path, const char* password, } goto error_out; } + if (error == ZATHURA_ERROR_OK ) { + girara_notify(zathura->ui.session, GIRARA_ERROR, _("Unsupported file type. Please install the necessary plugin.")); + } goto error_out; } From df466eeeb2db97725ac9a18c2071843e32821899 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Tue, 28 May 2013 23:39:18 +0200 Subject: [PATCH 03/45] Fix --- document.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/document.c b/document.c index 7ca21ff..c90c2a5 100644 --- a/document.c +++ b/document.c @@ -110,7 +110,7 @@ zathura_document_open(zathura_plugin_manager_t* plugin_manager, const char* if (plugin == NULL) { girara_error("unknown file type\n"); - error = ZATHURA_ERROR_UNKNOWN; + *error = ZATHURA_ERROR_UNKNOWN; goto error_free; } From 2d9ea087295876f22ae0b2382a5151856cd95ebf Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 31 May 2013 13:46:28 +0200 Subject: [PATCH 04/45] Use show-v-scrollbar instead of show-scrollbars Signed-off-by: Sebastian Ramacher --- shortcuts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shortcuts.c b/shortcuts.c index 3af1531..0174598 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -147,10 +147,10 @@ sc_adjust_window(girara_session_t* session, girara_argument_t* argument, (double)(pages_per_row * cell_width); zathura_document_set_scale(zathura->document, scale); - bool show_scrollbars = false; - girara_setting_get(session, "show-scrollbars", &show_scrollbars); + bool show_vscrollbar = false; + girara_setting_get(session, "show-v-scrollbar", &show_vscrollbar); - if (show_scrollbars) { + if (show_vscrollbar) { /* If the document is taller than the view, there's a vertical * scrollbar; we need to substract its width from the view's width. */ zathura_get_document_size(zathura, cell_height, cell_width, From 463545c3a3a07e3f51f9419d48baa9cc2f7770c9 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 31 May 2013 14:04:41 +0200 Subject: [PATCH 05/45] Document the new show-{h, v}-scrollbar settings Signed-off-by: Sebastian Ramacher --- zathurarc.5.rst | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/zathurarc.5.rst b/zathurarc.5.rst index 80f571b..f320faa 100644 --- a/zathurarc.5.rst +++ b/zathurarc.5.rst @@ -447,7 +447,21 @@ Defines the background color for the focused tab show-scrollbars ^^^^^^^^^^^^^^^ -Defines if scrollbars should be shown or not +Defines if both the horizontal and vertical scrollbars should be shown or not + +* Value type: Boolean +* Default value: false + +show-h-scrollbar +^^^^^^^^^^^^^^^^ +Defines whether to show/hide the horizontal scrollbar + +* Value type: Boolean +* Default value: false + +show-v-scrollbar +^^^^^^^^^^^^^^^^ +Defines whether to show/hide the vertical scrollbar * Value type: Boolean * Default value: false From cc3b9aea1850286828094af7f407801f243e0d22 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Sat, 8 Jun 2013 02:46:58 +0200 Subject: [PATCH 06/45] More Vim-like search behavior This patch activates the last aborted search when pressing the search shortcuts ('n' or 'N'). To avoid confusion, and to make things more predictable, I've chosen to always reactivate an aborted search starting from the beginning (or end, in case of 'N' or '?') of the current page, as opposed to Vim which continues from the next search term each time the search is reactivated. Searching using '/' or '?' doesn't center the view at the current search term like when using 'n' or 'N', so we fix this here. Also, I managed to work around the issue of the thin rectangular margins that show around the previously-highlighted search terms after the search is aborted (either explicitly or as a result of following links), by redrawing the page widget (only if it's visible) instead of redrawing the rectangles covering the highlighted search terms. Signed-off-by: Sebastian Ramacher --- callbacks.c | 7 +++++++ commands.c | 28 ++++++++++++---------------- page-widget.c | 24 +++++++++++++++++++----- shortcuts.c | 39 ++++++++++++++++++++++++++++++++------- 4 files changed, 70 insertions(+), 28 deletions(-) diff --git a/callbacks.c b/callbacks.c index 124837c..87e2100 100644 --- a/callbacks.c +++ b/callbacks.c @@ -106,6 +106,13 @@ cb_view_vadjustment_value_changed(GtkAdjustment* GIRARA_UNUSED(adjustment), gpoi } } else { zathura_page_set_visibility(page, false); + + girara_list_t* results = NULL; + g_object_get(page_widget, "search-results", &results, NULL); + + if (results != NULL) { + g_object_set(page_widget, "search-current", 0, NULL); + } } } diff --git a/commands.c b/commands.c index 38f7470..713963b 100644 --- a/commands.c +++ b/commands.c @@ -339,7 +339,6 @@ cmd_search(girara_session_t* session, const char* input, girara_argument_t* argu return false; } - bool firsthit = true; zathura_error_t error = ZATHURA_ERROR_OK; /* set search direction */ @@ -352,10 +351,6 @@ cmd_search(girara_session_t* session, const char* input, girara_argument_t* argu bool nohlsearch = false; girara_setting_get(session, "nohlsearch", &nohlsearch); - if (nohlsearch == false) { - document_draw_search_results(zathura, true); - } - /* search pages */ for (unsigned int page_id = 0; page_id < number_of_pages; ++page_id) { unsigned int index = (page_id + current_page_number) % number_of_pages; @@ -383,20 +378,21 @@ cmd_search(girara_session_t* session, const char* input, girara_argument_t* argu } g_object_set(page_widget, "search-results", result, NULL); - if (firsthit == true) { - if (page_id != 0) { - page_set_delayed(zathura, zathura_page_get_index(page)); - } - if (argument->n == BACKWARD) { - /* start at bottom hit in page */ - g_object_set(page_widget, "search-current", girara_list_size(result) - 1, NULL); - } else { - g_object_set(page_widget, "search-current", 0, NULL); - } - firsthit = false; + + if (argument->n == BACKWARD) { + /* start at bottom hit in page */ + g_object_set(page_widget, "search-current", girara_list_size(result) - 1, NULL); + } else { + g_object_set(page_widget, "search-current", 0, NULL); } } + girara_argument_t* arg = g_malloc0(sizeof(girara_argument_t)); + + arg->n = FORWARD; + sc_search(session, arg, NULL, 0); + g_free(arg); + return true; } diff --git a/page-widget.c b/page-widget.c index 7bcb186..0c95624 100644 --- a/page-widget.c +++ b/page-widget.c @@ -86,7 +86,7 @@ enum properties_e { PROP_SEARCH_RESULTS, PROP_SEARCH_RESULTS_LENGTH, PROP_SEARCH_RESULTS_CURRENT, - PROP_DRAW_SEACH_RESULTS, + PROP_DRAW_SEARCH_RESULTS, PROP_LAST_VIEW, }; @@ -131,8 +131,8 @@ zathura_page_widget_class_init(ZathuraPageClass* class) g_param_spec_int("search-current", "search-current", "The current search result", -1, INT_MAX, 0, G_PARAM_WRITABLE | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, PROP_SEARCH_RESULTS_LENGTH, g_param_spec_int("search-length", "search-length", "The number of search results", -1, INT_MAX, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property(object_class, PROP_DRAW_SEACH_RESULTS, - g_param_spec_boolean("draw-search-results", "draw-search-results", "Set to true if search results should be drawn", FALSE, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(object_class, PROP_DRAW_SEARCH_RESULTS, + g_param_spec_boolean("draw-search-results", "draw-search-results", "Set to true if search results should be drawn", FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, PROP_LAST_VIEW, g_param_spec_int64("last-view", "last-view", "Last time the page has been viewed", -1, G_MAXINT64, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } @@ -154,7 +154,7 @@ zathura_page_widget_init(ZathuraPage* widget) priv->search.list = NULL; priv->search.current = INT_MAX; - priv->search.draw = true; + priv->search.draw = false; priv->images.list = NULL; priv->images.retrieved = false; @@ -269,8 +269,19 @@ zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* v } break; } - case PROP_DRAW_SEACH_RESULTS: + case PROP_DRAW_SEARCH_RESULTS: priv->search.draw = g_value_get_boolean(value); + + /* + * we do the following instead of only redrawing the rectangles of the + * search results in order to avoid the rectangular margins that appear + * around the search terms after their highlighted rectangular areas are + * redrawn without highlighting. + */ + + if (priv->search.list != NULL && zathura_page_get_visibility(priv->page)) { + gtk_widget_queue_draw(GTK_WIDGET(object)); + } break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -299,6 +310,9 @@ zathura_page_widget_get_property(GObject* object, guint prop_id, GValue* value, case PROP_LAST_VIEW: g_value_set_int64(value, priv->last_view); break; + case PROP_DRAW_SEARCH_RESULTS: + g_value_set_boolean(value, priv->search.draw); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); } diff --git a/shortcuts.c b/shortcuts.c index 0174598..f6cd733 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -34,7 +34,7 @@ draw_links(zathura_t* zathura) } GtkWidget* page_widget = zathura_page_get_widget(zathura, page); - g_object_set(page_widget, "search-results", NULL, NULL); + g_object_set(page_widget, "draw-search-results", FALSE, NULL); if (zathura_page_get_visibility(page) == true) { g_object_set(page_widget, "draw-links", TRUE, NULL); @@ -71,9 +71,10 @@ sc_abort(girara_session_t* session, girara_argument_t* UNUSED(argument), continue; } - g_object_set(zathura_page_get_widget(zathura, page), "draw-links", FALSE, NULL); + GtkWidget* page_widget = zathura_page_get_widget(zathura, page); + g_object_set(page_widget, "draw-links", FALSE, NULL); if (clear_search == true) { - g_object_set(zathura_page_get_widget(zathura, page), "search-results", NULL, NULL); + g_object_set(page_widget, "draw-search-results", FALSE, NULL); } } } @@ -890,8 +891,23 @@ sc_search(girara_session_t* session, girara_argument_t* argument, g_return_val_if_fail(argument != NULL, false); g_return_val_if_fail(zathura->document != NULL, false); - const int num_pages = zathura_document_get_number_of_pages(zathura->document); - const int cur_page = zathura_document_get_current_page_number(zathura->document); + const unsigned int num_pages = zathura_document_get_number_of_pages(zathura->document); + const unsigned int cur_page = zathura_document_get_current_page_number(zathura->document); + GtkWidget *cur_page_widget = zathura_page_get_widget(zathura, zathura_document_get_page(zathura->document, cur_page)); + bool nohlsearch, first_time_after_abort, draw; + + nohlsearch = first_time_after_abort = draw = false; + girara_setting_get(session, "nohlsearch", &nohlsearch); + + if (nohlsearch == false) { + g_object_get(cur_page_widget, "draw-search-results", &draw, NULL); + + if (draw == false) { + first_time_after_abort = true; + } + + document_draw_search_results(zathura, true); + } int diff = argument->n == FORWARD ? 1 : -1; if (zathura->global.search_direction == BACKWARD) @@ -900,7 +916,7 @@ sc_search(girara_session_t* session, girara_argument_t* argument, zathura_page_t* target_page = NULL; int target_idx = 0; - for (int page_id = 0; page_id < num_pages; ++page_id) { + for (unsigned int page_id = 0; page_id < num_pages; ++page_id) { int tmp = cur_page + diff * page_id; zathura_page_t* page = zathura_document_get_page(zathura->document, (tmp + num_pages) % num_pages); if (page == NULL) { @@ -916,6 +932,12 @@ sc_search(girara_session_t* session, girara_argument_t* argument, continue; } + if (first_time_after_abort == true && num_search_results > 0) { + target_page = page; + target_idx = diff == 1 ? 0 : num_search_results - 1; + break; + } + if (diff == 1 && current < num_search_results - 1) { /* the next result is on the same page */ target_page = page; @@ -932,7 +954,6 @@ sc_search(girara_session_t* session, girara_argument_t* argument, for (int npage_id = 1; page_id < num_pages; ++npage_id) { int ntmp = cur_page + diff * (page_id + npage_id); zathura_page_t* npage = zathura_document_get_page(zathura->document, (ntmp + 2*num_pages) % num_pages); - zathura_document_set_current_page_number(zathura->document, zathura_page_get_index(npage)); GtkWidget* npage_page_widget = zathura_page_get_widget(zathura, npage); g_object_get(npage_page_widget, "search-length", &num_search_results, NULL); if (num_search_results != 0) { @@ -959,6 +980,10 @@ sc_search(girara_session_t* session, girara_argument_t* argument, page_offset_t offset; page_calculate_offset(zathura, target_page, &offset); + if (zathura_page_get_index(target_page) != cur_page) { + page_set(zathura, zathura_page_get_index(target_page)); + } + GtkAdjustment* view_vadjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); int y = offset.y - gtk_adjustment_get_page_size(view_vadjustment) / 2 + rectangle.y1; zathura_adjustment_set_value(view_vadjustment, y); From 88bff5dfd24833520de3d3546a02b05741b6433c Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Sat, 8 Jun 2013 01:35:10 +0200 Subject: [PATCH 07/45] Include backward-search commands in the history plain database Signed-off-by: Sebastian Ramacher --- database-plain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database-plain.c b/database-plain.c index a8d6e6f..0282b71 100644 --- a/database-plain.c +++ b/database-plain.c @@ -647,7 +647,7 @@ plain_io_read(GiraraInputHistoryIO* db) girara_list_t* res = girara_list_new2(g_free); char** tmp = g_strsplit(content, "\n", 0); for (size_t i = 0; tmp[i] != NULL; ++i) { - if (strlen(tmp[i]) == 0 || strchr(":/", tmp[i][0]) == NULL) { + if (strlen(tmp[i]) == 0 || strchr(":/?", tmp[i][0]) == NULL) { continue; } girara_list_append(res, g_strdup(tmp[i])); @@ -688,7 +688,7 @@ plain_io_append(GiraraInputHistoryIO* db, const char* input) /* write input history file */ for (size_t i = 0; tmp[i] != NULL; ++i) { - if (strlen(tmp[i]) == 0 || strchr(":/", tmp[i][0]) == NULL || strcmp(tmp[i], input) == 0) { + if (strlen(tmp[i]) == 0 || strchr(":/?", tmp[i][0]) == NULL || strcmp(tmp[i], input) == 0) { continue; } fprintf(file, "%s\n", tmp[i]); From afd008f4664f3dd974a1de6045815556ddc75e93 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Sun, 9 Jun 2013 05:53:31 +0200 Subject: [PATCH 08/45] Enhancements/Cleanups for the jumplist mechansim - Don't delete the elements on the right of the current one, when appending a new jump to the jumplist, because this makes no sense at all; the point of the jumplist in the first place is to remember previously jumped-to positions in the document, so there is no need to delete anythings except to trim the oldest entries from the beginning to maintain the maximum size. This also makes us compatible with the Vim way of doing things. - Make the jumplist mechanism functional on the same page; if we followed a link to a target on the same page, remember the adjustments before and after following the link. The same holds for navigating search results on the same page. - Implement position_set and use it instead of position_set_delayed when following links in order to give zathura_jumplist_save a chance to record the exact adjustments of the link target. Otherwise, it will always record the adjustments after going to the target page, but before going to the exact position within it. - Don't consider movements with ^i and ^o as jumps :) - Don't use page_set followed by setting the adjustments in sc_jumplist, because this is redundant and causes clutter when using ^i and ^o, as the adjustments is set twice this way (once in page_set and again in position_set_delayed). It's enough to only update the page number on the statusbar and then set the adjustments. - Hide implementation details (zathura_jumplist_save and zathura_jumplist_append), and make things more consistent by exporting and using only zathura_jumplist_add for adding new entries. The end result: A more slick jumping experience :-) Signed-off-by: Sebastian Ramacher --- callbacks.c | 4 +-- config.c | 2 +- links.c | 4 +-- shortcuts.c | 33 ++++++++++---------- zathura.c | 86 +++++++++++++++++++++++++++++++++++++++-------------- zathura.h | 26 +++++++--------- 6 files changed, 94 insertions(+), 61 deletions(-) diff --git a/callbacks.c b/callbacks.c index 87e2100..1212b1d 100644 --- a/callbacks.c +++ b/callbacks.c @@ -333,7 +333,7 @@ handle_link(GtkEntry* entry, girara_session_t* session, invalid_index = false; switch (action) { case ZATHURA_LINK_ACTION_FOLLOW: - zathura_jumplist_save(zathura); + zathura_jumplist_add(zathura); zathura_link_evaluate(zathura, link); zathura_jumplist_add(zathura); break; @@ -534,7 +534,7 @@ cb_unknown_command(girara_session_t* session, const char* input) } } - zathura_jumplist_save(zathura); + zathura_jumplist_add(zathura); page_set(zathura, atoi(input) - 1); zathura_jumplist_add(zathura); diff --git a/config.c b/config.c index 1be86d8..6914efb 100644 --- a/config.c +++ b/config.c @@ -157,7 +157,7 @@ config_load_default(zathura_t* zathura) girara_setting_add(gsession, "zoom-max", &int_value, INT, false, _("Zoom maximum"), NULL, NULL); int_value = ZATHURA_PAGE_CACHE_DEFAULT_SIZE; girara_setting_add(gsession, "page-cache-size", &int_value, INT, true, _("Maximum number of pages to keep in the cache"), NULL, NULL); - int_value = 20; + int_value = 2000; girara_setting_add(gsession, "jumplist-size", &int_value, INT, false, _("Number of positions to remember in the jumplist"), cb_jumplist_change, NULL); girara_setting_add(gsession, "recolor-darkcolor", NULL, STRING, false, _("Recoloring (dark color)"), cb_color_change, NULL); diff --git a/links.c b/links.c index 4ce1487..968b983 100644 --- a/links.c +++ b/links.c @@ -157,9 +157,9 @@ zathura_link_evaluate(zathura_t* zathura, zathura_link_t* link) girara_setting_get(zathura->ui.session, "link-hadjust", &link_hadjust); if (link_hadjust == true) { - position_set_delayed(zathura, offset.x, offset.y); + position_set(zathura, offset.x, offset.y); } else { - position_set_delayed(zathura, -1, offset.y); + position_set(zathura, -1, offset.y); } } break; diff --git a/shortcuts.c b/shortcuts.c index f6cd733..7b70c4a 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -313,7 +313,7 @@ sc_goto(girara_session_t* session, girara_argument_t* argument, girara_event_t* g_return_val_if_fail(argument != NULL, false); g_return_val_if_fail(zathura->document != NULL, false); - zathura_jumplist_save(zathura); + zathura_jumplist_add(zathura); if (t != 0) { /* add offset */ t += zathura_document_get_page_offset(zathura->document); @@ -328,7 +328,6 @@ sc_goto(girara_session_t* session, girara_argument_t* argument, girara_event_t* /* adjust horizontal position */ GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); cb_view_hadjustment_changed(hadjustment, zathura); - zathura_jumplist_add(zathura); return false; @@ -726,20 +725,19 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, zathura_jump_t* jump = NULL; switch(argument->n) { case FORWARD: - zathura_jumplist_save(zathura); zathura_jumplist_forward(zathura); jump = zathura_jumplist_current(zathura); break; case BACKWARD: - zathura_jumplist_save(zathura); zathura_jumplist_backward(zathura); jump = zathura_jumplist_current(zathura); break; } if (jump != NULL) { - page_set(zathura, jump->page); + zathura_document_set_current_page_number(zathura->document, jump->page); + statusbar_page_number_update(zathura); const double s = zathura_document_get_scale(zathura->document); position_set_delayed(zathura, jump->x * s, jump->y * s); } @@ -770,13 +768,11 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, prev_page = prev2_page = 0; have_prev = have_prev2 = false; - /* save position at current jump point */ - zathura_jumplist_save(zathura); - /* process arguments */ int direction; if (t > 0 && t <= number_of_pages) { /* jump to page t, and bisect between cur_page and t */ + zathura_jumplist_add(zathura); page_set(zathura, t-1); zathura_jumplist_add(zathura); if (t-1 > cur_page) { @@ -825,6 +821,7 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, if (have_prev && cur_page <= prev_page) { /* add a new jump point */ if (cur_page < prev_page) { + zathura_jumplist_add(zathura); page_set(zathura, (cur_page + prev_page)/2); zathura_jumplist_add(zathura); } @@ -833,14 +830,15 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, /* save current position at previous jump point */ if (cur_page < prev2_page) { zathura_jumplist_backward(zathura); - zathura_jumplist_save(zathura); + zathura_jumplist_add(zathura); zathura_jumplist_forward(zathura); page_set(zathura, (cur_page + prev2_page)/2); - zathura_jumplist_save(zathura); + zathura_jumplist_add(zathura); } } else { /* none of prev_page or prev2_page comes after cur_page */ + zathura_jumplist_add(zathura); page_set(zathura, (cur_page + number_of_pages - 1)/2); zathura_jumplist_add(zathura); } @@ -850,6 +848,7 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, if (have_prev && prev_page <= cur_page) { /* add a new jump point */ if (prev_page < cur_page) { + zathura_jumplist_add(zathura); page_set(zathura, (cur_page + prev_page)/2); zathura_jumplist_add(zathura); } @@ -858,15 +857,16 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, /* save current position at previous jump point */ if (prev2_page < cur_page) { zathura_jumplist_backward(zathura); - zathura_jumplist_save(zathura); + zathura_jumplist_add(zathura); zathura_jumplist_forward(zathura); page_set(zathura, (cur_page + prev2_page)/2); - zathura_jumplist_save(zathura); + zathura_jumplist_add(zathura); } } else { /* none of prev_page or prev2_page comes before cur_page */ + zathura_jumplist_add(zathura); page_set(zathura, cur_page/2); zathura_jumplist_add(zathura); } @@ -947,8 +947,6 @@ sc_search(girara_session_t* session, girara_argument_t* argument, target_idx = current - 1; } else { /* the next result is on a different page */ - zathura_jumplist_save(zathura); - g_object_set(page_widget, "search-current", -1, NULL); for (int npage_id = 1; page_id < num_pages; ++npage_id) { @@ -962,8 +960,6 @@ sc_search(girara_session_t* session, girara_argument_t* argument, break; } } - - zathura_jumplist_add(zathura); } break; @@ -979,6 +975,7 @@ sc_search(girara_session_t* session, girara_argument_t* argument, zathura_rectangle_t rectangle = recalc_rectangle(target_page, *rect); page_offset_t offset; page_calculate_offset(zathura, target_page, &offset); + zathura_jumplist_add(zathura); if (zathura_page_get_index(target_page) != cur_page) { page_set(zathura, zathura_page_get_index(target_page)); @@ -995,6 +992,8 @@ sc_search(girara_session_t* session, girara_argument_t* argument, int x = offset.x - gtk_adjustment_get_page_size(view_hadjustment) / 2 + rectangle.x1; zathura_adjustment_set_value(view_hadjustment, x); } + + zathura_jumplist_add(zathura); } return false; @@ -1190,7 +1189,7 @@ sc_toggle_index(girara_session_t* session, girara_argument_t* UNUSED(argument), hvalue = gtk_adjustment_get_value(hadjustment); /* save current position to the jumplist */ - zathura_jumplist_save(zathura); + zathura_jumplist_add(zathura); girara_set_view(session, zathura->ui.index); gtk_widget_show(GTK_WIDGET(zathura->ui.index)); diff --git a/zathura.c b/zathura.c index 2ea324b..f681bf1 100644 --- a/zathura.c +++ b/zathura.c @@ -57,6 +57,9 @@ static bool zathura_page_cache_is_cached(zathura_t* zathura, unsigned int page_i static ssize_t zathura_page_cache_lru_invalidate(zathura_t* zathura); static void zathura_page_cache_invalidate_all(zathura_t* zathura); static bool zathura_page_cache_is_full(zathura_t* zathura, bool* result); +static void zathura_jumplist_reset_current(zathura_t* zathura); +static void zathura_jumplist_append_jump(zathura_t* zathura); +static void zathura_jumplist_save(zathura_t* zathura); /* function implementation */ zathura_t* @@ -275,8 +278,6 @@ zathura_init(zathura_t* zathura) zathura->jumplist.list = girara_list_new2(g_free); zathura->jumplist.size = 0; zathura->jumplist.cur = NULL; - zathura_jumplist_append_jump(zathura); - zathura->jumplist.cur = girara_list_iterator(zathura->jumplist.list); /* page cache */ @@ -1111,9 +1112,11 @@ position_set_delayed_impl(gpointer data) return FALSE; } -bool +void position_set_delayed(zathura_t* zathura, double position_x, double position_y) { + g_return_if_fail(zathura != NULL); + position_set_delayed_t* p = g_malloc0(sizeof(position_set_delayed_t)); p->zathura = zathura; @@ -1121,10 +1124,26 @@ position_set_delayed(zathura_t* zathura, double position_x, double position_y) p->position_y = position_y; gdk_threads_add_idle(position_set_delayed_impl, p); - - return FALSE; } +void +position_set(zathura_t* zathura, double position_x, double position_y) +{ + g_return_if_fail(zathura != NULL); + + GtkScrolledWindow *window = GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view); + GtkAdjustment* vadjustment = gtk_scrolled_window_get_vadjustment(window); + GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(window); + + /* negative values mean: don't set the position */ + if (position_x >= 0) { + zathura_adjustment_set_value(hadjustment, position_x); + } + + if (position_y >= 0) { + zathura_adjustment_set_value(vadjustment, position_y); + } +} bool zathura_jumplist_has_previous(zathura_t* zathura) @@ -1133,7 +1152,7 @@ zathura_jumplist_has_previous(zathura_t* zathura) } bool -zathura_jumplist_has_has_next(zathura_t* zathura) +zathura_jumplist_has_next(zathura_t* zathura) { return girara_list_iterator_has_next(zathura->jumplist.cur); } @@ -1164,7 +1183,25 @@ zathura_jumplist_backward(zathura_t* zathura) } } -void +static void +zathura_jumplist_reset_current(zathura_t* zathura) +{ + g_return_if_fail(zathura != NULL || zathura->jumplist.cur != NULL); + + if (girara_list_iterator_has_next(zathura->jumplist.cur) == false) { + return; + } + + while (true) { + girara_list_iterator_next(zathura->jumplist.cur); + + if (girara_list_iterator_has_next(zathura->jumplist.cur) == false) { + return; + } + } +} + +static void zathura_jumplist_append_jump(zathura_t* zathura) { zathura_jump_t *jump = g_malloc(sizeof(zathura_jump_t)); @@ -1173,17 +1210,6 @@ zathura_jumplist_append_jump(zathura_t* zathura) jump->x = 0; jump->y = 0; - /* remove right tail after current */ - if (zathura->jumplist.cur != NULL) { - girara_list_iterator_t *it = girara_list_iterator_copy(zathura->jumplist.cur); - girara_list_iterator_next(it); - while (girara_list_iterator_is_valid(it)) { - girara_list_iterator_remove(it); - zathura->jumplist.size = zathura->jumplist.size - 1; - } - g_free(it); - } - /* trim from beginning until max_size */ girara_list_iterator_t *it = girara_list_iterator(zathura->jumplist.list); while (zathura->jumplist.size >= zathura->jumplist.max_size && girara_list_iterator_is_valid(it)) { @@ -1193,6 +1219,11 @@ zathura_jumplist_append_jump(zathura_t* zathura) g_free(it); girara_list_append(zathura->jumplist.list, jump); + + if (zathura->jumplist.size == 0) { + zathura->jumplist.cur = girara_list_iterator(zathura->jumplist.list); + } + zathura->jumplist.size = zathura->jumplist.size + 1; } } @@ -1201,20 +1232,29 @@ void zathura_jumplist_add(zathura_t* zathura) { if (zathura->jumplist.list != NULL) { + unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); + GtkAdjustment* view_vadjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); + GtkAdjustment* view_hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); + double x, y; + + x = gtk_adjustment_get_value(view_hadjustment) / zathura_document_get_scale(zathura->document); + y = gtk_adjustment_get_value(view_vadjustment) / zathura_document_get_scale(zathura->document); + zathura_jumplist_reset_current(zathura); + zathura_jump_t* cur = zathura_jumplist_current(zathura); - if (cur && cur->page == pagenum) { + + if (cur && cur->page == pagenum && cur->x == x && cur->y == y) { return; } zathura_jumplist_append_jump(zathura); - girara_list_iterator_next(zathura->jumplist.cur); + zathura_jumplist_reset_current(zathura); zathura_jumplist_save(zathura); } } - -void +static void zathura_jumplist_save(zathura_t* zathura) { zathura_jump_t* cur = zathura_jumplist_current(zathura); @@ -1228,7 +1268,7 @@ zathura_jumplist_save(zathura_t* zathura) cur->page = pagenum; cur->x = gtk_adjustment_get_value(view_hadjustment) / zathura_document_get_scale(zathura->document); - cur->y = gtk_adjustment_get_value(view_vadjustment) / zathura_document_get_scale(zathura->document);; + cur->y = gtk_adjustment_get_value(view_vadjustment) / zathura_document_get_scale(zathura->document); } } diff --git a/zathura.h b/zathura.h index fd1d626..438f160 100644 --- a/zathura.h +++ b/zathura.h @@ -313,9 +313,17 @@ bool page_set_delayed(zathura_t* zathura, unsigned int page_id); * @param zathura Zathura session * @param position_x X coordinate * @param position_y Y coordinate - * @return If no error occured true, otherwise false, is returned. */ -bool position_set_delayed(zathura_t* zathura, double position_x, double position_y); +void position_set_delayed(zathura_t* zathura, double position_x, double position_y); + +/** + * Moves to the given position + * + * @param zathura Zathura session + * @param position_x X coordinate + * @param position_y Y coordinate + */ +void position_set(zathura_t* zathura, double position_x, double position_y); /** * Builds the box structure to show the rendered pages @@ -372,13 +380,6 @@ void zathura_jumplist_forward(zathura_t* zathura); */ void zathura_jumplist_backward(zathura_t* zathura); -/** - * Save current page to the jumplist at current position - * - * @param zathura The zathura session - */ -void zathura_jumplist_save(zathura_t* zathura); - /** * Add current page as a new item to the jumplist after current position * @@ -386,13 +387,6 @@ void zathura_jumplist_save(zathura_t* zathura); */ void zathura_jumplist_add(zathura_t* zathura); -/** - * Add a page to the jumplist after current position - * - * @param zathura The zathura session - */ -void zathura_jumplist_append_jump(zathura_t* zathura); - /** * Add a page to the page cache * From a0c12d4cdd4f30211b6c7d125040a154c2242030 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Sun, 9 Jun 2013 22:11:44 +0200 Subject: [PATCH 09/45] Save position on the jumplist before and after jumping to a bookmark Signed-off-by: Sebastian Ramacher --- commands.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/commands.c b/commands.c index 713963b..7ec73dc 100644 --- a/commands.c +++ b/commands.c @@ -111,7 +111,11 @@ cmd_bookmark_open(girara_session_t* session, girara_list_t* argument_list) return false; } - return page_set(zathura, bookmark->page - 1); + zathura_jumplist_add(zathura); + page_set(zathura, bookmark->page - 1); + zathura_jumplist_add(zathura); + + return true; } bool From 092fe81839dec71e10e197bc12245516880cea8f Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Sun, 9 Jun 2013 23:37:00 +0200 Subject: [PATCH 10/45] Use jumplist with marks Signed-off-by: Sebastian Ramacher --- marks.c | 4 +++- zathura.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/marks.c b/marks.c index 0fac33d..c00b2cc 100644 --- a/marks.c +++ b/marks.c @@ -238,7 +238,9 @@ mark_evaluate(zathura_t* zathura, int key) zathura_document_set_scale(zathura->document, mark->scale); render_all(zathura); - position_set_delayed(zathura, mark->position_x, mark->position_y); + zathura_jumplist_add(zathura); + position_set(zathura, mark->position_x, mark->position_y); + zathura_jumplist_add(zathura); cb_view_vadjustment_value_changed(NULL, zathura); diff --git a/zathura.h b/zathura.h index 438f160..c67446d 100644 --- a/zathura.h +++ b/zathura.h @@ -28,7 +28,7 @@ enum { ZATHURA_PAGE_NUMBER_UNSPECIFIED = INT_MIN }; -/* forward declaration for types form database.h */ +/* forward declaration for types from database.h */ typedef struct _ZathuraDatabase zathura_database_t; /* forward declaration for types from render.h */ From 30d5195328a8b7bedc89913bc3bd2f8c848d8381 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Tue, 18 Jun 2013 12:52:01 +0200 Subject: [PATCH 11/45] Update documentation --- zathurarc.5.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/zathurarc.5.rst b/zathurarc.5.rst index f320faa..9e1f571 100644 --- a/zathurarc.5.rst +++ b/zathurarc.5.rst @@ -61,6 +61,15 @@ can be used set option4 hello\ world set option5 "hello world" + +If you want to use ``color codes`` for some options, make sure to quote them +accordingly or to escape the hash symbol. + +:: + + set default-fg "#CCBBCC" + set default-fg \#CCBBCC + map - Mapping a shortcut ------------------------ It is possible to map or remap new key bindings to shortcut functions which From 14b8399a74c581376d586e47fef4d34f9fd60e15 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 19 Jun 2013 21:26:21 +0200 Subject: [PATCH 12/45] Put %f back. A missing %f causes more problems than expected. Signed-off-by: Sebastian Ramacher --- zathura.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zathura.desktop b/zathura.desktop index 852ebf2..9bf8a6e 100644 --- a/zathura.desktop +++ b/zathura.desktop @@ -17,6 +17,6 @@ Comment[pt_BR]=Um visualizador de documentos minimalista Comment[ru]=Минималистичный просмотрщик документов Comment[tr]=Minimalist bir belge görüntüleyicisi Comment[uk_UA]=Легкий переглядач документів -Exec=zathura +Exec=zathura %f Terminal=false Categories=Office;Viewer; From 5b7fc5de5f8055231473682db092314115e923e6 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 14 Jun 2013 20:15:07 +0200 Subject: [PATCH 13/45] Make jumping with ^o and ^i more compatible with Vim - Allow the user to always start with the very last (or first) jump on the jumplist when pressing ^o (or ^i), while the jumplist iterator is pointing to the last (or first) jump, and the document is not currently at the position of this pointed-to jump. This is instead of jumping directly to the previous/next jump, and skipping the last/first one. - Don't jump to the current jump pointed to by the jumplist iterator, if there is no more next jumps, and the jump direction is FORWARD. - Don't jump to the current jump pointed to by the jumplist iterator, if there is no more previous jumps, and the jump direction is BACKWARD. Signed-off-by: Sebastian Ramacher --- shortcuts.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/shortcuts.c b/shortcuts.c index 7b70c4a..cf916dd 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -722,24 +722,51 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, g_return_val_if_fail(argument != NULL, false); g_return_val_if_fail(zathura->document != NULL, false); + const double scale = zathura_document_get_scale(zathura->document); + double x = gtk_adjustment_get_value(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view))) / scale; + double y = gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(session->gtk.view))) / scale; zathura_jump_t* jump = NULL; + zathura_jump_t* prev_jump = zathura_jumplist_current(zathura); + bool go_to_current = false; + + if (!zathura_jumplist_has_next(zathura) || !zathura_jumplist_has_previous(zathura)) { + if (x == prev_jump->x && y == prev_jump->y) { + go_to_current = false; + } else { + go_to_current = true; + } + } + switch(argument->n) { case FORWARD: - zathura_jumplist_forward(zathura); - jump = zathura_jumplist_current(zathura); + if (go_to_current == true && zathura_jumplist_has_previous(zathura) == false) { + jump = zathura_jumplist_current(zathura); + } else { + zathura_jumplist_forward(zathura); + jump = zathura_jumplist_current(zathura); + } break; - case BACKWARD: - zathura_jumplist_backward(zathura); - jump = zathura_jumplist_current(zathura); + if (go_to_current == true && zathura_jumplist_has_next(zathura) == false) { + jump = zathura_jumplist_current(zathura); + } else { + zathura_jumplist_backward(zathura); + jump = zathura_jumplist_current(zathura); + } break; } + if (jump == prev_jump) { + if (zathura_jumplist_has_previous(zathura) == false && argument->n == BACKWARD || + zathura_jumplist_has_next(zathura) == false && argument->n == FORWARD) { + jump = NULL; + } + } + if (jump != NULL) { zathura_document_set_current_page_number(zathura->document, jump->page); statusbar_page_number_update(zathura); - const double s = zathura_document_get_scale(zathura->document); - position_set_delayed(zathura, jump->x * s, jump->y * s); + position_set_delayed(zathura, jump->x * scale, jump->y * scale); } return false; From 8549abaa95159af4e922ff927f90e3a83536028d Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 14 Jun 2013 20:15:08 +0200 Subject: [PATCH 14/45] Fix the segfault that happens when jumping while the jumplist is initially empty. Signed-off-by: Sebastian Ramacher --- shortcuts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/shortcuts.c b/shortcuts.c index cf916dd..9776901 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -721,6 +721,7 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, zathura_t* zathura = session->global.data; g_return_val_if_fail(argument != NULL, false); g_return_val_if_fail(zathura->document != NULL, false); + g_return_val_if_fail(zathura->jumplist.size != 0, false); const double scale = zathura_document_get_scale(zathura->document); double x = gtk_adjustment_get_value(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view))) / scale; From e6f23fd2354d0ae0bc397b17e27c81f2310f87a4 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 20 Jun 2013 20:21:40 +0200 Subject: [PATCH 15/45] CS Signed-off-by: Sebastian Ramacher --- shortcuts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shortcuts.c b/shortcuts.c index 9776901..6643a0f 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -730,7 +730,7 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, zathura_jump_t* prev_jump = zathura_jumplist_current(zathura); bool go_to_current = false; - if (!zathura_jumplist_has_next(zathura) || !zathura_jumplist_has_previous(zathura)) { + if (zathura_jumplist_has_next(zathura) == false || zathura_jumplist_has_previous(zathura) == false) { if (x == prev_jump->x && y == prev_jump->y) { go_to_current = false; } else { @@ -758,8 +758,8 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, } if (jump == prev_jump) { - if (zathura_jumplist_has_previous(zathura) == false && argument->n == BACKWARD || - zathura_jumplist_has_next(zathura) == false && argument->n == FORWARD) { + if ((zathura_jumplist_has_previous(zathura) == false && argument->n == BACKWARD) || + (zathura_jumplist_has_next(zathura) == false && argument->n == FORWARD)) { jump = NULL; } } From ae59da30c8b50afa07d6d2e20c4cd73412b51511 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 21 Jun 2013 06:12:12 +0200 Subject: [PATCH 16/45] Bookmark the exact position, not just the page number (along with a number of fixes). This patch adds some enhancements/fixes to the bookmarking feature of Zathura: - Bookmark the exact vertical and horizontal adjustments values, along with the page number. This is done in a backward-compatible way for both the plain and sqlite database backends, so that bookmarks that was taken previously (bookmarking only the page number) will still work as expected and won't be lost. - Fix the issue of not being able to remove bookmarks from the plain database; removing a bookmark in plain_remove_bookmark using g_key_file_remove_key corrupts the bookmarks file. This is due to not truncating the entire bookmarks file in zathura_db_write_key_file_to_file prior to overriding it with a new one not containing the removed line. This is why, I guess, plain_remove_bookmark hadn't been implemented as expected using g_key_file_remove_key, because apparently, someone thought that the problem is caused by this API. - Fix not being able to update existing bookmarks persistently; updating a bookmark works only during the current session, but after the file is closed and reopened, the updated bookmark still has it's old value. This is due to changing only the bookmark structure in memory; the proper way to do it, is to call zathura_db_remove_bookmark on the old bookmark, then follow that by a call to zathura_db_add_bookmark on a bookmark structure containing the new position and the same old ID. - Make zathura_bookmark_add updates the bookmark if it already exists, rather than doing this externally in cmd_bookmark_create. This allows us to have all the relevant girara_notify messages in cmd_bookmark_create. Signed-off-by: Sebastian Ramacher --- bookmarks.c | 27 +++++++++++++++++++++++-- bookmarks.h | 2 ++ commands.c | 31 ++++++++++++++++++++-------- database-plain.c | 51 ++++++++++++++++++++++++++++++++++++----------- database-sqlite.c | 29 ++++++++++++++++++++++++--- 5 files changed, 115 insertions(+), 25 deletions(-) diff --git a/bookmarks.c b/bookmarks.c index fc109d3..e7e792a 100644 --- a/bookmarks.c +++ b/bookmarks.c @@ -4,9 +4,11 @@ #include "bookmarks.h" #include "database.h" #include "document.h" +#include "adjustment.h" #include #include +#include static int bookmark_compare_find(const void* item, const void* data) @@ -23,14 +25,35 @@ zathura_bookmark_add(zathura_t* zathura, const gchar* id, unsigned int page) g_return_val_if_fail(zathura && zathura->document && zathura->bookmarks.bookmarks, NULL); g_return_val_if_fail(id, NULL); - zathura_bookmark_t* old = girara_list_find(zathura->bookmarks.bookmarks, bookmark_compare_find, id); + double x = zathura_adjustment_get_ratio(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); + double y = zathura_adjustment_get_ratio(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); + zathura_bookmark_t* old = zathura_bookmark_get(zathura, id); + if (old != NULL) { - return NULL; + old->page = page; + old->x = x; + old->y = y; + + if (zathura->database != NULL) { + const char* path = zathura_document_get_path(zathura->document); + if (zathura_db_remove_bookmark(zathura->database, path, old->id) == false) { + girara_warning("Failed to remove old bookmark from database."); + } + + if (zathura_db_add_bookmark(zathura->database, path, old) == false) { + girara_warning("Failed to add new bookmark to database."); + } + } + + return old; } zathura_bookmark_t* bookmark = g_malloc0(sizeof(zathura_bookmark_t)); + bookmark->id = g_strdup(id); bookmark->page = page; + bookmark->x = x; + bookmark->y = y; girara_list_append(zathura->bookmarks.bookmarks, bookmark); if (zathura->database != NULL) { diff --git a/bookmarks.h b/bookmarks.h index 7cd2698..980cca0 100644 --- a/bookmarks.h +++ b/bookmarks.h @@ -10,6 +10,8 @@ struct zathura_bookmark_s { gchar* id; unsigned int page; + double x; + double y; }; typedef struct zathura_bookmark_s zathura_bookmark_t; diff --git a/commands.c b/commands.c index 7ec73dc..76e2a27 100644 --- a/commands.c +++ b/commands.c @@ -18,6 +18,7 @@ #include "plugin.h" #include "internal.h" #include "render.h" +#include "adjustment.h" #include #include @@ -44,19 +45,24 @@ cmd_bookmark_create(girara_session_t* session, girara_list_t* argument_list) const char* bookmark_name = girara_list_nth(argument_list, 0); zathura_bookmark_t* bookmark = zathura_bookmark_get(zathura, bookmark_name); - if (bookmark != NULL) { - bookmark->page = zathura_document_get_current_page_number(zathura->document) + 1; - girara_notify(session, GIRARA_INFO, _("Bookmark successfuly updated: %s"), bookmark_name); - return true; - } + bool update = bookmark != NULL ? true : false; bookmark = zathura_bookmark_add(zathura, bookmark_name, zathura_document_get_current_page_number(zathura->document) + 1); if (bookmark == NULL) { - girara_notify(session, GIRARA_ERROR, _("Could not create bookmark: %s"), bookmark_name); + if (update == true) { + girara_notify(session, GIRARA_ERROR, _("Could not update bookmark: %s"), bookmark_name); + } else { + girara_notify(session, GIRARA_ERROR, _("Could not create bookmark: %s"), bookmark_name); + } return false; + } else { + if (update == true) { + girara_notify(session, GIRARA_INFO, _("Bookmark successfully updated: %s"), bookmark_name); + } else { + girara_notify(session, GIRARA_INFO, _("Bookmark successfully created: %s"), bookmark_name); + } } - girara_notify(session, GIRARA_INFO, _("Bookmark successfuly created: %s"), bookmark_name); return true; } @@ -112,7 +118,16 @@ cmd_bookmark_open(girara_session_t* session, girara_list_t* argument_list) } zathura_jumplist_add(zathura); - page_set(zathura, bookmark->page - 1); + if (bookmark->x != DBL_MIN && bookmark->y != DBL_MIN) { + GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); + GtkAdjustment* vadjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); + zathura_adjustment_set_value_from_ratio(hadjustment, bookmark->x); + zathura_adjustment_set_value_from_ratio(vadjustment, bookmark->y); + zathura_document_set_current_page_number(zathura->document, bookmark->page - 1); + statusbar_page_number_update(zathura); + } else { + page_set(zathura, bookmark->page - 1); + } zathura_jumplist_add(zathura); return true; diff --git a/database-plain.c b/database-plain.c index 0282b71..fdb69e6 100644 --- a/database-plain.c +++ b/database-plain.c @@ -328,7 +328,18 @@ plain_add_bookmark(zathura_database_t* db, const char* file, } char* name = prepare_filename(file); - g_key_file_set_integer(priv->bookmarks, name, bookmark->id, bookmark->page); + char* val_list[] = { g_strdup_printf("%d", bookmark->page), + g_ascii_dtostr(g_malloc(G_ASCII_DTOSTR_BUF_SIZE), G_ASCII_DTOSTR_BUF_SIZE, bookmark->x), + g_ascii_dtostr(g_malloc(G_ASCII_DTOSTR_BUF_SIZE), G_ASCII_DTOSTR_BUF_SIZE, bookmark->y) }; + + gsize num_vals = sizeof(val_list)/sizeof(char *); + + g_key_file_set_string_list(priv->bookmarks, name, bookmark->id, (const char**)val_list, num_vals); + + for (unsigned int i = 0; i < num_vals; ++i) { + g_free(val_list[i]); + } + g_free(name); zathura_db_write_key_file_to_file(priv->bookmark_path, priv->bookmarks); @@ -337,8 +348,7 @@ plain_add_bookmark(zathura_database_t* db, const char* file, } static bool -plain_remove_bookmark(zathura_database_t* db, const char* file, const char* - GIRARA_UNUSED(id)) +plain_remove_bookmark(zathura_database_t* db, const char* file, const char* id) { zathura_plaindatabase_private_t* priv = ZATHURA_PLAINDATABASE_GET_PRIVATE(db); if (priv->bookmarks == NULL || priv->bookmark_path == NULL) { @@ -347,12 +357,13 @@ plain_remove_bookmark(zathura_database_t* db, const char* file, const char* char* name = prepare_filename(file); if (g_key_file_has_group(priv->bookmarks, name) == TRUE) { - g_key_file_remove_group(priv->bookmarks, name, NULL); + if (g_key_file_remove_key(priv->bookmarks, name, id, NULL) == TRUE) { - zathura_db_write_key_file_to_file(priv->bookmark_path, priv->bookmarks); - g_free(name); + zathura_db_write_key_file_to_file(priv->bookmark_path, priv->bookmarks); + g_free(name); - return true; + return true; + } } g_free(name); @@ -377,21 +388,37 @@ plain_load_bookmarks(zathura_database_t* db, const char* file) zathura_bookmarks_compare, (girara_free_function_t) zathura_bookmark_free); - gsize length; - char** keys = g_key_file_get_keys(priv->bookmarks, name, &length, NULL); + gsize num_keys; + char** keys = g_key_file_get_keys(priv->bookmarks, name, &num_keys, NULL); if (keys == NULL) { girara_list_free(result); g_free(name); return NULL; } - for (gsize i = 0; i < length; i++) { + char **val_list = NULL; + gsize num_vals = 0; + + for (gsize i = 0; i < num_keys; i++) { zathura_bookmark_t* bookmark = g_malloc0(sizeof(zathura_bookmark_t)); bookmark->id = g_strdup(keys[i]); - bookmark->page = g_key_file_get_integer(priv->bookmarks, name, keys[i], NULL); + val_list = g_key_file_get_string_list(priv->bookmarks, name, keys[i], &num_vals, NULL); + + bookmark->page = atoi(val_list[0]); + + if (num_vals == 3) { + bookmark->x = g_ascii_strtod(val_list[1], NULL); + bookmark->y = g_ascii_strtod(val_list[2], NULL); + } else if (num_vals == 1) { + bookmark->x = DBL_MIN; + bookmark->y = DBL_MIN; + } else { + girara_debug("This must be a BUG"); + } girara_list_append(result, bookmark); + g_strfreev(val_list); } g_free(name); @@ -579,7 +606,7 @@ zathura_db_write_key_file_to_file(const char* file, GKeyFile* key_file) } /* open file */ - int fd = open(file, O_RDWR); + int fd = open(file, O_RDWR | O_TRUNC); if (fd == -1) { g_free(content); return; diff --git a/database-sqlite.c b/database-sqlite.c index 44829ed..a35d66a 100644 --- a/database-sqlite.c +++ b/database-sqlite.c @@ -146,6 +146,10 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) static const char SQL_FILEINFO_ALTER2[] = "ALTER TABLE fileinfo ADD COLUMN first_page_column INTEGER;"; + static const char SQL_BOOKMARK_ALTER[] = + "ALTER TABLE bookmarks ADD COLUMN hadj_ratio FLOAT;" + "ALTER TABLE bookmarks ADD COLUMN vadj_ratio FLOAT;"; + static const char SQL_HISTORY_INIT[] = "CREATE TABLE IF NOT EXISTS history (" "time TIMESTAMP," @@ -192,6 +196,15 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) } } + data_type = NULL; + if (sqlite3_table_column_metadata(session, NULL, "bookmarks", "hadj_ratio", &data_type, NULL, NULL, NULL, NULL) != SQLITE_OK && + sqlite3_table_column_metadata(session, NULL, "bookmarks", "vadj_ratio", &data_type, NULL, NULL, NULL, NULL) != SQLITE_OK) { + girara_debug("old database table layout detected; updating ..."); + if (sqlite3_exec(session, SQL_BOOKMARK_ALTER, NULL, 0, NULL) != SQLITE_OK) { + girara_warning("failed to update database table layout"); + } + } + priv->session = session; } @@ -241,7 +254,7 @@ sqlite_add_bookmark(zathura_database_t* db, const char* file, zathura_sqldatabase_private_t* priv = ZATHURA_SQLDATABASE_GET_PRIVATE(db); static const char SQL_BOOKMARK_ADD[] = - "REPLACE INTO bookmarks (file, id, page) VALUES (?, ?, ?);"; + "REPLACE INTO bookmarks (file, id, page, hadj_ratio, vadj_ratio) VALUES (?, ?, ?, ?, ?);"; sqlite3_stmt* stmt = prepare_statement(priv->session, SQL_BOOKMARK_ADD); if (stmt == NULL) { @@ -250,7 +263,10 @@ sqlite_add_bookmark(zathura_database_t* db, const char* file, if (sqlite3_bind_text(stmt, 1, file, -1, NULL) != SQLITE_OK || sqlite3_bind_text(stmt, 2, bookmark->id, -1, NULL) != SQLITE_OK || - sqlite3_bind_int(stmt, 3, bookmark->page) != SQLITE_OK) { + sqlite3_bind_int(stmt, 3, bookmark->page) != SQLITE_OK || + sqlite3_bind_double(stmt, 4, bookmark->x) != SQLITE_OK || + sqlite3_bind_double(stmt, 5, bookmark->y) != SQLITE_OK) { + sqlite3_finalize(stmt); girara_error("Failed to bind arguments."); return false; @@ -295,7 +311,7 @@ sqlite_load_bookmarks(zathura_database_t* db, const char* file) zathura_sqldatabase_private_t* priv = ZATHURA_SQLDATABASE_GET_PRIVATE(db); static const char SQL_BOOKMARK_SELECT[] = - "SELECT id, page FROM bookmarks WHERE file = ?;"; + "SELECT id, page, hadj_ratio, vadj_ratio FROM bookmarks WHERE file = ?;"; sqlite3_stmt* stmt = prepare_statement(priv->session, SQL_BOOKMARK_SELECT); if (stmt == NULL) { @@ -316,6 +332,13 @@ sqlite_load_bookmarks(zathura_database_t* db, const char* file) bookmark->id = g_strdup((const char*) sqlite3_column_text(stmt, 0)); bookmark->page = sqlite3_column_int(stmt, 1); + bookmark->x = sqlite3_column_double(stmt, 2); + bookmark->y = sqlite3_column_double(stmt, 3); + + if (bookmark->page > 1) { + bookmark->x = bookmark->x == 0.0 ? DBL_MIN : bookmark->x; + bookmark->y = bookmark->y == 0.0 ? DBL_MIN : bookmark->y; + } girara_list_append(result, bookmark); } From b4f290d4f92e4b82569c4c78b22194e4bc2cedb3 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 21 Jun 2013 10:07:10 +0200 Subject: [PATCH 17/45] Create bookmarks table with {v,h}adj_ratio Signed-off-by: Sebastian Ramacher --- database-sqlite.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database-sqlite.c b/database-sqlite.c index a35d66a..f3b791f 100644 --- a/database-sqlite.c +++ b/database-sqlite.c @@ -123,6 +123,8 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) "file TEXT," "id TEXT," "page INTEGER," + "hadj_ratio FLOAT," + "vadj_ratio FLOAT," "PRIMARY KEY(file, id));"; static const char SQL_FILEINFO_INIT[] = From 4c795259fe09a065201b17a06a85a7095f29586d Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 21 Jun 2013 10:07:40 +0200 Subject: [PATCH 18/45] Eliminate the need for sqlite3_table_column_metadata This is so that Zathura would compile without errors when enabling sqlite support on systems that doesn't have sqlite compiled with SQLITE_ENABLE_COLUMN_METADATA (which are the majority). Signed-off-by: Sebastian Ramacher --- database-sqlite.c | 49 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/database-sqlite.c b/database-sqlite.c index f3b791f..282ccbb 100644 --- a/database-sqlite.c +++ b/database-sqlite.c @@ -15,6 +15,7 @@ G_DEFINE_TYPE_WITH_CODE(ZathuraSQLDatabase, zathura_sqldatabase, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(ZATHURA_TYPE_DATABASE, zathura_database_interface_init) G_IMPLEMENT_INTERFACE(GIRARA_TYPE_INPUT_HISTORY_IO, io_interface_init)) +static bool check_column(sqlite3* session, const char* table, const char* col, bool* result); static void sqlite_finalize(GObject* object); static bool sqlite_add_bookmark(zathura_database_t* db, const char* file, zathura_bookmark_t* bookmark); @@ -182,25 +183,30 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) return; } - const char* data_type = NULL; - if (sqlite3_table_column_metadata(session, NULL, "fileinfo", "pages_per_row", &data_type, NULL, NULL, NULL, NULL) != SQLITE_OK) { + bool res1, res2, ret1, ret2; + + ret1 = check_column(session, "fileinfo", "pages_per_row", &res1); + + if (ret1 == true && res1 == false) { girara_debug("old database table layout detected; updating ..."); if (sqlite3_exec(session, SQL_FILEINFO_ALTER, NULL, 0, NULL) != SQLITE_OK) { girara_warning("failed to update database table layout"); } } - data_type = NULL; - if (sqlite3_table_column_metadata(session, NULL, "fileinfo", "first_page_column", &data_type, NULL, NULL, NULL, NULL) != SQLITE_OK) { + ret1 = check_column(session, "fileinfo", "first_page_column", &res1); + + if (ret1 == true && res1 == false) { girara_debug("old database table layout detected; updating ..."); if (sqlite3_exec(session, SQL_FILEINFO_ALTER2, NULL, 0, NULL) != SQLITE_OK) { girara_warning("failed to update database table layout"); } } - data_type = NULL; - if (sqlite3_table_column_metadata(session, NULL, "bookmarks", "hadj_ratio", &data_type, NULL, NULL, NULL, NULL) != SQLITE_OK && - sqlite3_table_column_metadata(session, NULL, "bookmarks", "vadj_ratio", &data_type, NULL, NULL, NULL, NULL) != SQLITE_OK) { + ret1 = check_column(session, "bookmarks", "hadj_ratio", &res1); + ret2 = check_column(session, "bookmarks", "vadj_ratio", &res2); + + if (ret1 == true && ret2 == true && res1 == false && res2 == false) { girara_debug("old database table layout detected; updating ..."); if (sqlite3_exec(session, SQL_BOOKMARK_ALTER, NULL, 0, NULL) != SQLITE_OK) { girara_warning("failed to update database table layout"); @@ -249,6 +255,35 @@ prepare_statement(sqlite3* session, const char* statement) return pp_stmt; } +static bool +check_column(sqlite3* session, const char* table, const char* col, bool* res) +{ + char* query = g_strdup_printf("PRAGMA table_info(%s);", table); + sqlite3_stmt* stmt = prepare_statement(session, query); + + if (stmt == NULL) { + return false; + } + + *res = false; + + while (sqlite3_step(stmt) == SQLITE_ROW) { + if (strcmp((const char*) sqlite3_column_text(stmt, 1), col) == 0) { + *res = true; + break; + } + } + + if (*res == false) { + girara_debug("column %s in table %s is NOT found", col, table); + } + + sqlite3_finalize(stmt); + g_free(query); + + return true; +} + static bool sqlite_add_bookmark(zathura_database_t* db, const char* file, zathura_bookmark_t* bookmark) From 3171a4f7f64a1251c955b97f93738f7b2111868c Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 21 Jun 2013 10:25:31 +0200 Subject: [PATCH 19/45] Add some comments to the code Signed-off-by: Sebastian Ramacher --- database-sqlite.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/database-sqlite.c b/database-sqlite.c index 282ccbb..fd08792 100644 --- a/database-sqlite.c +++ b/database-sqlite.c @@ -118,7 +118,7 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) { zathura_sqldatabase_private_t* priv = ZATHURA_SQLDATABASE_GET_PRIVATE(db); - /* create bookmarks database */ + /* create bookmarks table */ static const char SQL_BOOKMARK_INIT[] = "CREATE TABLE IF NOT EXISTS bookmarks (" "file TEXT," @@ -128,6 +128,7 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) "vadj_ratio FLOAT," "PRIMARY KEY(file, id));"; + /* create fileinfo table */ static const char SQL_FILEINFO_INIT[] = "CREATE TABLE IF NOT EXISTS fileinfo (" "file TEXT PRIMARY KEY," @@ -141,30 +142,35 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) "position_y FLOAT" ");"; - static const char SQL_FILEINFO_ALTER[] = - "ALTER TABLE fileinfo ADD COLUMN pages_per_row INTEGER;" - "ALTER TABLE fileinfo ADD COLUMN position_x FLOAT;" - "ALTER TABLE fileinfo ADD COLUMN position_y FLOAT;"; - - static const char SQL_FILEINFO_ALTER2[] = - "ALTER TABLE fileinfo ADD COLUMN first_page_column INTEGER;"; - - static const char SQL_BOOKMARK_ALTER[] = - "ALTER TABLE bookmarks ADD COLUMN hadj_ratio FLOAT;" - "ALTER TABLE bookmarks ADD COLUMN vadj_ratio FLOAT;"; - + /* create history table */ static const char SQL_HISTORY_INIT[] = "CREATE TABLE IF NOT EXISTS history (" "time TIMESTAMP," "line TEXT," "PRIMARY KEY(line));"; + /* update fileinfo table (part 1) */ + static const char SQL_FILEINFO_ALTER[] = + "ALTER TABLE fileinfo ADD COLUMN pages_per_row INTEGER;" + "ALTER TABLE fileinfo ADD COLUMN position_x FLOAT;" + "ALTER TABLE fileinfo ADD COLUMN position_y FLOAT;"; + + /* update fileinfo table (part 2) */ + static const char SQL_FILEINFO_ALTER2[] = + "ALTER TABLE fileinfo ADD COLUMN first_page_column INTEGER;"; + + /* update bookmark table */ + static const char SQL_BOOKMARK_ALTER[] = + "ALTER TABLE bookmarks ADD COLUMN hadj_ratio FLOAT;" + "ALTER TABLE bookmarks ADD COLUMN vadj_ratio FLOAT;"; + sqlite3* session = NULL; if (sqlite3_open(path, &session) != SQLITE_OK) { girara_error("Could not open database: %s\n", path); return; } + /* create tables if they don't exist */ if (sqlite3_exec(session, SQL_BOOKMARK_INIT, NULL, 0, NULL) != SQLITE_OK) { girara_error("Failed to initialize database: %s\n", path); sqlite3_close(session); @@ -183,6 +189,7 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) return; } + /* check existing tables for missing columns */ bool res1, res2, ret1, ret2; ret1 = check_column(session, "fileinfo", "pages_per_row", &res1); From 12aa509fc28f011b3dbe016335a2848694c7ff30 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 21 Jun 2013 10:30:29 +0200 Subject: [PATCH 20/45] Remove note about SQLITE_ENABLE_COLUMN_METADATA Signed-off-by: Sebastian Ramacher --- README | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README b/README index 38ddc8d..c6c966a 100644 --- a/README +++ b/README @@ -22,9 +22,7 @@ And also note that rst2man from python-docutils is needed to build the man pages If it is not installed, the man pages won't be built. If you don't want to build with support for sqlite databases, you can set -WITH_SQLITE=0 and sqlite support won't be available. Please note that sqlite3 -with meta data support is required, i.e. sqlite3 has to be built with -SQLITE_ENABLE_COLUMN_METADATA defined. +WITH_SQLITE=0 and sqlite support won't be available. The use of magic to detect mime types is optional and can be disabled by setting WITH_MAGIC=0. From 3e5bfe3d59ecb870e9e0ec3a9df593876099b870 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 21 Jun 2013 10:36:52 +0200 Subject: [PATCH 21/45] Use sqlite3_mprintf for proper escaping Not that is really needed here since every argument is controlled by us. But rather safe than sorry. Signed-off-by: Sebastian Ramacher --- database-sqlite.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/database-sqlite.c b/database-sqlite.c index fd08792..05f78ad 100644 --- a/database-sqlite.c +++ b/database-sqlite.c @@ -265,9 +265,14 @@ prepare_statement(sqlite3* session, const char* statement) static bool check_column(sqlite3* session, const char* table, const char* col, bool* res) { - char* query = g_strdup_printf("PRAGMA table_info(%s);", table); - sqlite3_stmt* stmt = prepare_statement(session, query); + /* we can't actually bind the argument with sqlite3_bind_text because + * sqlite3_prepare_v2 fails with "PRAGMA table_info(?);" */ + char* query = sqlite3_mprintf("PRAGMA table_info(%Q);", table); + if (query == NULL) { + return false; + } + sqlite3_stmt* stmt = prepare_statement(session, query); if (stmt == NULL) { return false; } @@ -286,7 +291,7 @@ check_column(sqlite3* session, const char* table, const char* col, bool* res) } sqlite3_finalize(stmt); - g_free(query); + sqlite3_free(query); return true; } From d9f8750c869e707d35ce1a77ff69c68d703fe015 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 21 Jun 2013 10:02:19 +0200 Subject: [PATCH 22/45] Move calls to zathura_jumplist_add surrounding zathura_link_evaluate to zathura_link_evaluate itself This is just in case that zathura_link_evaluate returns without evaluating the link, which would result in a new jump being added for the current position, but without adding a corresponding jump for the target position (actually a second one would be added but the check in zathura_jumplist_add would prevent it from being appended on the linked list since it's position would be the same as the current one, because the link haven't been evaluated). Signed-off-by: Sebastian Ramacher --- callbacks.c | 5 ----- links.c | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/callbacks.c b/callbacks.c index 1212b1d..b9dca4b 100644 --- a/callbacks.c +++ b/callbacks.c @@ -274,10 +274,7 @@ cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path, } sc_toggle_index(zathura->ui.session, NULL, NULL, 0); - - /* zathura_jumplist_save is called when entering index mode */ zathura_link_evaluate(zathura, index_element->link); - zathura_jumplist_add(zathura); } g_object_unref(model); @@ -333,9 +330,7 @@ handle_link(GtkEntry* entry, girara_session_t* session, invalid_index = false; switch (action) { case ZATHURA_LINK_ACTION_FOLLOW: - zathura_jumplist_add(zathura); zathura_link_evaluate(zathura, link); - zathura_jumplist_add(zathura); break; case ZATHURA_LINK_ACTION_DISPLAY: zathura_link_display(zathura, link); diff --git a/links.c b/links.c index 968b983..dc5a837 100644 --- a/links.c +++ b/links.c @@ -149,6 +149,8 @@ zathura_link_evaluate(zathura_t* zathura, zathura_link_t* link) } } + zathura_jumplist_add(zathura); + /* jump to the page */ page_set(zathura, link->target.page_number); @@ -161,6 +163,8 @@ zathura_link_evaluate(zathura_t* zathura, zathura_link_t* link) } else { position_set(zathura, -1, offset.y); } + + zathura_jumplist_add(zathura); } break; case ZATHURA_LINK_GOTO_REMOTE: From 7465ad687115f9f9658433024275ca2921aa22a7 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 21 Jun 2013 14:25:28 +0200 Subject: [PATCH 23/45] Jumplist: record the adjustments ratios, rather than their values This makes jumping works accurately, even if the document is scaled up or down. Signed-off-by: Sebastian Ramacher --- shortcuts.c | 12 +++++++----- zathura.c | 15 ++++----------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/shortcuts.c b/shortcuts.c index 6643a0f..bfb4cf3 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -723,9 +723,10 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, g_return_val_if_fail(zathura->document != NULL, false); g_return_val_if_fail(zathura->jumplist.size != 0, false); - const double scale = zathura_document_get_scale(zathura->document); - double x = gtk_adjustment_get_value(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view))) / scale; - double y = gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(session->gtk.view))) / scale; + GtkAdjustment* hadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); + GtkAdjustment* vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); + double x = zathura_adjustment_get_ratio(hadj); + double y = zathura_adjustment_get_ratio(vadj); zathura_jump_t* jump = NULL; zathura_jump_t* prev_jump = zathura_jumplist_current(zathura); bool go_to_current = false; @@ -765,10 +766,11 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, } if (jump != NULL) { + zathura_adjustment_set_value_from_ratio(hadj, jump->x); + zathura_adjustment_set_value_from_ratio(vadj, jump->y); zathura_document_set_current_page_number(zathura->document, jump->page); statusbar_page_number_update(zathura); - position_set_delayed(zathura, jump->x * scale, jump->y * scale); - } +} return false; } diff --git a/zathura.c b/zathura.c index f681bf1..a82fb55 100644 --- a/zathura.c +++ b/zathura.c @@ -1234,12 +1234,9 @@ zathura_jumplist_add(zathura_t* zathura) if (zathura->jumplist.list != NULL) { unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); - GtkAdjustment* view_vadjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); - GtkAdjustment* view_hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); - double x, y; + double x = zathura_adjustment_get_ratio(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); + double y = zathura_adjustment_get_ratio(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); - x = gtk_adjustment_get_value(view_hadjustment) / zathura_document_get_scale(zathura->document); - y = gtk_adjustment_get_value(view_vadjustment) / zathura_document_get_scale(zathura->document); zathura_jumplist_reset_current(zathura); zathura_jump_t* cur = zathura_jumplist_current(zathura); @@ -1262,13 +1259,9 @@ zathura_jumplist_save(zathura_t* zathura) unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); if (cur) { - /* get position */ - GtkAdjustment* view_vadjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); - GtkAdjustment* view_hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view)); - cur->page = pagenum; - cur->x = gtk_adjustment_get_value(view_hadjustment) / zathura_document_get_scale(zathura->document); - cur->y = gtk_adjustment_get_value(view_vadjustment) / zathura_document_get_scale(zathura->document); + cur->x = zathura_adjustment_get_ratio(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); + cur->y = zathura_adjustment_get_ratio(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); } } From 87a7f2310f44184217b8cd1ec0036b0e86f981c5 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 21 Jun 2013 14:25:29 +0200 Subject: [PATCH 24/45] Hide the inputbar and completion menu before saving the adjustments ratios into a new jump structure Since we are now saving the adjustments ratios in the jump structures, we need to take care of the following scenario: - We do an action that results in a new jump structure being added to the jumplist while the inputbar is visible (e.g., search, jumping to a specific page, jumping to a bookmark, or following a link). - Since we are now storing the adjustments ratios in the jump structures, all of the above actions would result in the vertical adjustment ratio being saved while the inputbar and/or the completion menu is visible. - Now we are exactly on the target of the jump (note that the inputbar and completion menu now are hidden), so suppose that we want to go back using ^o (assuming that we didn't change the adjustments after jumping), then the check at sc_jumplist that compares the current adjustments ratios with that of the current jump (the jump that has just been added and which we are currently on it's position) would fail, because after the inputbar (with possibly the completion menu in case of bookmarks) is activated it is hidden, which results in the vertical adjustment upper bound to change, which in turn results in the vertical adjustment ratio returned by zathura_adjustment_get_ratio to become different from what is stored in the current jump structure, even though we haven't changed the adjustments at all after the jump. This would always result in taking us back to the exact position of the jump (which would be slightly different from the current position) when we press ^o. This can be annoying, because it would happen, for example, every time we need to go back quickly after jumping to a link target, a search result, or a bookmark. So, what this patch does is essentially to make the vertical adjustment ratio reflecting the current vertical adjustment after a jump, to always be the same as the one stored in the newly added jump structure, since both are calculated with zathura_adjustment_get_ratio while the inputbar is _not_ visible, so they should be the same. I've elaborated just to make things clear, in case the purpose of the patch isn't obvious. Signed-off-by: Sebastian Ramacher --- zathura.c | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/zathura.c b/zathura.c index a82fb55..a858b1c 100644 --- a/zathura.c +++ b/zathura.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -1145,6 +1146,25 @@ position_set(zathura_t* zathura, double position_x, double position_y) } } +static void +zathura_jumplist_hide_inputbar(zathura_t* zathura) +{ + g_return_if_fail(zathura != NULL && zathura->ui.session->gtk.inputbar != NULL); + + girara_argument_t arg = { GIRARA_HIDE, NULL }; + girara_isc_completion(zathura->ui.session, &arg, NULL, 0); + + if (zathura->ui.session->global.autohide_inputbar == true) { + gtk_widget_hide(zathura->ui.session->gtk.inputbar); + } + + /* we want to do it immediately */ + + while (gtk_events_pending()) { + gtk_main_iteration(); + } +} + bool zathura_jumplist_has_previous(zathura_t* zathura) { @@ -1231,29 +1251,31 @@ zathura_jumplist_append_jump(zathura_t* zathura) void zathura_jumplist_add(zathura_t* zathura) { - if (zathura->jumplist.list != NULL) { + g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL); + zathura_jumplist_hide_inputbar(zathura); - unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); - double x = zathura_adjustment_get_ratio(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); - double y = zathura_adjustment_get_ratio(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); + unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); + double x = zathura_adjustment_get_ratio(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); + double y = zathura_adjustment_get_ratio(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); - zathura_jumplist_reset_current(zathura); + zathura_jumplist_reset_current(zathura); - zathura_jump_t* cur = zathura_jumplist_current(zathura); + zathura_jump_t* cur = zathura_jumplist_current(zathura); - if (cur && cur->page == pagenum && cur->x == x && cur->y == y) { - return; - } - - zathura_jumplist_append_jump(zathura); - zathura_jumplist_reset_current(zathura); - zathura_jumplist_save(zathura); + if (cur && cur->page == pagenum && cur->x == x && cur->y == y) { + return; } + + zathura_jumplist_append_jump(zathura); + zathura_jumplist_reset_current(zathura); + zathura_jumplist_save(zathura); } static void zathura_jumplist_save(zathura_t* zathura) { + g_return_if_fail(zathura != NULL); + zathura_jump_t* cur = zathura_jumplist_current(zathura); unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); From 99b32ae1097ab7bfc4a4f336f39e955fa63fc721 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Fri, 21 Jun 2013 14:30:04 +0200 Subject: [PATCH 25/45] Make the jumplist persistent on a per-file basis This patch implements two new ZathuraDatabaseInterface functions, save_jumplist and load_jumplist, for both the plain and sqlite backends (along with some cleanups). Signed-off-by: Sebastian Ramacher --- config.c | 14 +++- database-plain.c | 131 +++++++++++++++++++++++++--------- database-sqlite.c | 176 ++++++++++++++++++++++++++++++++++++++++++---- database.c | 16 +++++ database.h | 35 +++++++-- zathura.c | 105 +++++++++++++++++++++------ zathura.h | 17 +++++ 7 files changed, 416 insertions(+), 78 deletions(-) diff --git a/config.c b/config.c index 6914efb..4adab3a 100644 --- a/config.c +++ b/config.c @@ -27,10 +27,18 @@ cb_jumplist_change(girara_session_t* session, const char* name, g_return_if_fail(session->global.data != NULL); g_return_if_fail(name != NULL); zathura_t* zathura = session->global.data; - if (g_strcmp0(name, "jumplist-size") == 0) { - int* max_size = (int*) value; - zathura->jumplist.max_size = *max_size; + + if (g_strcmp0(name, "jumplist-size") != 0) { + return; } + + if (*(int *)value < 0) { + zathura->jumplist.max_size = 0; + } else { + zathura->jumplist.max_size = *(int *)value; + } + + zathura_jumplist_trim(zathura); } static void diff --git a/database-plain.c b/database-plain.c index fdb69e6..39033c1 100644 --- a/database-plain.c +++ b/database-plain.c @@ -15,18 +15,19 @@ #include "database-plain.h" -#define BOOKMARKS "bookmarks" -#define HISTORY "history" -#define INPUT_HISTORY "input-history" +#define BOOKMARKS "bookmarks" +#define HISTORY "history" +#define INPUT_HISTORY "input-history" -#define KEY_PAGE "page" -#define KEY_OFFSET "offset" -#define KEY_SCALE "scale" -#define KEY_ROTATE "rotate" -#define KEY_PAGES_PER_ROW "pages-per-row" -#define KEY_FIRST_PAGE_COLUMN "first-page-column" -#define KEY_POSITION_X "position-x" -#define KEY_POSITION_Y "position-y" +#define KEY_PAGE "page" +#define KEY_OFFSET "offset" +#define KEY_SCALE "scale" +#define KEY_ROTATE "rotate" +#define KEY_PAGES_PER_ROW "pages-per-row" +#define KEY_FIRST_PAGE_COLUMN "first-page-column" +#define KEY_POSITION_X "position-x" +#define KEY_POSITION_Y "position-y" +#define KEY_JUMPLIST "jumplist" #ifdef __GNU__ #include @@ -46,28 +47,23 @@ G_DEFINE_TYPE_WITH_CODE(ZathuraPlainDatabase, zathura_plaindatabase, G_TYPE_OBJE G_IMPLEMENT_INTERFACE(ZATHURA_TYPE_DATABASE, zathura_database_interface_init) G_IMPLEMENT_INTERFACE(GIRARA_TYPE_INPUT_HISTORY_IO, io_interface_init)) -static void plain_finalize(GObject* object); -static bool plain_add_bookmark(zathura_database_t* db, const char* file, - zathura_bookmark_t* bookmark); -static bool plain_remove_bookmark(zathura_database_t* db, const char* file, - const char* id); -static girara_list_t* plain_load_bookmarks(zathura_database_t* db, - const char* file); -static bool plain_set_fileinfo(zathura_database_t* db, const char* file, - zathura_fileinfo_t* file_info); -static bool plain_get_fileinfo(zathura_database_t* db, const char* file, - zathura_fileinfo_t* file_info); -static void plain_set_property(GObject* object, guint prop_id, - const GValue* value, GParamSpec* pspec); -static void plain_io_append(GiraraInputHistoryIO* db, const char*); +static void plain_finalize(GObject* object); +static bool plain_add_bookmark(zathura_database_t* db, const char* file, zathura_bookmark_t* bookmark); +static bool plain_remove_bookmark(zathura_database_t* db, const char* file, const char* id); +static girara_list_t* plain_load_bookmarks(zathura_database_t* db, const char* file); +static girara_list_t* plain_load_jumplist(zathura_database_t* db, const char* file); +static bool plain_save_jumplist(zathura_database_t* db, const char* file, girara_list_t* jumplist); +static bool plain_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info); +static bool plain_get_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info); +static void plain_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec); +static void plain_io_append(GiraraInputHistoryIO* db, const char*); static girara_list_t* plain_io_read(GiraraInputHistoryIO* db); /* forward declaration */ -static bool zathura_db_check_file(const char* path); -static GKeyFile* zathura_db_read_key_file_from_file(const char* path); -static void zathura_db_write_key_file_to_file(const char* file, GKeyFile* key_file); -static void cb_zathura_db_watch_file(GFileMonitor* monitor, GFile* file, GFile* - other_file, GFileMonitorEvent event, zathura_database_t* database); +static bool zathura_db_check_file(const char* path); +static GKeyFile* zathura_db_read_key_file_from_file(const char* path); +static void zathura_db_write_key_file_to_file(const char* file, GKeyFile* key_file); +static void cb_zathura_db_watch_file(GFileMonitor* monitor, GFile* file, GFile* other_file, GFileMonitorEvent event, zathura_database_t* database); typedef struct zathura_plaindatabase_private_s { char* bookmark_path; @@ -110,6 +106,8 @@ zathura_database_interface_init(ZathuraDatabaseInterface* iface) iface->add_bookmark = plain_add_bookmark; iface->remove_bookmark = plain_remove_bookmark; iface->load_bookmarks = plain_load_bookmarks; + iface->load_jumplist = plain_load_jumplist; + iface->save_jumplist = plain_save_jumplist; iface->set_fileinfo = plain_set_fileinfo; iface->get_fileinfo = plain_get_fileinfo; } @@ -427,6 +425,73 @@ plain_load_bookmarks(zathura_database_t* db, const char* file) return result; } +static girara_list_t* +get_jumplist_from_str(const char* str) +{ + g_return_val_if_fail(str != NULL, NULL); + + if (*str == 0) { + return girara_list_new2(g_free); + } + + girara_list_t* result = girara_list_new2(g_free); + char* copy = g_strdup(str); + char* token = strtok(copy, " "); + + while (token != NULL) { + zathura_jump_t* jump = g_malloc0(sizeof(zathura_jump_t)); + + jump->page = strtoul(token, NULL, 0); + token = strtok(NULL, " "); + jump->x = strtod(token, NULL); + token = strtok(NULL, " "); + jump->y = strtod(token, NULL); + girara_list_append(result, jump); + token = strtok(NULL, " "); + } + + g_free(copy); + + return result; +} + +static girara_list_t* +plain_load_jumplist(zathura_database_t* db, const char* file) +{ + g_return_val_if_fail(db != NULL && file != NULL, NULL); + + zathura_plaindatabase_private_t* priv = ZATHURA_PLAINDATABASE_GET_PRIVATE(db); + char* str_value = g_key_file_get_string(priv->history, file, KEY_JUMPLIST, NULL); + + if (str_value == NULL) { + return girara_list_new2(g_free); + } + + return get_jumplist_from_str(str_value); +} + +static bool +plain_save_jumplist(zathura_database_t* db, const char* file, girara_list_t* jumplist) +{ + g_return_val_if_fail(db != NULL && file != NULL && jumplist != NULL, false); + + GString* str_val = g_string_new(NULL); + + GIRARA_LIST_FOREACH(jumplist, zathura_jump_t*, iter, jump) + g_string_append(str_val, g_strdup_printf("%d ", jump->page)); + g_string_append(str_val, g_strdup_printf("%.20f ", jump->x)); + g_string_append(str_val, g_strdup_printf("%.20f ", jump->y)); + GIRARA_LIST_FOREACH_END(jumplist, zathura_jump_t*, iter, jump); + + zathura_plaindatabase_private_t* priv = ZATHURA_PLAINDATABASE_GET_PRIVATE(db); + + g_key_file_set_string(priv->history, file, KEY_JUMPLIST, str_val->str); + zathura_db_write_key_file_to_file(priv->history_path, priv->history); + g_string_free(str_val, TRUE); + + return true; +} + static bool plain_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info) @@ -441,7 +506,7 @@ plain_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* g_key_file_set_integer(priv->history, name, KEY_PAGE, file_info->current_page); g_key_file_set_integer(priv->history, name, KEY_OFFSET, file_info->page_offset); - char* tmp = g_strdup_printf("%f", file_info->scale); + char* tmp = g_strdup_printf("%.20f", file_info->scale); g_key_file_set_string (priv->history, name, KEY_SCALE, tmp); g_free(tmp); @@ -449,11 +514,11 @@ plain_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* g_key_file_set_integer(priv->history, name, KEY_PAGES_PER_ROW, file_info->pages_per_row); g_key_file_set_integer(priv->history, name, KEY_FIRST_PAGE_COLUMN, file_info->first_page_column); - tmp = g_strdup_printf("%f", file_info->position_x); + tmp = g_strdup_printf("%.20f", file_info->position_x); g_key_file_set_string(priv->history, name, KEY_POSITION_X, tmp); g_free(tmp); - tmp = g_strdup_printf("%f", file_info->position_y); + tmp = g_strdup_printf("%.20f", file_info->position_y); g_key_file_set_string(priv->history, name, KEY_POSITION_Y, tmp); g_free(tmp); diff --git a/database-sqlite.c b/database-sqlite.c index 05f78ad..9c11775 100644 --- a/database-sqlite.c +++ b/database-sqlite.c @@ -15,21 +15,17 @@ G_DEFINE_TYPE_WITH_CODE(ZathuraSQLDatabase, zathura_sqldatabase, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(ZATHURA_TYPE_DATABASE, zathura_database_interface_init) G_IMPLEMENT_INTERFACE(GIRARA_TYPE_INPUT_HISTORY_IO, io_interface_init)) -static bool check_column(sqlite3* session, const char* table, const char* col, bool* result); -static void sqlite_finalize(GObject* object); -static bool sqlite_add_bookmark(zathura_database_t* db, const char* file, - zathura_bookmark_t* bookmark); -static bool sqlite_remove_bookmark(zathura_database_t* db, const char* file, - const char* id); -static girara_list_t* sqlite_load_bookmarks(zathura_database_t* db, - const char* file); -static bool sqlite_set_fileinfo(zathura_database_t* db, const char* file, - zathura_fileinfo_t* file_info); -static bool sqlite_get_fileinfo(zathura_database_t* db, const char* file, - zathura_fileinfo_t* file_info); -static void sqlite_set_property(GObject* object, guint prop_id, - const GValue* value, GParamSpec* pspec); -static void sqlite_io_append(GiraraInputHistoryIO* db, const char*); +static bool check_column(sqlite3* session, const char* table, const char* col, bool* result); +static void sqlite_finalize(GObject* object); +static bool sqlite_add_bookmark(zathura_database_t* db, const char* file, zathura_bookmark_t* bookmark); +static bool sqlite_remove_bookmark(zathura_database_t* db, const char* file, const char* id); +static girara_list_t* sqlite_load_bookmarks(zathura_database_t* db, const char* file); +static girara_list_t* sqlite_load_jumplist(zathura_database_t* db, const char* file); +static bool sqlite_save_jumplist(zathura_database_t* db, const char* file, girara_list_t* jumplist); +static bool sqlite_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info); +static bool sqlite_get_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info); +static void sqlite_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec); +static void sqlite_io_append(GiraraInputHistoryIO* db, const char*); static girara_list_t* sqlite_io_read(GiraraInputHistoryIO* db); typedef struct zathura_sqldatabase_private_s { @@ -51,6 +47,8 @@ zathura_database_interface_init(ZathuraDatabaseInterface* iface) iface->add_bookmark = sqlite_add_bookmark; iface->remove_bookmark = sqlite_remove_bookmark; iface->load_bookmarks = sqlite_load_bookmarks; + iface->load_jumplist = sqlite_load_jumplist; + iface->save_jumplist = sqlite_save_jumplist; iface->set_fileinfo = sqlite_set_fileinfo; iface->get_fileinfo = sqlite_get_fileinfo; } @@ -128,6 +126,15 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) "vadj_ratio FLOAT," "PRIMARY KEY(file, id));"; + static const char SQL_JUMPLIST_INIT[] = + "CREATE TABLE IF NOT EXISTS jumplist (" + "id INTEGER PRIMARY KEY AUTOINCREMENT," + "file TEXT," + "page INTEGER," + "hadj_ratio FLOAT," + "vadj_ratio FLOAT" + ");"; + /* create fileinfo table */ static const char SQL_FILEINFO_INIT[] = "CREATE TABLE IF NOT EXISTS fileinfo (" @@ -177,6 +184,12 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) return; } + if (sqlite3_exec(session, SQL_JUMPLIST_INIT, NULL, 0, NULL) != SQLITE_OK) { + girara_error("Failed to initialize database: %s\n", path); + sqlite3_close(session); + return; + } + if (sqlite3_exec(session, SQL_FILEINFO_INIT, NULL, 0, NULL) != SQLITE_OK) { girara_error("Failed to initialize database: %s\n", path); sqlite3_close(session); @@ -397,6 +410,139 @@ sqlite_load_bookmarks(zathura_database_t* db, const char* file) return result; } +static bool +sqlite_save_jumplist(zathura_database_t* db, const char* file, girara_list_t* jumplist) +{ + g_return_val_if_fail(db != NULL && file != NULL && jumplist != NULL, false); + + zathura_sqldatabase_private_t* priv = ZATHURA_SQLDATABASE_GET_PRIVATE(db); + static const char SQL_INSERT_JUMP[] = "INSERT INTO jumplist (file, page, hadj_ratio, vadj_ratio) VALUES (?, ?, ?, ?);"; + static const char SQL_REMOVE_JUMPLIST[] = "DELETE FROM jumplist WHERE file = ?;"; + sqlite3_stmt* stmt = NULL; + int res = 0; + + if (sqlite3_exec(priv->session, "BEGIN;", NULL, 0, NULL) != SQLITE_OK) { + return false; + } + + stmt = prepare_statement(priv->session, SQL_REMOVE_JUMPLIST); + + if (stmt == NULL) { + sqlite3_exec(priv->session, "ROLLBACK;", NULL, 0, NULL); + return false; + } + + if (sqlite3_bind_text(stmt, 1, file, -1, NULL) != SQLITE_OK) { + sqlite3_finalize(stmt); + sqlite3_exec(priv->session, "ROLLBACK;", NULL, 0, NULL); + girara_error("Failed to bind arguments."); + return false; + } + + res = sqlite3_step(stmt); + sqlite3_finalize(stmt); + + if (res != SQLITE_DONE) { + sqlite3_exec(priv->session, "ROLLBACK;", NULL, 0, NULL); + return false; + } + + if (girara_list_size(jumplist) == 0) { + sqlite3_exec(priv->session, "COMMIT;", NULL, 0, NULL); + return true; + } + + girara_list_iterator_t* cur = girara_list_iterator(jumplist); + bool status = true; + + while (true) { + zathura_jump_t* jump = girara_list_iterator_data(cur); + + stmt = prepare_statement(priv->session, SQL_INSERT_JUMP); + + if (stmt == NULL) { + status = false; + break; + } + + if (sqlite3_bind_text(stmt, 1, file, -1, NULL) != SQLITE_OK || + sqlite3_bind_int(stmt, 2, jump->page) != SQLITE_OK || + sqlite3_bind_double(stmt, 3, jump->x) != SQLITE_OK || + sqlite3_bind_double(stmt, 4, jump->y) != SQLITE_OK) { + + sqlite3_finalize(stmt); + girara_error("Failed to bind arguments."); + status = false; + break; + } + + res = sqlite3_step(stmt); + sqlite3_finalize(stmt); + + if (res != SQLITE_DONE) { + status = false; + break; + } + + if (girara_list_iterator_has_next(cur) == true) { + girara_list_iterator_next(cur); + } else { + break; + } + } + + if (status == false) { + sqlite3_exec(priv->session, "ROLLBACK;", NULL, 0, NULL); + return false; + } else { + sqlite3_exec(priv->session, "COMMIT;", NULL, 0, NULL); + return true; + } +} + +static girara_list_t* +sqlite_load_jumplist(zathura_database_t* db, const char* file) +{ + g_return_val_if_fail(db != NULL && file != NULL, NULL); + + zathura_sqldatabase_private_t* priv = ZATHURA_SQLDATABASE_GET_PRIVATE(db); + static const char SQL_GET_JUMPLIST[] = "SELECT page, hadj_ratio, vadj_ratio FROM jumplist WHERE file = ? ORDER BY id ASC;"; + sqlite3_stmt* stmt = prepare_statement(priv->session, SQL_GET_JUMPLIST); + + if (stmt == NULL) { + return NULL; + } + + if (sqlite3_bind_text(stmt, 1, file, -1, NULL) != SQLITE_OK) { + sqlite3_finalize(stmt); + girara_error("Failed to bind arguments."); + + return NULL; + } + + girara_list_t* jumplist = girara_list_new2(g_free); + int res = 0; + + while ((res = sqlite3_step(stmt)) == SQLITE_ROW) { + zathura_jump_t* jump = g_malloc0(sizeof(zathura_jump_t)); + + jump->page = sqlite3_column_int(stmt, 0); + jump->x = sqlite3_column_double(stmt, 1); + jump->y = sqlite3_column_double(stmt, 2); + girara_list_append(jumplist, jump); + } + + sqlite3_finalize(stmt); + + if (res != SQLITE_DONE) { + girara_list_free(jumplist); + + return NULL; + } + + return jumplist; +} + static bool sqlite_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info) diff --git a/database.c b/database.c index 81e3a27..92a8c34 100644 --- a/database.c +++ b/database.c @@ -35,6 +35,22 @@ zathura_db_load_bookmarks(zathura_database_t* db, const char* file) return ZATHURA_DATABASE_GET_INTERFACE(db)->load_bookmarks(db, file); } +girara_list_t* +zathura_db_load_jumplist(zathura_database_t* db, const char* file) +{ + g_return_val_if_fail(ZATHURA_IS_DATABASE(db) && file != NULL, NULL); + + return ZATHURA_DATABASE_GET_INTERFACE(db)->load_jumplist(db, file); +} + +bool +zathura_db_save_jumplist(zathura_database_t* db, const char* file, girara_list_t* jumplist) +{ + g_return_val_if_fail(ZATHURA_IS_DATABASE(db) && file != NULL && jumplist != NULL, NULL); + + return ZATHURA_DATABASE_GET_INTERFACE(db)->save_jumplist(db, file, jumplist); +} + bool zathura_db_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info) diff --git a/database.h b/database.h index 0c8dd44..5cc5eea 100644 --- a/database.h +++ b/database.h @@ -43,6 +43,10 @@ struct _ZathuraDatabaseInterface girara_list_t* (*load_bookmarks)(ZathuraDatabase* db, const char* file); + girara_list_t* (*load_jumplist)(ZathuraDatabase* db, const char* file); + + bool (*save_jumplist)(ZathuraDatabase* db, const char* file, girara_list_t* jumplist); + bool (*set_fileinfo)(ZathuraDatabase* db, const char* file, zathura_fileinfo_t* file_info); bool (*get_fileinfo)(ZathuraDatabase* db, const char* file, zathura_fileinfo_t* file_info); @@ -54,7 +58,7 @@ GType zathura_database_get_type(void); * Add or update bookmark in the database. * * @param db The database instance - * @param file The file to which the bookmark belongs to. + * @param file The file to which the bookmark belongs. * @param bookmark The bookmark instance. * @return true on success, false otherwise */ @@ -62,10 +66,10 @@ bool zathura_db_add_bookmark(zathura_database_t* db, const char* file, zathura_bookmark_t* bookmark); /** - * Add or update bookmark in the database. + * Remove a bookmark from the database. * * @param db The database instance - * @param file The file to which the bookmark belongs to. + * @param file The file to which the bookmark belongs. * @param id The id of the bookmark * @return true on success, false otherwise */ @@ -82,11 +86,32 @@ bool zathura_db_remove_bookmark(zathura_database_t* db, const char* file, const girara_list_t* zathura_db_load_bookmarks(zathura_database_t* db, const char* file); +/** + * Load the jumplist belonging to the specified file from the database. + * + * @param db The database instance. + * @param file The file to which the jumplist belongs. + * + * return A linked list constituting the jumplist of the specified file. + */ +girara_list_t* zathura_db_load_jumplist(ZathuraDatabase* db, const char* file); + +/** + * Save the jumplist belonging to the specified file to the database. + * + * @param db The database instance. + * @param file The file to which the jumplist belongs. + * @param jumplist The jumplist to be saved + * + * return true on success, false otherwise. + */ +bool zathura_db_save_jumplist(ZathuraDatabase* db, const char* file, girara_list_t* jumplist); + /** * Set file info (last site, ...) in the database. * * @param db The database instance - * @param file The file to which the file info belongs to. + * @param file The file to which the file info belongs. * @param file_info The file info * @return true on success, false otherwise. */ @@ -96,7 +121,7 @@ bool zathura_db_set_fileinfo(zathura_database_t* db, const char* file, /* Get file info (last site, ...) from the database. * * @param db The database instance - * @param file The file to which the file info belongs to. + * @param file The file to which the file info belongs. * @param file_info The file info * @return true on success, false otherwise. */ diff --git a/zathura.c b/zathura.c index a858b1c..4e77b66 100644 --- a/zathura.c +++ b/zathura.c @@ -273,10 +273,11 @@ zathura_init(zathura_t* zathura) /* jumplist */ - zathura->jumplist.max_size = 20; - girara_setting_get(zathura->ui.session, "jumplist-size", &(zathura->jumplist.max_size)); + int jumplist_size = 20; + girara_setting_get(zathura->ui.session, "jumplist-size", &jumplist_size); - zathura->jumplist.list = girara_list_new2(g_free); + zathura->jumplist.max_size = jumplist_size < 0 ? 0 : jumplist_size; + zathura->jumplist.list = NULL; zathura->jumplist.size = 0; zathura->jumplist.cur = NULL; @@ -770,6 +771,11 @@ document_open(zathura_t* zathura, const char* path, const char* password, /* bookmarks */ zathura_bookmarks_load(zathura, file_path); + /* jumplist */ + if (zathura_jumplist_load(zathura, file_path) == false) { + zathura->jumplist.list = girara_list_new2(g_free); + } + /* update title */ basename_only = false; girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); @@ -930,6 +936,14 @@ document_close(zathura_t* zathura, bool keep_monitor) /* save file info */ zathura_db_set_fileinfo(zathura->database, path, &file_info); + /* save jumplist */ + zathura_db_save_jumplist(zathura->database, path, zathura->jumplist.list); + girara_list_iterator_free(zathura->jumplist.cur); + zathura->jumplist.cur = NULL; + girara_list_free(zathura->jumplist.list); + zathura->jumplist.list = NULL; + zathura->jumplist.size = 0; + /* release render thread */ render_free(zathura->sync.render_thread); zathura->sync.render_thread = NULL; @@ -1224,27 +1238,43 @@ zathura_jumplist_reset_current(zathura_t* zathura) static void zathura_jumplist_append_jump(zathura_t* zathura) { + g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL); + zathura_jump_t *jump = g_malloc(sizeof(zathura_jump_t)); - if (jump != NULL) { - jump->page = 0; - jump->x = 0; - jump->y = 0; + jump->page = 0; + jump->x = 0.0; + jump->y = 0.0; + girara_list_append(zathura->jumplist.list, jump); - /* trim from beginning until max_size */ - girara_list_iterator_t *it = girara_list_iterator(zathura->jumplist.list); - while (zathura->jumplist.size >= zathura->jumplist.max_size && girara_list_iterator_is_valid(it)) { - girara_list_iterator_remove(it); - zathura->jumplist.size = zathura->jumplist.size - 1; - } - g_free(it); + if (zathura->jumplist.size == 0) { + zathura->jumplist.cur = girara_list_iterator(zathura->jumplist.list); + } - girara_list_append(zathura->jumplist.list, jump); + ++zathura->jumplist.size; + zathura_jumplist_trim(zathura); +} - if (zathura->jumplist.size == 0) { - zathura->jumplist.cur = girara_list_iterator(zathura->jumplist.list); +void +zathura_jumplist_trim(zathura_t* zathura) +{ + g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL && zathura->jumplist.size != 0); + + girara_list_iterator_t* cur = girara_list_iterator(zathura->jumplist.list); + + while (zathura->jumplist.size > zathura->jumplist.max_size) { + if (girara_list_iterator_data(cur) == girara_list_iterator_data(zathura->jumplist.cur)) { + girara_list_iterator_free(zathura->jumplist.cur); + zathura->jumplist.cur = NULL; } - zathura->jumplist.size = zathura->jumplist.size + 1; + girara_list_iterator_remove(cur); + --zathura->jumplist.size; + } + + if (zathura->jumplist.size == 0) { + girara_list_iterator_free(cur); + } else if (zathura->jumplist.cur == NULL) { + zathura->jumplist.cur = cur; } } @@ -1258,12 +1288,16 @@ zathura_jumplist_add(zathura_t* zathura) double x = zathura_adjustment_get_ratio(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); double y = zathura_adjustment_get_ratio(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(zathura->ui.session->gtk.view))); - zathura_jumplist_reset_current(zathura); + if (zathura->jumplist.size != 0) { + zathura_jumplist_reset_current(zathura); - zathura_jump_t* cur = zathura_jumplist_current(zathura); + zathura_jump_t* cur = zathura_jumplist_current(zathura); - if (cur && cur->page == pagenum && cur->x == x && cur->y == y) { - return; + if (cur != NULL) { + if (cur->page == pagenum && cur->x == x && cur->y == y) { + return; + } + } } zathura_jumplist_append_jump(zathura); @@ -1271,6 +1305,33 @@ zathura_jumplist_add(zathura_t* zathura) zathura_jumplist_save(zathura); } +bool +zathura_jumplist_load(zathura_t* zathura, const char* file) +{ + g_return_val_if_fail(zathura != NULL && zathura->database != NULL && file != NULL, false); + + zathura->jumplist.list = zathura_db_load_jumplist(zathura->database, file); + + if (zathura->jumplist.list == NULL) { + girara_error("Failed to load the jumplist from the database"); + + return false; + } + + zathura->jumplist.size = girara_list_size(zathura->jumplist.list); + + if (zathura->jumplist.size != 0) { + zathura->jumplist.cur = girara_list_iterator(zathura->jumplist.list); + zathura_jumplist_reset_current(zathura); + zathura_jumplist_trim(zathura); + girara_debug("Loaded the jumplist from the database"); + } else { + girara_debug("No jumplist for this file in the database yet"); + } + + return true; +} + static void zathura_jumplist_save(zathura_t* zathura) { diff --git a/zathura.h b/zathura.h index c67446d..ac22636 100644 --- a/zathura.h +++ b/zathura.h @@ -387,6 +387,23 @@ void zathura_jumplist_backward(zathura_t* zathura); */ void zathura_jumplist_add(zathura_t* zathura); +/** + * Trim entries from the beginning of the jumplist to maintain it's maximum size constraint. + * + * @param zathura The zathura session + */ +void zathura_jumplist_trim(zathura_t* zathura); + +/** + * Load the jumplist of the specified file + * + * @param zathura The zathura session + * @param file The file whose jumplist is to be loaded + * + * return A linked list of zathura_jump_t structures constituting the jumplist of the specified file, or NULL. + */ +bool zathura_jumplist_load(zathura_t* zathura, const char* file); + /** * Add a page to the page cache * From 3cf8fba7799526edaf70ca95478967c84ac07c8f Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sat, 29 Jun 2013 11:45:07 +0200 Subject: [PATCH 26/45] Add a note that I want this to go away Signed-off-by: Sebastian Ramacher --- zathura.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zathura.c b/zathura.c index 4e77b66..665cda0 100644 --- a/zathura.c +++ b/zathura.c @@ -1173,7 +1173,7 @@ zathura_jumplist_hide_inputbar(zathura_t* zathura) } /* we want to do it immediately */ - + /* XXX: ... and we want this to go away */ while (gtk_events_pending()) { gtk_main_iteration(); } From 486698d9fba9f945e07a93edef27776da1b4790f Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Sun, 30 Jun 2013 18:06:48 +0200 Subject: [PATCH 27/45] Logical error fix and cleanup for zathura_jumplist_reset_current Signed-off-by: Sebastian Ramacher --- zathura.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/zathura.c b/zathura.c index 665cda0..b465cb6 100644 --- a/zathura.c +++ b/zathura.c @@ -1220,18 +1220,14 @@ zathura_jumplist_backward(zathura_t* zathura) static void zathura_jumplist_reset_current(zathura_t* zathura) { - g_return_if_fail(zathura != NULL || zathura->jumplist.cur != NULL); - - if (girara_list_iterator_has_next(zathura->jumplist.cur) == false) { - return; - } + g_return_if_fail(zathura != NULL && zathura->jumplist.cur != NULL); while (true) { - girara_list_iterator_next(zathura->jumplist.cur); - if (girara_list_iterator_has_next(zathura->jumplist.cur) == false) { return; } + + girara_list_iterator_next(zathura->jumplist.cur); } } From a0c8f4c4ced470436f070a73dcda738a04f1f0c2 Mon Sep 17 00:00:00 2001 From: Marwan Tanager Date: Sun, 30 Jun 2013 18:06:49 +0200 Subject: [PATCH 28/45] Fix a memory leak Signed-off-by: Sebastian Ramacher --- zathura.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zathura.c b/zathura.c index b465cb6..0165e40 100644 --- a/zathura.c +++ b/zathura.c @@ -1267,9 +1267,9 @@ zathura_jumplist_trim(zathura_t* zathura) --zathura->jumplist.size; } - if (zathura->jumplist.size == 0) { + if (zathura->jumplist.size == 0 || (zathura->jumplist.size != 0 && zathura->jumplist.cur != NULL)) { girara_list_iterator_free(cur); - } else if (zathura->jumplist.cur == NULL) { + } else { zathura->jumplist.cur = cur; } } From 65da0ffa503ad89932754bc3ac16df22c4767988 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 7 Jul 2013 00:03:52 +0200 Subject: [PATCH 29/45] Decouple bisect from jumplist Move some bisect state to zathura_t and manipulate the jumplist that much. Signed-off-by: Sebastian Ramacher --- shortcuts.c | 201 ++++++++++++++++++++++++++++++---------------------- zathura.h | 9 +++ 2 files changed, 125 insertions(+), 85 deletions(-) diff --git a/shortcuts.c b/shortcuts.c index bfb4cf3..44295a3 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -19,6 +19,14 @@ #include "page-widget.h" #include "adjustment.h" +#ifndef MIN +#define MIN(a,b) (((a)<(b))?(a):(b)) +#endif + +#ifndef MAX +#define MAX(a,b) (((a)>(b))?(a):(b)) +#endif + /* Helper function; see sc_display_link and sc_follow. */ static bool draw_links(zathura_t* zathura) @@ -786,123 +794,146 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, g_return_val_if_fail(argument != NULL, false); g_return_val_if_fail(zathura->document != NULL, false); - unsigned int number_of_pages, cur_page, prev_page, prev2_page; - bool have_prev, have_prev2; - - zathura_jump_t* prev_jump = NULL; - zathura_jump_t* prev2_jump = NULL; - - number_of_pages= zathura_document_get_number_of_pages(zathura->document); - cur_page = zathura_document_get_current_page_number(zathura->document); - - prev_page = prev2_page = 0; - have_prev = have_prev2 = false; + const unsigned int num_pages = zathura_document_get_number_of_pages(zathura->document); + const unsigned int cur_page = zathura_document_get_current_page_number(zathura->document); /* process arguments */ int direction; - if (t > 0 && t <= number_of_pages) { - /* jump to page t, and bisect between cur_page and t */ - zathura_jumplist_add(zathura); - page_set(zathura, t-1); - zathura_jumplist_add(zathura); - if (t-1 > cur_page) { + if (t > 0 && t <= num_pages) { + /* bisect between cur_page and t */ + t -= 1; + if (t == cur_page) { + /* nothing to do */ + return false; + } + else if (t > cur_page) { + zathura->bisect.start = cur_page; + zathura->bisect.end = t; direction = BACKWARD; } else { + zathura->bisect.start = t; + zathura->bisect.end = cur_page; direction = FORWARD; } - } else if (argument != NULL) { direction = argument->n; + zathura_jump_t* jump = zathura_jumplist_current(zathura); + if (jump == NULL) { + girara_debug("bisecting between first and last page because there are no jumps"); + zathura->bisect.start = 0; + zathura->bisect.end = num_pages - 1; + } else { + if (jump->page != cur_page || jump->page != zathura->bisect.last_jump) { + girara_debug("last jump doesn't match up, starting new bisecting"); + zathura->bisect.start = 0; + zathura->bisect.end = num_pages - 1; + + /* check if we have previous jumps */ + if (zathura_jumplist_has_previous(zathura) == true) { + zathura_jumplist_backward(zathura); + jump = zathura_jumplist_current(zathura); + + unsigned int prev_page = 0; + unsigned int prev_page2 = num_pages - 1; + if (jump != NULL) { + prev_page = jump->page; + } + + prev_page2 = prev_page; + if (zathura_jumplist_has_previous(zathura) == true) { + zathura_jumplist_backward(zathura); + jump = zathura_jumplist_current(zathura); + if (jump != NULL) { + prev_page2 = jump->page; + } + zathura_jumplist_forward(zathura); + } + zathura_jumplist_forward(zathura); + + if (prev_page == prev_page2) { + if (prev_page > cur_page) { + zathura->bisect.end = prev_page; + } else { + zathura->bisect.start = prev_page; + } + } else { + zathura->bisect.start = MIN(prev_page, prev_page2); + zathura->bisect.end = MAX(prev_page, prev_page2); + } + } + + /* some sanity checks on new bounds */ + if (cur_page < zathura->bisect.start) { + if (direction == FORWARD) { + zathura->bisect.start = cur_page; + } else { + zathura->bisect.start = cur_page; + zathura->bisect.end = 0; + } + } else if (cur_page > zathura->bisect.end) { + if (direction == BACKWARD) { + zathura->bisect.end = cur_page; + } else { + zathura->bisect.start = cur_page; + zathura->bisect.end = num_pages - 1; + } + } + } + } } else { return false; } - cur_page = zathura_document_get_current_page_number(zathura->document); - - if (zathura_jumplist_has_previous(zathura)) { - /* If there is a previous jump, get its page */ - zathura_jumplist_backward(zathura); - prev_jump = zathura_jumplist_current(zathura); - if (prev_jump) { - prev_page = prev_jump->page; - have_prev = true; - } - - if (zathura_jumplist_has_previous(zathura)) { - /* If there is a second previous jump, get its page. */ - zathura_jumplist_backward(zathura); - prev2_jump = zathura_jumplist_current(zathura); - if (prev2_jump) { - prev2_page = prev2_jump->page; - have_prev2 = true; - } - zathura_jumplist_forward(zathura); - } - zathura_jumplist_forward(zathura); + girara_debug("bisecting between %d and %d, at %d", zathura->bisect.start, zathura->bisect.end, cur_page); + if (zathura->bisect.start == zathura->bisect.end) { + /* nothing to do */ + return false; } /* now, we are back at the initial jump. prev_page and prev2_page contain the pages for previous and second previous jump if they exist. */ + unsigned int next_page = cur_page; + unsigned int next_start = zathura->bisect.start; + unsigned int next_end = zathura->bisect.end; + /* bisect */ switch(direction) { case FORWARD: - if (have_prev && cur_page <= prev_page) { - /* add a new jump point */ - if (cur_page < prev_page) { - zathura_jumplist_add(zathura); - page_set(zathura, (cur_page + prev_page)/2); - zathura_jumplist_add(zathura); + if (cur_page != zathura->bisect.end) { + next_page = (cur_page + zathura->bisect.end) / 2; + if (next_page == cur_page) { + ++next_page; } - - } else if (have_prev2 && cur_page <= prev2_page) { - /* save current position at previous jump point */ - if (cur_page < prev2_page) { - zathura_jumplist_backward(zathura); - zathura_jumplist_add(zathura); - zathura_jumplist_forward(zathura); - - page_set(zathura, (cur_page + prev2_page)/2); - zathura_jumplist_add(zathura); - } - } else { - /* none of prev_page or prev2_page comes after cur_page */ - zathura_jumplist_add(zathura); - page_set(zathura, (cur_page + number_of_pages - 1)/2); - zathura_jumplist_add(zathura); + next_start = cur_page; } break; case BACKWARD: - if (have_prev && prev_page <= cur_page) { - /* add a new jump point */ - if (prev_page < cur_page) { - zathura_jumplist_add(zathura); - page_set(zathura, (cur_page + prev_page)/2); - zathura_jumplist_add(zathura); + if (cur_page != zathura->bisect.start) { + next_page = (cur_page + zathura->bisect.start) / 2; + if (next_page == cur_page) { + --next_page; } - - } else if (have_prev2 && prev2_page <= cur_page) { - /* save current position at previous jump point */ - if (prev2_page < cur_page) { - zathura_jumplist_backward(zathura); - zathura_jumplist_add(zathura); - zathura_jumplist_forward(zathura); - - page_set(zathura, (cur_page + prev2_page)/2); - zathura_jumplist_add(zathura); - } - - } else { - /* none of prev_page or prev2_page comes before cur_page */ - zathura_jumplist_add(zathura); - page_set(zathura, cur_page/2); - zathura_jumplist_add(zathura); + next_end = cur_page; } break; } + if (next_page == cur_page) { + /* nothing to do */ + return false; + } + + girara_debug("bisecting between %d and %d, jumping to %d", zathura->bisect.start, zathura->bisect.end, next_page); + zathura->bisect.last_jump = next_page; + zathura->bisect.start = next_start; + zathura->bisect.end = next_end; + + page_set(zathura, next_page); + zathura_jumplist_add(zathura); + /* adjust horizontal position */ GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); cb_view_hadjustment_changed(hadjustment, zathura); diff --git a/zathura.h b/zathura.h index ac22636..cafbc34 100644 --- a/zathura.h +++ b/zathura.h @@ -163,6 +163,15 @@ struct zathura_s unsigned int size; unsigned int num_cached_pages; } page_cache; + + /** + * Bisect stage + */ + struct { + unsigned int last_jump; /**< Page jumped to by bisect */ + unsigned int start; /**< Bisection range - start */ + unsigned int end; /**< Bisection range - end */ + } bisect; }; /** From 7f42ccbdad195c66526619a6c230c0ec75772839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abd=C3=B3=20Roig-Maranges?= Date: Sun, 7 Jul 2013 00:12:45 +0200 Subject: [PATCH 30/45] Improve bisect setup Signed-off-by: Sebastian Ramacher --- shortcuts.c | 90 +++++++++++++++++------------------------------------ 1 file changed, 28 insertions(+), 62 deletions(-) diff --git a/shortcuts.c b/shortcuts.c index 44295a3..87d5c41 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -818,68 +818,38 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, } else if (argument != NULL) { direction = argument->n; + /* setup initial bisect range */ zathura_jump_t* jump = zathura_jumplist_current(zathura); if (jump == NULL) { girara_debug("bisecting between first and last page because there are no jumps"); zathura->bisect.start = 0; zathura->bisect.end = num_pages - 1; - } else { - if (jump->page != cur_page || jump->page != zathura->bisect.last_jump) { - girara_debug("last jump doesn't match up, starting new bisecting"); - zathura->bisect.start = 0; - zathura->bisect.end = num_pages - 1; - /* check if we have previous jumps */ - if (zathura_jumplist_has_previous(zathura) == true) { - zathura_jumplist_backward(zathura); - jump = zathura_jumplist_current(zathura); + } if (jump->page != cur_page || jump->page != zathura->bisect.last_jump) { + girara_debug("last jump doesn't match up, starting new bisecting"); + zathura->bisect.start = 0; + zathura->bisect.end = num_pages - 1; - unsigned int prev_page = 0; - unsigned int prev_page2 = num_pages - 1; - if (jump != NULL) { - prev_page = jump->page; - } - - prev_page2 = prev_page; - if (zathura_jumplist_has_previous(zathura) == true) { - zathura_jumplist_backward(zathura); - jump = zathura_jumplist_current(zathura); - if (jump != NULL) { - prev_page2 = jump->page; - } - zathura_jumplist_forward(zathura); - } - zathura_jumplist_forward(zathura); - - if (prev_page == prev_page2) { - if (prev_page > cur_page) { - zathura->bisect.end = prev_page; - } else { - zathura->bisect.start = prev_page; - } - } else { - zathura->bisect.start = MIN(prev_page, prev_page2); - zathura->bisect.end = MAX(prev_page, prev_page2); - } - } - - /* some sanity checks on new bounds */ - if (cur_page < zathura->bisect.start) { - if (direction == FORWARD) { - zathura->bisect.start = cur_page; - } else { - zathura->bisect.start = cur_page; - zathura->bisect.end = 0; - } - } else if (cur_page > zathura->bisect.end) { - if (direction == BACKWARD) { - zathura->bisect.end = cur_page; - } else { - zathura->bisect.start = cur_page; - zathura->bisect.end = num_pages - 1; - } - } + unsigned int prev_page; + if (direction == FORWARD) { + prev_page = num_pages - 1; + } else { + prev_page = 0; } + + /* check if we have previous jumps */ + if (zathura_jumplist_has_previous(zathura) == true) { + zathura_jumplist_backward(zathura); + jump = zathura_jumplist_current(zathura); + if (jump != NULL) { + prev_page = jump->page; + } + zathura_jumplist_forward(zathura); + } + + zathura->bisect.start = MIN(prev_page, cur_page); + zathura->bisect.end = MAX(prev_page, cur_page); + zathura->bisect.last_jump = cur_page; } } else { return false; @@ -891,14 +861,13 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, return false; } - /* now, we are back at the initial jump. prev_page and prev2_page contain - the pages for previous and second previous jump if they exist. */ - unsigned int next_page = cur_page; unsigned int next_start = zathura->bisect.start; unsigned int next_end = zathura->bisect.end; - /* bisect */ + /* here we have next_start <= next_page <= next_end */ + + /* bisect step */ switch(direction) { case FORWARD: if (cur_page != zathura->bisect.end) { @@ -931,13 +900,10 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, zathura->bisect.start = next_start; zathura->bisect.end = next_end; + zathura_jumplist_add(zathura); page_set(zathura, next_page); zathura_jumplist_add(zathura); - /* adjust horizontal position */ - GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); - cb_view_hadjustment_changed(hadjustment, zathura); - return false; } From 7cdd1e7719d6ab1d491dbeead002d84c0bf6f58a Mon Sep 17 00:00:00 2001 From: Abdo Roig-Maranges Date: Sat, 6 Jul 2013 21:55:35 +0200 Subject: [PATCH 31/45] refresh horizontal position in page_set After page_set cb_view_hadjustment_changed must be called so that when zoom-center is enabled, the page is recentered. Signed-off-by: Sebastian Ramacher --- shortcuts.c | 7 ------- zathura.c | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/shortcuts.c b/shortcuts.c index 87d5c41..244ada1 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -333,9 +333,6 @@ sc_goto(girara_session_t* session, girara_argument_t* argument, girara_event_t* page_set(zathura, zathura_document_get_number_of_pages(zathura->document) - 1); } - /* adjust horizontal position */ - GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); - cb_view_hadjustment_changed(hadjustment, zathura); zathura_jumplist_add(zathura); return false; @@ -472,10 +469,6 @@ sc_navigate(girara_session_t* session, girara_argument_t* argument, page_set(zathura, new_page); - /* adjust horizontal position */ - GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); - cb_view_hadjustment_changed(hadjustment, zathura); - return false; } diff --git a/zathura.c b/zathura.c index 0165e40..d4d638d 100644 --- a/zathura.c +++ b/zathura.c @@ -1031,6 +1031,9 @@ page_set(zathura_t* zathura, unsigned int page_id) zathura_adjustment_set_value(view_hadjustment, offset.x); zathura_adjustment_set_value(view_vadjustment, offset.y); + /* refresh horizontal adjustment, to honor zoom-center */ + cb_view_hadjustment_changed(view_hadjustment, zathura); + statusbar_page_number_update(zathura); return true; From 2b6fa0cfe65bbc86995eb456215031c3aca1eaf7 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Sun, 7 Jul 2013 00:40:32 +0200 Subject: [PATCH 32/45] Fix missing else in if condition --- shortcuts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shortcuts.c b/shortcuts.c index 244ada1..937a8cd 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -818,7 +818,7 @@ sc_bisect(girara_session_t* session, girara_argument_t* argument, zathura->bisect.start = 0; zathura->bisect.end = num_pages - 1; - } if (jump->page != cur_page || jump->page != zathura->bisect.last_jump) { + } else if (jump->page != cur_page || jump->page != zathura->bisect.last_jump) { girara_debug("last jump doesn't match up, starting new bisecting"); zathura->bisect.start = 0; zathura->bisect.end = num_pages - 1; From f3229a6a5af94ca76c2b59291f5bb3685f820b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abd=C3=B3=20Roig-Maranges?= Date: Sun, 7 Jul 2013 17:27:25 +0200 Subject: [PATCH 33/45] Initialize bisect state when opening document Otherwise, when opening a document at page 1, and no jumps are added, bisect does not understand it has to initialize the bisect range, and does not move from page 1. Signed-off-by: Sebastian Ramacher --- shortcuts.c | 6 +++++- zathura.c | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/shortcuts.c b/shortcuts.c index 937a8cd..6606d60 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -722,7 +722,11 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, zathura_t* zathura = session->global.data; g_return_val_if_fail(argument != NULL, false); g_return_val_if_fail(zathura->document != NULL, false); - g_return_val_if_fail(zathura->jumplist.size != 0, false); + + /* if no jumps in the jumplist */ + if (zathura->jumplist.size == 0) { + return; + } GtkAdjustment* hadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); GtkAdjustment* vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); diff --git a/zathura.c b/zathura.c index d4d638d..70fa5cc 100644 --- a/zathura.c +++ b/zathura.c @@ -654,6 +654,11 @@ document_open(zathura_t* zathura, const char* path, const char* password, zathura_document_set_adjust_mode(document, ZATHURA_ADJUST_NONE); } + /* initialize bisect state */ + zathura->bisect.start = 0; + zathura->bisect.last_jump = zathura_document_get_current_page_number(document); + zathura->bisect.end = number_of_pages - 1; + /* update statusbar */ bool basename_only = false; girara_setting_get(zathura->ui.session, "statusbar-basename", &basename_only); From 2ad8571f41fa747b4dee227106f35ea3f50defeb Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 25 Jul 2013 21:57:39 +0200 Subject: [PATCH 34/45] Add missing includes Also fix other compiler warnings. Closes: #332 Signed-off-by: Sebastian Ramacher --- document.c | 1 + main.c | 1 + zathura.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/document.c b/document.c index c90c2a5..377c897 100644 --- a/document.c +++ b/document.c @@ -14,6 +14,7 @@ #ifdef WITH_MAGIC #include #endif +#include #include #include diff --git a/main.c b/main.c index 69562a4..26d561a 100644 --- a/main.c +++ b/main.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "zathura.h" #include "utils.h" diff --git a/zathura.c b/zathura.c index 70fa5cc..eaea7ec 100644 --- a/zathura.c +++ b/zathura.c @@ -1400,7 +1400,7 @@ zathura_page_cache_lru_invalidate(zathura_t* zathura) g_return_val_if_fail(page_widget != NULL, -1); zathura_page_widget_update_surface(ZATHURA_PAGE(page_widget), NULL); - girara_debug("Invalidated page %d at cache index %ld", zathura->page_cache.cache[lru_index] + 1, lru_index); + girara_debug("Invalidated page %d at cache index %zd", zathura->page_cache.cache[lru_index] + 1, lru_index); zathura->page_cache.cache[lru_index] = -1; --zathura->page_cache.num_cached_pages; @@ -1457,7 +1457,7 @@ zathura_page_cache_add(zathura_t* zathura, unsigned int page_index) zathura->page_cache.cache[idx] = page_index; ++zathura->page_cache.num_cached_pages; - girara_debug("Page %d is cached at cache index %ld", page_index + 1, idx); + girara_debug("Page %d is cached at cache index %zd", page_index + 1, idx); return; } From 71a332ede8351fd00792b0bc2e5ca1ccf4de69a1 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Fri, 26 Jul 2013 09:04:08 +0200 Subject: [PATCH 35/45] Fix return with no value --- shortcuts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shortcuts.c b/shortcuts.c index 6606d60..f5d551c 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -725,7 +725,7 @@ sc_jumplist(girara_session_t* session, girara_argument_t* argument, /* if no jumps in the jumplist */ if (zathura->jumplist.size == 0) { - return; + return true; } GtkAdjustment* hadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); From d699424cbed7d3f5ec6d43eda69a9a36db30a853 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Fri, 26 Jul 2013 09:07:05 +0200 Subject: [PATCH 36/45] Add missing field initializer --- links.c | 2 +- plugin.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/links.c b/links.c index dc5a837..981c446 100644 --- a/links.c +++ b/links.c @@ -108,7 +108,7 @@ zathura_link_target_t zathura_link_get_target(zathura_link_t* link) { if (link == NULL) { - zathura_link_target_t target = { 0 }; + zathura_link_target_t target = { 0, NULL, 0, 0, 0, 0, 0, 0 }; return target; } diff --git a/plugin.c b/plugin.c index 91433e7..a45172d 100644 --- a/plugin.c +++ b/plugin.c @@ -400,6 +400,6 @@ zathura_plugin_get_version(zathura_plugin_t* plugin) return plugin->version; } - zathura_plugin_version_t version = { 0 }; + zathura_plugin_version_t version = { 0, 0, 0 }; return version; } From 03ea66c6ff41702a414e3ff2bc0582e1c612a9e4 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 26 Jul 2013 16:13:41 +0200 Subject: [PATCH 37/45] Replace tabs with spaces Signed-off-by: Sebastian Ramacher --- callbacks.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/callbacks.c b/callbacks.c index b9dca4b..0d9a549 100644 --- a/callbacks.c +++ b/callbacks.c @@ -95,9 +95,9 @@ cb_view_vadjustment_value_changed(GtkAdjustment* GIRARA_UNUSED(adjustment), gpoi if (gdk_rectangle_intersect(&view_rect, &page_rect, NULL) == TRUE) { if (zathura_page_get_visibility(page) == false) { - zathura_page_set_visibility(page, true); - zathura_page_widget_update_view_time(ZATHURA_PAGE(page_widget)); - zathura_page_cache_add(zathura, zathura_page_get_index(page)); + zathura_page_set_visibility(page, true); + zathura_page_widget_update_view_time(ZATHURA_PAGE(page_widget)); + zathura_page_cache_add(zathura, zathura_page_get_index(page)); } if (zathura->global.update_page_number == true && updated == false && gdk_rectangle_intersect(¢er, &page_rect, NULL) == TRUE) { @@ -111,7 +111,7 @@ cb_view_vadjustment_value_changed(GtkAdjustment* GIRARA_UNUSED(adjustment), gpoi g_object_get(page_widget, "search-results", &results, NULL); if (results != NULL) { - g_object_set(page_widget, "search-current", 0, NULL); + g_object_set(page_widget, "search-current", 0, NULL); } } } From 12f7b393a60846d4a6131451afeb501fbb9299a3 Mon Sep 17 00:00:00 2001 From: Guillaume Duranceau Date: Mon, 22 Jul 2013 23:01:05 +1000 Subject: [PATCH 38/45] new window-title-page option When set to 'true', this option displays the page number in the title of a zathura window. --- config.c | 2 ++ document.c | 13 +++++++++++++ document.h | 8 ++++++++ zathura.c | 24 ++++++++++++++++++------ zathurarc.5.rst | 16 ++++++++++++++++ 5 files changed, 57 insertions(+), 6 deletions(-) diff --git a/config.c b/config.c index 4adab3a..88f007d 100644 --- a/config.c +++ b/config.c @@ -217,6 +217,8 @@ config_load_default(zathura_t* zathura) bool_value = false; girara_setting_add(gsession, "window-title-basename", &bool_value, BOOLEAN, false, _("Use basename of the file in the window title"), NULL, NULL); bool_value = false; + girara_setting_add(gsession, "window-title-page", &bool_value, BOOLEAN, false, _("Display the page number in the window title"), NULL, NULL); + bool_value = false; girara_setting_add(gsession, "statusbar-basename", &bool_value, BOOLEAN, false, _("Use basename of the file in the statusbar"), NULL, NULL); bool_value = false; girara_setting_add(gsession, "synctex", &bool_value, BOOLEAN, false, _("Enable synctex support"), NULL, NULL); diff --git a/document.c b/document.c index 377c897..ced8ea3 100644 --- a/document.c +++ b/document.c @@ -41,6 +41,7 @@ static const gchar* guess_type(const char* path); */ struct zathura_document_s { char* file_path; /**< File path of the document */ + char* basename; /**< Basename of the document */ const char* password; /**< Password of the document */ unsigned int current_page_number; /**< Current page number */ unsigned int number_of_pages; /**< Number of pages */ @@ -118,6 +119,7 @@ zathura_document_open(zathura_plugin_manager_t* plugin_manager, const char* document = g_malloc0(sizeof(zathura_document_t)); document->file_path = real_path; + document->basename = g_path_get_basename(real_path); document->password = password; document->scale = 1.0; document->plugin = plugin; @@ -200,6 +202,7 @@ zathura_document_free(zathura_document_t* document) if (document->file_path != NULL) { free(document->file_path); } + g_free(document->basename); g_free(document); @@ -216,6 +219,16 @@ zathura_document_get_path(zathura_document_t* document) return document->file_path; } +const char* +zathura_document_get_basename(zathura_document_t* document) +{ + if (document == NULL) { + return NULL; + } + + return document->basename; +} + const char* zathura_document_get_password(zathura_document_t* document) { diff --git a/document.h b/document.h index 5f18047..2ce1c68 100644 --- a/document.h +++ b/document.h @@ -38,6 +38,14 @@ zathura_error_t zathura_document_free(zathura_document_t* document); */ const char* zathura_document_get_path(zathura_document_t* document); +/** + * Returns the basename of the document + * + * @param document The document + * @return The basename of the document + */ +const char* zathura_document_get_basename(zathura_document_t* document); + /** * Returns the password of the document * diff --git a/zathura.c b/zathura.c index eaea7ec..4bf53a6 100644 --- a/zathura.c +++ b/zathura.c @@ -665,9 +665,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, if (basename_only == false) { girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, file_path); } else { - char* tmp = g_path_get_basename(file_path); - girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, tmp); - g_free(tmp); + girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, zathura_document_get_basename(document)); } /* install file monitor */ @@ -787,9 +785,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, if (basename_only == false) { girara_set_window_title(zathura->ui.session, file_path); } else { - char* tmp = g_path_get_basename(file_path); - girara_set_window_title(zathura->ui.session, tmp); - g_free(tmp); + girara_set_window_title(zathura->ui.session, zathura_document_get_basename(document)); } g_free(file_uri); @@ -1061,6 +1057,22 @@ statusbar_page_number_update(zathura_t* zathura) if (zathura->document != NULL) { char* page_number_text = g_strdup_printf("[%d/%d]", current_page_number + 1, number_of_pages); girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.page_number, page_number_text); + + bool page_number_in_window_title = false; + girara_setting_get(zathura->ui.session, "window-title-page", &page_number_in_window_title); + + if (page_number_in_window_title == true) { + bool basename_only = false; + girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); + char* title = g_strdup_printf("%s %s", + (basename_only == true) + ? zathura_document_get_basename(zathura->document) + : zathura_document_get_path(zathura->document), + page_number_text); + girara_set_window_title(zathura->ui.session, title); + g_free(title); + } + g_free(page_number_text); } else { girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.page_number, ""); diff --git a/zathurarc.5.rst b/zathurarc.5.rst index 9e1f571..17bad11 100644 --- a/zathurarc.5.rst +++ b/zathurarc.5.rst @@ -370,6 +370,15 @@ Defines the font that will be used * Value type: String * Default value: monospace normal 9 +guioptions +^^^^^^^^^^ +Shows or hides GUI elements. +When it contains 'c', the command line is showed. +When it contains 's', the statusbar is showed. + +* Value type: String +* Default value: s + inputbar-bg ^^^^^^^^^^^ Defines the background color for the inputbar @@ -698,6 +707,13 @@ Use basename of the file in the window title. * Value type: Boolean * Default value: false +window-title-page +^^^^^^^^^^^^^^^^^ +Display the page number in the window title. + +* Value type: Boolean +* Default value: false + statusbar-basename ^^^^^^^^^^^^^^^^^^ Use basename of the file in the statusbar. From c6140296cdf34f1aec726ef9b6d1f0f4f48d3cf1 Mon Sep 17 00:00:00 2001 From: Guillaume Duranceau Date: Wed, 24 Jul 2013 22:44:54 +1000 Subject: [PATCH 39/45] Update page number on mouse scroll When scrolling a document by holding the middle mouse button, page number was not updated. --- shortcuts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/shortcuts.c b/shortcuts.c index f5d551c..d251cdd 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -386,6 +386,7 @@ sc_mouse_scroll(girara_session_t* session, girara_argument_t* argument, girara_e gtk_adjustment_get_value(x_adj) - (event->x - x)); zathura_adjustment_set_value(y_adj, gtk_adjustment_get_value(y_adj) - (event->y - y)); + zathura->global.update_page_number = true; break; /* unhandled events */ From f98514d5ed4254e9adfd6d525d21c34e561d89e2 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sat, 27 Jul 2013 01:34:42 +0200 Subject: [PATCH 40/45] Increase reference in zathura_page_widget_update_surface and always destroy in render. Signed-off-by: Sebastian Ramacher --- page-widget.c | 4 +++- render.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/page-widget.c b/page-widget.c index 0c95624..75694a6 100644 --- a/page-widget.c +++ b/page-widget.c @@ -505,11 +505,13 @@ zathura_page_widget_update_surface(ZathuraPage* widget, cairo_surface_t* surface zathura_page_widget_private_t* priv = ZATHURA_PAGE_GET_PRIVATE(widget); mutex_lock(&(priv->lock)); if (priv->surface != NULL) { - cairo_surface_finish(priv->surface); cairo_surface_destroy(priv->surface); } priv->render_requested = false; priv->surface = surface; + if (priv->surface != NULL) { + cairo_surface_reference(surface); + } mutex_unlock(&(priv->lock)); /* force a redraw here */ if (priv->surface != NULL) { diff --git a/render.c b/render.c index b2ad38b..e8bcde3 100644 --- a/render.c +++ b/render.c @@ -266,10 +266,10 @@ render(zathura_t* zathura, zathura_page_t* page) GtkWidget* widget = zathura_page_get_widget(zathura, page); zathura_page_widget_update_surface(ZATHURA_PAGE(widget), surface); gdk_threads_leave(); - } else { - cairo_surface_destroy(surface); } + cairo_surface_destroy(surface); + return true; } From b5237680f28d585fecf1c6d23bc7ec044e623ae1 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sat, 27 Jul 2013 16:25:20 +0200 Subject: [PATCH 41/45] Don't store surface for invisible and uncached pages Signed-off-by: Sebastian Ramacher --- callbacks.c | 6 ++++++ page-widget.c | 20 +++++++++++++++++--- page-widget.h | 8 ++++++++ zathura.c | 5 ++--- zathura.h | 10 ++++++++++ 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/callbacks.c b/callbacks.c index 0d9a549..1c49df0 100644 --- a/callbacks.c +++ b/callbacks.c @@ -106,6 +106,12 @@ cb_view_vadjustment_value_changed(GtkAdjustment* GIRARA_UNUSED(adjustment), gpoi } } else { zathura_page_set_visibility(page, false); + /* if the page is not visible and not cached, but still has a surface, we + * need to get rid of the surface */ + if (zathura_page_widget_have_surface(ZATHURA_PAGE(page_widget)) == true && + zathura_page_cache_is_cached(zathura, zathura_page_get_index(page)) == false) { + zathura_page_widget_update_surface(ZATHURA_PAGE(page_widget), NULL); + } girara_list_t* results = NULL; g_object_get(page_widget, "search-results", &results, NULL); diff --git a/page-widget.c b/page-widget.c index 75694a6..adf69da 100644 --- a/page-widget.c +++ b/page-widget.c @@ -506,11 +506,16 @@ zathura_page_widget_update_surface(ZathuraPage* widget, cairo_surface_t* surface mutex_lock(&(priv->lock)); if (priv->surface != NULL) { cairo_surface_destroy(priv->surface); + priv->surface = NULL; } priv->render_requested = false; - priv->surface = surface; - if (priv->surface != NULL) { - cairo_surface_reference(surface); + if (surface != NULL) { + /* if we're not visible or not cached, we don't care about the surface */ + if (zathura_page_get_visibility(priv->page) == true || + zathura_page_cache_is_cached(priv->zathura, zathura_page_get_index(priv->page)) == true) { + priv->surface = surface; + cairo_surface_reference(surface); + } } mutex_unlock(&(priv->lock)); /* force a redraw here */ @@ -876,3 +881,12 @@ zathura_page_widget_update_view_time(ZathuraPage* widget) priv->last_view = g_get_real_time(); } } + +bool +zathura_page_widget_have_surface(ZathuraPage* widget) +{ + g_return_val_if_fail(ZATHURA_IS_PAGE(widget) == TRUE, false); + zathura_page_widget_private_t* priv = ZATHURA_PAGE_GET_PRIVATE(widget); + return priv->surface != NULL; +} + diff --git a/page-widget.h b/page-widget.h index 5609e78..b9a1c38 100644 --- a/page-widget.h +++ b/page-widget.h @@ -88,4 +88,12 @@ zathura_link_t* zathura_page_widget_link_get(ZathuraPage* widget, unsigned int i */ void zathura_page_widget_update_view_time(ZathuraPage* widget); +/** + * Check if we have a surface. + * + * @param widget the widget + * @returns true if the widget has a surface, false otherwise + */ +bool zathura_page_widget_have_surface(ZathuraPage* widget); + #endif diff --git a/zathura.c b/zathura.c index 4bf53a6..5506c2c 100644 --- a/zathura.c +++ b/zathura.c @@ -54,7 +54,6 @@ typedef struct position_set_delayed_s { } position_set_delayed_t; static gboolean document_info_open(gpointer data); -static bool zathura_page_cache_is_cached(zathura_t* zathura, unsigned int page_index); static ssize_t zathura_page_cache_lru_invalidate(zathura_t* zathura); static void zathura_page_cache_invalidate_all(zathura_t* zathura); static bool zathura_page_cache_is_full(zathura_t* zathura, bool* result); @@ -1364,7 +1363,7 @@ zathura_jumplist_save(zathura_t* zathura) } } -static bool +bool zathura_page_cache_is_cached(zathura_t* zathura, unsigned int page_index) { g_return_val_if_fail(zathura != NULL, false); @@ -1452,7 +1451,7 @@ zathura_page_cache_add(zathura_t* zathura, unsigned int page_index) g_return_if_fail(page != NULL); - if (zathura_page_cache_is_cached(zathura, page_index)) { + if (zathura_page_cache_is_cached(zathura, page_index) == true) { return; } diff --git a/zathura.h b/zathura.h index cafbc34..13df384 100644 --- a/zathura.h +++ b/zathura.h @@ -421,4 +421,14 @@ bool zathura_jumplist_load(zathura_t* zathura, const char* file); */ void zathura_page_cache_add(zathura_t* zathura, unsigned int page_index); +/** + * Checks if the given page is cached + * + * @param zathura The zathura session + * @param page_index The index of the page that may be cached + * + * @return true if page is cached otherwise false + */ +bool zathura_page_cache_is_cached(zathura_t* zathura, unsigned int page_index); + #endif // ZATHURA_H From c5e593d3c52f9da18cc0643334ea0e1a335237f1 Mon Sep 17 00:00:00 2001 From: Marawan Tanager Date: Thu, 8 Aug 2013 19:48:31 +0200 Subject: [PATCH 42/45] Don't hide the inputbar in case of incremental search Hiding the inputbar immediately before jumping breaks incremental search, as Guillaume Duranceau stated in an earlier mail. This patch makes an exception for the case of incremental search, at the cost of a slight displacement when jumping back (^o) after ending the incremental search (pressing the ESC key). The rest of the jump cases are unaffected. This should makes things usable for now, until we move to GTK3 (link to it by default) which has a new widget that suits this problem nicely (GtkOverlay), as demonstrated by an earlier patch by Abdo Roig-Maranges which is now included on the develop branch in girara repo as commit 70fd1cf354ee1300d4a9bdab9e939d5cc975979e, but is compiled only with GTK3. Signed-off-by: Sebastian Ramacher --- zathura.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/zathura.c b/zathura.c index 5506c2c..4de8c8c 100644 --- a/zathura.c +++ b/zathura.c @@ -1188,6 +1188,17 @@ zathura_jumplist_hide_inputbar(zathura_t* zathura) girara_isc_completion(zathura->ui.session, &arg, NULL, 0); if (zathura->ui.session->global.autohide_inputbar == true) { + char *input = gtk_editable_get_chars(GTK_EDITABLE(zathura->ui.session->gtk.inputbar_entry), 0, -1); + bool res = false; + + girara_setting_get(zathura->ui.session, "incremental-search", &res); + + if ((*input == '/' || *input == '?') && res == true) { + g_free(input); + + return; + } + gtk_widget_hide(zathura->ui.session->gtk.inputbar); } From 033833c50d7893e8d29d3a10201bbe2d92e202c0 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 14 Aug 2013 23:39:34 +0200 Subject: [PATCH 43/45] Document that workaround And a remainder that we want to drop this once we don't support GTK+2 anymore. Signed-off-by: Sebastian Ramacher --- zathura.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zathura.c b/zathura.c index 4de8c8c..182a99a 100644 --- a/zathura.c +++ b/zathura.c @@ -1188,6 +1188,9 @@ zathura_jumplist_hide_inputbar(zathura_t* zathura) girara_isc_completion(zathura->ui.session, &arg, NULL, 0); if (zathura->ui.session->global.autohide_inputbar == true) { + /* XXX: This is a workaround for incremental-search. We should revisit this + * when we drop GTK+3 support and the inputbar is placed in a GtkOverlay + * widget. */ char *input = gtk_editable_get_chars(GTK_EDITABLE(zathura->ui.session->gtk.inputbar_entry), 0, -1); bool res = false; @@ -1198,6 +1201,7 @@ zathura_jumplist_hide_inputbar(zathura_t* zathura) return; } + /* */ gtk_widget_hide(zathura->ui.session->gtk.inputbar); } From eabc306ec837b037d3e63f9290e07e6e566c24d8 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 15 Aug 2013 00:37:57 +0200 Subject: [PATCH 44/45] Run update-po Signed-off-by: Sebastian Ramacher --- po/ca.po | 229 +++++++++++++++++++++++++++------------------------ po/cs.po | 229 +++++++++++++++++++++++++++------------------------ po/de.po | 229 +++++++++++++++++++++++++++------------------------ po/el.po | 230 ++++++++++++++++++++++++++++------------------------ po/eo.po | 229 +++++++++++++++++++++++++++------------------------ po/es.po | 230 ++++++++++++++++++++++++++++------------------------ po/es_CL.po | 229 +++++++++++++++++++++++++++------------------------ po/et.po | 225 ++++++++++++++++++++++++++------------------------ po/fr.po | 230 ++++++++++++++++++++++++++++------------------------ po/he.po | 225 ++++++++++++++++++++++++++------------------------ po/hr.po | 225 ++++++++++++++++++++++++++------------------------ po/id_ID.po | 229 +++++++++++++++++++++++++++------------------------ po/it.po | 229 +++++++++++++++++++++++++++------------------------ po/pl.po | 229 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 229 +++++++++++++++++++++++++++------------------------ po/ru.po | 229 +++++++++++++++++++++++++++------------------------ po/ta_IN.po | 229 +++++++++++++++++++++++++++------------------------ po/tr.po | 229 +++++++++++++++++++++++++++------------------------ po/uk_UA.po | 229 +++++++++++++++++++++++++++------------------------ 19 files changed, 2296 insertions(+), 2046 deletions(-) diff --git a/po/ca.po b/po/ca.po index 24e0bee..fec38b6 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:47+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:33+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/zathura/language/" "ca/)\n" @@ -20,112 +20,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Entrada invàlida '%s'." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Índex invàlid '%s'." -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "No s'ha obert cap document." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Nombre d'arguments invàlids." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Marcador actualitzat correctament: %s" +msgid "Could not update bookmark: %s" +msgstr "No s'ha pogut crear el marcador: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "No s'ha pogut crear el marcador: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Marcador actualitzat correctament: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Marcador creat correctament: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Esborrat el marcador: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "No s'ha pogut esborrar el marcador: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Marcador no existent: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Cap informació disponible." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Massa arguments." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Cap argument subministrat." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Document desat." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "No s'ha pogut desar el document." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Nombre d'arguments invàlids." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "No s'ha pogut escriure el fitxer adjunt '%s' a '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "S'ha escrit el fitxer adjunt '%s' a '%s'." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "S'ha escrit la imatge '%s' a '%s'." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "No s'ha pogut escriure la imatge '%s' a '%s'." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Imatge desconeguda '%s'." -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Imatge o fitxer adjunt desconegut '%s'." -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "L'argument ha de ser un nombre." @@ -144,318 +149,326 @@ msgid "Images" msgstr "Imatges" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Base de dades de rerefons" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Pas d'ampliació" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Separació entre pàgines" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Nombre de pàgines per fila" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "Columna de la primera pàgina" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Pas de desplaçament" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "Pas de desplaçament horitzontal" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "Superposició de pàgines completes de desplaçament" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Zoom mínim" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Zoom màxim" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "Nombre de posicions per recordar al jumplist" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Recolorejant (color fosc)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Recolorejant (color clar)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Color de realçament" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Color de realçament (activat)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Recolorejant les pàgines" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "Quan recoloregis manté el to original i ajusta només la lluminositat" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Desplaçament recollit" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "Desplaçament recollit" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Avançar nombre de pàgines per fila" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "Zoom centrat horitzontalment" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "Centra el resultat horitzontalment" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Transparència del realçat" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Renderitza 'Carregant ...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Ajustar al fitxer quan s'obri" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Mostra els directoris i fitxers ocults" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Mostra els directoris" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Obrir sempre la primera pàgina" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Realça els resultats de recerca" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "Habilita la cerca incremental" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Esborra els resultats de recerca a l'interrompre" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "Utilitza el nom base del fitxer en el títol de la finestra" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "Habilitar la compatibilitat amb synctex" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Afegir un marcador" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Esborrar un marcador" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Llista tots els marcadors" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Tancar el fitxer actual" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Mostra informació sobre el fitxer" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "Executar una comanda" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Mostrar l'ajuda" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Obrir document" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Tancar Zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Imprimir document" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Desar document" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Desar document (i forçar la sobreescritura)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Desa els fitxers adjunts" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Assigna el desplaçament de pàgina" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Marca la posició actual dins el document" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Esborrar les marques especificades" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "No realcis els resultats de la recerca actual" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Realça els resultats de recerca actual" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Mostra informació sobre la versió" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "No s'ha pogut executar xdg-open." -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "Enllaçar: pàgina %d" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "Enllaç: %s" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "Enllaç: Invàlid" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Reassigna a la finestra especificada per xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Ruta al directori de configuració" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Camí al directori de dades" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Camí al directori que conté els plugins" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Bifurca en segon pla" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Contrasenya del document" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Nivell de registre (depuració, informació, advertiments, errors)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Imprimeix informació sobre la versió" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "Editor synctex (reenviat a l'ordre synctex)" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Carregant..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Copiat el text seleccionat al porta-retalls: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Copia la imatge" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Desa imatge com a" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Aquest document no conté cap índex" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Sense nom]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/cs.po b/po/cs.po index 8b5d1c6..4e898ba 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:44+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:33+0200\n" "Last-Translator: Martin Pelikan \n" "Language-Team: pwmt.org \n" "Language: cs\n" @@ -14,112 +14,117 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Neplatný vstup: %s" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Neplatný index: %s" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Není otevřený žádný dokument." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Špatný počet argumentů." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Záložka úspěšně aktualizována: %s" +msgid "Could not update bookmark: %s" +msgstr "Nemůžu vytvořit záložku: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Nemůžu vytvořit záložku: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Záložka úspěšně aktualizována: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Záložka úspěšně vytvořena: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Záložka smazána: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Nemůžu smazat záložku: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Záložka neexistuje: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Nejsou dostupné žádné informace." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Příliš mnoho argumentů." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Nezadali jste argumenty." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Dokument uložen." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Nepovedlo se uložit dokument." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Špatný počet argumentů." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Nepovedlo se zapsat přílohu '%s' do '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Příloha '%s' zapsána do '%s'." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Obrázek '%s' zapsán do '%s'." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "Nepovedlo se zapsat obrázek '%s' do '%s'." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Neznámý obrázek '%s'." -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Neznámá příloha nebo obrázek '%s'." -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Argumentem musí být číslo." @@ -138,318 +143,326 @@ msgid "Images" msgstr "Obrázky" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Databázový backend" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Zoom step" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Mezery mezi stránkami" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Počet stránek na řádek" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Scroll step" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Oddálit" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Přiblížit" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Přebarvuji do tmava" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Přebarvuji do světla" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Barva zvýrazňovače" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Barva zvýrazňovače (aktivní)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Přebarvit stránky" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Scrollovat přes konce" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Průhlednost při zvýrazňování" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Vypisovat 'Načítám ...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Přiblížení po otevření souboru" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Zobrazovat skryté soubory" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Zobrazovat adresáře" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Vždy otevírat na první straně" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Zvýrazňovat výsledky hledání" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Při abortu smazat výsledky hledání" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Přidat záložku" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Smazat záložku" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Vypsat záložky" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Zavřít tenhle soubor" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Zobrazit informace o souboru" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Zobrazit nápovědu" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Otevřít dokument" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Zavřít zathuru" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Tisknout dokument" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Uložit dokument" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Uložit a přepsat dokument" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Uložit přílohy" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Označit současnou pozici v dokumentu" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Smazat vybrané značky" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "Nezvýrazňovat výsledky tohoto hledání" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Zvýrazňovat výsledky tohoto hledání" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Nepovedlo se spustit xdg-open." -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Cesta k souboru s nastavením" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Cesta k adresáři s daty" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Cesta k adresářům s pluginy" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Forknout se na pozadí" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Heslo" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Úroveň logování (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Zobrazit informace o souboru" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Načítám ..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Vybraný text zkopírován do schránky: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Zkopíruj obrázek" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Ulož obrázek jako" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Tenhle dokument neobsahuje žádné indexy" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Nepojmenovaný]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/de.po b/po/de.po index 78ee239..4ad8166 100644 --- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:44+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:37+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: German (http://www.transifex.com/projects/p/zathura/language/" "de/)\n" @@ -18,112 +18,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Ungültige Eingabe '%s' angegeben." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Ungültiger Index '%s' angegeben." -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Kein Dokument geöffnet." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Ungültige Anzahl an Argumenten angegeben." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Lesezeichen erfolgreich aktualisiert: %s." +msgid "Could not update bookmark: %s" +msgstr "Konnte Lesezeichen nicht erstellen: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Konnte Lesezeichen nicht erstellen: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Lesezeichen erfolgreich aktualisiert: %s." + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Lesezeichen erfolgreich erstellt: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Lesezeichen entfernt: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Konnte Lesezeichen nicht entfernen: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Lesezeichen existiert nicht: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Keine Information verfügbar." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Zu viele Argumente angegeben." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Keine Argumente angegeben." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Dokument gespeichert." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Konnte Dokument nicht speichern." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Ungültige Anzahl an Argumenten." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Konnte Anhang '%s' nicht nach '%s' schreiben." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Anhang '%s' nach '%s' geschrieben." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Anhang '%s' nach '%s' geschrieben." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "Konnte Anhang '%s' nicht nach '%s' schreiben." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Unbekanntes Bild '%s'." -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Unbekannter Anhanng oder Bild '%s'." -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Das Argument ist keine Zahl." @@ -142,320 +147,328 @@ msgid "Images" msgstr "Bilder" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Datenbank Backend" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Vergrößerungsstufe" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Abstand zwischen den Seiten" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Anzahl der Seiten in einer Reihe" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "Spalte der ersten Seite" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Schrittgröße beim Scrollen" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "Horizontale Schrittgröße beim Scrollen" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Minimale Vergrößerungsstufe" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Maximale Vergrößerungsstufe" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Neufärben (Dunkle Farbe)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Neufärben (Helle Farbe)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Farbe für eine Markierung" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Farbe für die aktuelle Markierung" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Färbe die Seiten ein" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" "Behalte beim Neuzeichnen den ursprünglichen Hue-Wert bei und stimme nur die " "Helligkeit ab" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Scroll-Umbruch" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Gehe Anzahl der Seiten in einer Reihe weiter" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "Horizontal zentrierter Zoom" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "Zentriere Ergebnis horizontal" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Transparenz einer Markierung" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Zeige 'Lädt...'-Text beim Zeichnen einer Seite" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Seite einpassen" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Zeige versteckte Dateien und Ordner an" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Zeige Ordner an" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Öffne Dokument immer auf der ersten Seite" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Hebe Suchergebnisse hervor" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Lösche Suchergebnisse bei Abbruch" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "Verwende den Dateinamen der Datei im Fenstertitel" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "Verwende die Seitenzal im Fenstertitel" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "Verwende den Dateinamen der Datei in der Statusleiste" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "Aktiviere SyncTeX-Unterstützung" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Füge Lesezeichen hinzu" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Lösche ein Lesezeichen" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Liste all Lesezeichen auf" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Schließe das aktuelle Dokument" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Zeige Dokumentinformationen an" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "Führe einen Befehl aus" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Zeige Hilfe an" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Öffne Dokument" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Beende zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Drucke Dokument" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Speichere Dokument" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Speichere Dokument (und überschreibe bestehende)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Speichere Anhänge" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Setze den Seitenabstand" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Markiere aktuelle Position im Doukument" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Lösche angegebene Markierung" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "Hebe aktuelle Suchergebnisse nicht hervor" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Hebe aktuelle Suchergebnisse hervor" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Zeige Versionsinformationen an" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Konnte xdg-open nicht ausführen." -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "Verknüpfung: Seite %d" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "Verknüpfung: %s" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "Verknüpfung: ungültig" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Reparentiert zathura an das Fenster mit der xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Pfad zum Konfigurationsverzeichnis" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Pfad zum Datenverzeichnis" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Pfad zum Pluginverzeichnis" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Forkt den Prozess in den Hintergrund" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Dokument Passwort" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Log-Stufe (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Zeige Versionsinformationen an" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "Synctex Editor (wird an synctex weitergeleitet)" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Lädt..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Der gewählte Text wurde in die Zwischenablage kopiert: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Bild kopieren" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Bild speichern als" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Dieses Dokument beinhaltet kein Inhaltsverzeichnis." -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Kein Name]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "Dieses Dokument beinhaltet kein Seiten" diff --git a/po/el.po b/po/el.po index 4858709..6054066 100644 --- a/po/el.po +++ b/po/el.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:45+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:34+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Greek (http://www.transifex.com/projects/p/zathura/language/" "el/)\n" @@ -19,112 +19,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Η είσοδος '%s' είναι άκυρη." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Ο δείκτης '%s' είναι άκυρος." -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Δεν άνοιξε κανένα αρχείο. " -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Μη έγκυρος αριθμός παραμέτρων." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Η ενημέρωση του σελιδοδείκτη: %s ήταν επιτυχής. " +msgid "Could not update bookmark: %s" +msgstr "Η δημιουργία του σελιδοδείκτη: %s δεν ήταν δυνατή." #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Η δημιουργία του σελιδοδείκτη: %s δεν ήταν δυνατή." -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Η ενημέρωση του σελιδοδείκτη: %s ήταν επιτυχής. " + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Η δημιουργία του σελιδοδείκτη: %s ήταν επιτυχής." -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Ο σελιδοδείκτης: %s διεγράφει. " -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Η διαγραφή του σελιδοδείκτη: %s απέτυχε. " -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Ο σελιδοδείκτης: %s δεν βρέθηκε. " -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Εισήχθησαν πολλές παράμετροι. " -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Δεν εισήχθησαν παράμετροι. " -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Το αρχείο αποθηκεύτηκε." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Η αποθήκευση του αρχείου απέτυχε. " -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Μη έγκυρος ο αριθμός των παραμέτρων. " -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Μη επιτυχής η εγγραγή της προσάρτησης '%s' στην '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Επιτυχής η εγγραφή της προσάρτησης '%s' στην '%s'." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Ενεγράφει η εικόνα '%s' στην '%s'" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "Δεν ενεγράφει η εικόνα '%s' στην '%s'." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Άγνωστη εικόνα '%s'. " -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Άγνωστο προσάρτημα είτε εικόνα '%s'. " -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Η παράμετρος πρέπει να είναι αριθμός." @@ -143,320 +148,329 @@ msgid "Images" msgstr "Εικόνες" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Το βασικό εργαλείο της βάσης δεδομένων" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Βήμα μεγέθυνσης" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Διάκενο μεταξύ σελίδων" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Αριθμός σελίδων ανά γραμμή" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "Στήλη της πρώτης σελίδας" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Βήμα κύλισης" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "Βήμα οριζόντιας κύλησης" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Ελάχιστη μεγέθυνση" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Μέγιστη μεγέθυνση" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Επαναχρωματισμός (σκούρο χρώμα)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Επαναχρωματισμός (ανοικτό χρώμα)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Χρώμα τονισμού" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Χρώμα τονισμού (ενεργό)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Επαναχρωματισμός σελίδων" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" "Κατά τον επαναχρωματισμό της σελιδάς διατήρηση της αρχικής απόχρωσης και " "αλλαγή μόνο της φωτεινότητας" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Κυκλική κύληση" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Προώθηση σε αριθμό σελίδων ανά γραμμή" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "Μεγένθηση οριζοντίως κεντραρισμένη" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "Οριζόντιο κεντράρισμα αποτελεσμάτων" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Διαφάνεια για τονισμό" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Εμφάνιση της ένδειξης 'Φορτώνει ...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Προσαρμογή κατά το άνοιγμα του αρχείου" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Εμφάνιση κρυφών αρχείων και φακέλων" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Εμφάνιση καταλόγων" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Άνοιγμα πάντα στην πρώτη σελίδα" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Τονισμός αποτελεσμάτων αναζήτησης" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Εκκαθάριση των απολεσμάτων αναζήτησης κατά την διακοπή" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "Χρήση του ονόματος του αρχείο στο τίτλο του παραθύρου" -#: ../config.c:212 +#: ../config.c:220 +#, fuzzy +msgid "Display the page number in the window title" +msgstr "Χρήση του ονόματος του αρχείο στο τίτλο του παραθύρου" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "Ενεργοποίηση υποστήριξης synctex" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Προσθήκη σελιδοδείκτη" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Διαγραφή σελιδοδείκτη" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Εμφάνιση όλων των σελιδοδεικτών" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Κλείσιμο αρχείου" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Προβολή πληροφοριών αρχείου" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "Εκτέλεση εντολής" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Εμφάνιση βοήθειας" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Άνοιγμα αρχείου" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Κλείσιμο" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Εκτύπωση αρχείου" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Αποθήκευση αρχείου" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Αποθήκευση αρχείου (και αντικατάσταση)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Αποθήκευση προσαρτήσεων. " -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Ρύθμιση αντιστάθμισης σελίδας" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Επισήμανση τρέχουσας θέσης στο κείμενο" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Διαγραφή επιλεγμένων σημείων" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "Χωρίς τονισμό τα τρέχοντα αποτελέσματα της αναζήτησης" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Τονισμός στα τρέχοντα αποτελέσματα της αναζήτησης" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Εμφάνιση πληροφοριών έκδοσης" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Απέτυχε η εκτέλεση του xdg-open. " -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Reparents to window specified by xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Διαδρομή του αρχείου ρυθμίσεων" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Διαδρομή του φακέλου δεδομένων" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Διαδρομή φακέλου που περιέχει τα πρόσθετα" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Διακλάδωση στο παρασκήνιο" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Κωδικός αρχείου" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Επίπεδο καταγραφής (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Εκτύπωση πληροφοριών έκδοσης" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "Synctex editor (Προώθηση στην εντολή synctex)" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Φορτώνει ..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Το επιλεγμένο κείμενο αποθηκεύτηκε στην μνήμη: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Αντιγραφή εικόνας" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Αποθήκευση εικόνας ως..." -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Το αρχείο δεν περιέχει κανένα δείκτη" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Χωρίς όνομα]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/eo.po b/po/eo.po index d134177..1fa16a3 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:45+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:34+0200\n" "Last-Translator: norbux \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/zathura/" "language/eo/)\n" @@ -18,112 +18,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Nevalida enigo '%s' uzata." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Nevalida indekso '%s' uzata." -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Neniu dokumento malfermita." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Nevalida nombro da argumentoj uzata." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Paĝosigno sukcese aktualigita: %s" +msgid "Could not update bookmark: %s" +msgstr "Neeble krei paĝosignon: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Neeble krei paĝosignon: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Paĝosigno sukcese aktualigita: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Paĝosigno sukcese kreita: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Paĝosigno forigita: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Neeble forigi paĝosignon: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Neniu paĝosigno: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Neniu informacio disponebla." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Tro multe da argumentoj." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Neniuj argumentoj uzata." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Dokumento konservita." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Neeble konservi dokumenton." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Nevalida nombro da argumentoj." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Neeble skribi kunsendaĵon '%s' en '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Skribis kunsendaĵon '%s' en '%s'." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Skribis kunsendaĵon '%s' en '%s'." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "Neeble skribi kunsendaĵon '%s' en '%s'." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Nekonata bildo '%s'." -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Argumento devas esti nombro." @@ -142,318 +147,326 @@ msgid "Images" msgstr "Bildoj" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Zompaŝo" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Interpaĝa plenigo" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Nombro da paĝoj po vico" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Rulumpaŝo" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Mimimuma zomo" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Maksimuma zomo" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Rekolorigo (malhela koloro)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Rekolorigo (hela koloro)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Koloro por fonlumo" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Koloro por fonlumo (aktiva)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Rekoloru paĝojn" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Ĉirkaŭflua rulumado" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Travidebleco por fonlumo" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Bildigu 'Ŝargado ...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Adaptaĵo ĉe malfermo de dosiero" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Montru kaŝitajn dosierojn kaj -ujojn" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Montru dosierujojn" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Ĉiam malfermu ĉe unua paĝo" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Aldonu paĝosignon" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Forigu paĝosignon" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Listigu ĉiujn paĝosignojn" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Fermu nunan dosieron" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Montru dosiera informacio" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Montru helpon" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Malfermu dokumenton" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Fermu zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Presu dokumenton" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Konservu dokumenton" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Konservu dokumenton (deviga anstataŭo)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Konservu kunsendaĵojn" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Agordu paĝdelokado" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Fiaskis iro de xdg-open" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Vojo al la agorda dosierujo" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Vojo al la datuma dosierujo" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Vojoj al dosierujoj enhavantaj kromaĵojn" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Nivelo de ĵurnalo (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Montru dosiera informacio" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Ŝargado ..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Selektita teksto estas kopiita en la poŝo: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Kopiu bildon" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Savi bildojn kiel" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Ĉi-tiu dokumento enhavas neniam indekson." -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Neniu nomo]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/es.po b/po/es.po index 91d5f2e..d54c162 100644 --- a/po/es.po +++ b/po/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:45+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:34+0200\n" "Last-Translator: Moritz Lipp \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" "zathura/language/es/)\n" @@ -17,112 +17,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Entrada inválida: '%s'." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Índice invalido: '%s'." -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Ningún documento abierto." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Número de argumentos inválido." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Favorito actualizado con éxitosamente: %s" +msgid "Could not update bookmark: %s" +msgstr "Error al crear favorito: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Error al crear favorito: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Favorito actualizado con éxitosamente: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Favorito creado con éxitosamente: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Favorito eliminado: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Error al eliminar el favorito: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "No existe el favorito: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "No hay información disponible." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Demasiados argumentos." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Ningún argumento recibido." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Documento guardado." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Error al guardar el documento." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Número de argumentos inválido." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Escrito fichero adjunto '%s' a '%s'." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Escrito fichero adjunto '%s' a '%s'." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Imagen desconocida '%s'." -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Adjunto o imagen desconocidos '%s'." -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "El argumento ha de ser un número." @@ -141,320 +146,329 @@ msgid "Images" msgstr "Imágenes" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Base de datos" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Unidad de zoom" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Separación entre páginas" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Número de páginas por fila" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "Columna de la primera página" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Paso de desplazamiento" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "Paso de desplazamiento horizontal" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "Solapamiento del desplazamiento de página" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Zoom mínimo" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Zoom máximo" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "Número de posiciones a recordar en la lista de saltos" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Recoloreado (color oscuro)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Recoloreado (color claro)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Color para destacar" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Color para destacar (activo)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Recolorear páginas" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" "Cuando se recoloree, mantener el tono original y ajustar únicamente la " "luminosidad" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Navegación/Scroll cíclica/o" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "Zoom centrado horizontalmente" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "Centrar el resultado horizontalmente" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Transparencia para el destacado" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Renderizado 'Cargando ...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Ajustarse al abrir un fichero" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Mostrar directorios y ficheros ocultos" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Mostrar directorios" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Abrir siempre la primera página" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Destacar los resultados de búsqueda" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "Habilitar la búsqueda incremental" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Borrar resultados de búsqueda al abortar" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "Usar el nombre del archivo en el título de la ventana" -#: ../config.c:212 +#: ../config.c:220 +#, fuzzy +msgid "Display the page number in the window title" +msgstr "Usar el nombre del archivo en el título de la ventana" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "Habilitar soporte synctex" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Añadir Favorito" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Eliminar Favorito" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Listar favoritos" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Cerrar fichero actual" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Mostrar información del fichero" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "Ejecutar un comando" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Mostrar ayuda" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Abrir documento" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Salir de zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Imprimir documento" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Guardar documento" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Guardar documento (y sobreescribir)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Guardar ficheros adjuntos" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Asignar el desplazamiento de página" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Marcar la posición actual en el documento" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Borrar las marcas especificadas" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "No destacar los resultados de la búsqueda actual" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Destacar los resultados de la búsqueda actual" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Mostrar versión" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Error al tratar de ejecutar xdg-open" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Reasignar a la ventana especificada por xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Ruta al directorio de configuración" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Ruta para el directorio de datos" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Ruta a los directorios que contienen los plugins" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Fork, ejecutándose en background" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Contraseña del documento" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Nivel de log (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Mostrar información del fichero" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "Editor de Synctex (reenvíado al commando synctex)" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Cargando ..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Se ha copiado el texto seleccionado al portapapeles: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Copiar imagen" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Salvar imagen como" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Este documento no contiene ningún índice" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Sin nombre]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/es_CL.po b/po/es_CL.po index a4c558c..a163d2f 100644 --- a/po/es_CL.po +++ b/po/es_CL.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:45+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:34+0200\n" "Last-Translator: watsh1ken \n" "Language-Team: Spanish (Chile) (http://www.transifex.net/projects/p/zathura/" "language/es_CL/)\n" @@ -18,112 +18,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Entrada inválida: '%s'." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Índice invalido: '%s'." -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Ningún documento abierto." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Número de argumentos inválido." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Marcador actualizado exitosamente: %s" +msgid "Could not update bookmark: %s" +msgstr "No se pudo crear marcador: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "No se pudo crear marcador: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Marcador actualizado exitosamente: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Marcador creado exitosamente: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Marcador eliminado: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Error al eliminar marcador: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "No existe marcador: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "No hay información disponible." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Demasiados argumentos." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Ningún argumento recibido." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Documento guardado." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Error al guardar el documento." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Número de argumentos inválido." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Fichero adjunto escrito '%s' a '%s'." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Fichero adjunto escrito '%s' a '%s'." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "El argumento debe ser un número." @@ -142,318 +147,326 @@ msgid "Images" msgstr "" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Fin de la base de datos." -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Unidad de zoom" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Separación entre páginas" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Numero de páginas por fila" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Unidad de desplazamiento" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Zoom mínimo" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Zoom máximo" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Recolorando (color oscuro)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Recolorando (color claro)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Color para destacar" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Color para destacar (activo)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Recolorar páginas" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Scroll cíclico" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Transparencia para lo destacado" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Renderizando 'Cargando...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Ajustar al abrirse un archivo" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Mostrar archivos ocultos y directorios" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Mostrar directorios" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Siempre abrir en primera página" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Agregar un marcador" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Eliminar un marcador" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Listar todos los marcadores" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Cerrar archivo actual" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Mostrar información del archivo" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Mostrar ayuda" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Abrir documento" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Cerrar zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Imprimir documento" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Guardar documento" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Guardar documento (y forzar sobreescritura)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Guardar archivos adjuntos" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Asignar desplazamiento de la página" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Error al ejecutar xdg-open." -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Reasignar a la ventana especificada por xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Ruta al directorio de configuración" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Ruta al directorio de datos" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Ruta al directorio que contiene plugins" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Ejecución en background" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Nivel de log (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Mostrar información del archivo" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Cargando..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Texto seleccionado copiado al portapapeles: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Copiar imagen" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Este document no contiene índice" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Sin nombre]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/et.po b/po/et.po index 59fb30b..6594aea 100644 --- a/po/et.po +++ b/po/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" "PO-Revision-Date: 2012-04-03 15:25+0000\n" "Last-Translator: Rivo Zängov \n" "Language-Team: Estonian (http://www.transifex.net/projects/p/zathura/" @@ -18,30 +18,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "" -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "" -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" +msgid "Could not update bookmark: %s" msgstr "" #: ../commands.c:55 @@ -49,81 +49,86 @@ msgstr "" msgid "Could not create bookmark: %s" msgstr "" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" msgstr "" -#: ../commands.c:82 +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "" + +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "" -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "" -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "" -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "" -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "" -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "" -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "" -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "" -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "" @@ -142,318 +147,326 @@ msgid "Images" msgstr "" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Esiletõstmise värv" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Esiletõstmise värv (aktiivne)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Näita kaustasid" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Ava alati esimene leht" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Lisa järjehoidja" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Kustuta järjehoidja" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Näita kõiki järjehoidjaid" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Sulge praegune fail" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Näita faili infot" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Näita abiinfot" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Ava dokument" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Sule zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Prindi dokument" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Salvesta dokument" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Salvesta manused" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Näita faili infot" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "" -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Kopeeri pilt" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Nime pole]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/fr.po b/po/fr.po index 272d5b8..8ca7846 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-03-17 11:30+0100\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:34+0200\n" "Last-Translator: Benoît Knecht \n" "Language-Team: French (http://www.transifex.com/projects/p/zathura/language/" "fr/)\n" @@ -21,112 +21,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Entrée invalide : '%s'" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Index invalide : '%s'" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Aucun document ouvert." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Nombre d'arguments invalide." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Marque page mis à jour avec succès : %s" +msgid "Could not update bookmark: %s" +msgstr "Impossible de créer le marque-page : %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Impossible de créer le marque-page : %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Marque page mis à jour avec succès : %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Marque page créé avec succès : %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Marque page supprimé : %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Échec lors de la suppression du marque-page : %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Aucun marque-page correspondant : %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Aucune information disponible." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Trop d'arguments." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Aucun argument passé." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Document enregistré." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Échec lors de l'enregistrement du document." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Nombre d'arguments invalide." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Impossible d'écrire la pièce jointe '%s' dans '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Pièce jointe '%s' écrite dans '%s'." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Image '%s' écrite dans '%s'." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "Impossible d'écrire l'image '%s' dans '%s'." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Image '%s' inconnue." -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Pièce jointe ou image '%s' inconnue." -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "L'argument doit être un nombre." @@ -145,321 +150,330 @@ msgid "Images" msgstr "Images" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Gestionnaire de base de données" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Incrément de zoom" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Espacement entre les pages" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Nombre de page par rangée" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "Colonne de la première page" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Incrément de défilement" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "Incrément de défilement horizontal" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "Recouvrement lors du défilement par page entière" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Zoom minimum" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Zoom maximum" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "Nombre de positions à mémoriser dans la liste de sauts" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Recoloration (couleur sombre)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Recoloration (couleur claire)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Couleur de surbrillance" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Couleur de surbrillance (active)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "Couleur d'arrière-plan de 'Chargement...'" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "Couleur de 'Chargement...'" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Recoloriser les pages" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" "Lors de la recoloration garder la teinte d'origine et ajuster seulement la " "luminosité" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Défiler en boucle" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "Défilement tenant compte des limites de page" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Augmenter le nombre de pages par rangée" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "Zoom centré horizontalement" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "Centrer le résultat horizontalement" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Transparence de la surbrillance" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Afficher 'Chargement...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Ajuster à l'ouverture du fichier" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Montrer les fichiers et dossiers cachés" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Montrer les dossiers" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Toujours ouvrir à la première page" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Surligner les résultats de la recherche" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "Activer la recherche incrémentale" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Effacer les résultats de recherche en cas d'annulation" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "Utiliser le nom de base du fichier dans le titre de la fenêtre" -#: ../config.c:212 +#: ../config.c:220 +#, fuzzy +msgid "Display the page number in the window title" +msgstr "Utiliser le nom de base du fichier dans le titre de la fenêtre" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "Utiliser le nom de base du fichier dans la barre d'état" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "Activer la prise en charge de synctex" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Ajouter un marque-page" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Supprimer un marque-page" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Lister tous les marque-pages" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Fermer le fichier actuel" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Montrer les informations sur le fichier" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "Exécuter une commande" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Afficher l'aide" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Ouvrir un document" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Quitter zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Imprimer le document" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Sauver le document" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Sauver le document (et forcer l'écrasement)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Enregistrer les pièces jointes" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Définir le décalage de page" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Marquer l'emplacement actuel dans le document" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Supprimer les marques indiquées" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "Ne pas surligner les résultats de la recherche en cours" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Surligner les résultats de la recherche en cours" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Afficher les informations de version" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Échec lors du lancement de xdg-open." -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "Lien : page %d" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "Lien : %s" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "Lien : Invalide" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Rattacher à la fenêtre spécifiée par xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Chemin vers le dossier de configuration" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Chemin vers le dossier de données" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Chemin vers le dossier de plugins" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Détacher en arrière-plan" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Mot de passe du document" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "Numéro de page où aller" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Niveau de journalisation (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Afficher les informations de version" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "Éditeur synctex (transféré à la commande synctex)" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Chargement..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Texte sélectionné copié dans le presse-papiers : %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Copier l'image" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Enregistrer l'image sous" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Ce document ne contient pas d'index" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Sans nom]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "Ce document ne contient aucune page" diff --git a/po/he.po b/po/he.po index 11da2e3..8300235 100644 --- a/po/he.po +++ b/po/he.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" "PO-Revision-Date: 2013-01-13 14:12+0000\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/zathura/language/" @@ -17,30 +17,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "" -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "" -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" +msgid "Could not update bookmark: %s" msgstr "" #: ../commands.c:55 @@ -48,81 +48,86 @@ msgstr "" msgid "Could not create bookmark: %s" msgstr "" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" msgstr "" -#: ../commands.c:82 +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "" + +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "" -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "" -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "" -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "" -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "" -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "" -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "" -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "" -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "" @@ -141,318 +146,326 @@ msgid "Images" msgstr "" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "" -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/hr.po b/po/hr.po index 98957a3..ba9aec3 100644 --- a/po/hr.po +++ b/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" "PO-Revision-Date: 2013-01-13 14:12+0000\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/zathura/" @@ -18,30 +18,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "" -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "" -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" +msgid "Could not update bookmark: %s" msgstr "" #: ../commands.c:55 @@ -49,81 +49,86 @@ msgstr "" msgid "Could not create bookmark: %s" msgstr "" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" msgstr "" -#: ../commands.c:82 +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "" + +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "" -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "" -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "" -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "" -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "" -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "" -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "" -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "" -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "" @@ -142,318 +147,326 @@ msgid "Images" msgstr "" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "" -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/id_ID.po b/po/id_ID.po index d7b6938..f8b11f6 100644 --- a/po/id_ID.po +++ b/po/id_ID.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:45+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:34+0200\n" "Last-Translator: andjeng \n" "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/" "zathura/language/id_ID/)\n" @@ -18,112 +18,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Masukan '%s' tidak valid" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Index '%s' tidak valid" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Tidak ada dokumen yang terbuka." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "jumlah argumen yang diberikan tidak valid" -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "bookmark yang sukses terupdate : %s" +msgid "Could not update bookmark: %s" +msgstr "Tidak dapat membuat bookmark: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Tidak dapat membuat bookmark: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "bookmark yang sukses terupdate : %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Bookmark yang sukses dibuat: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Bookmark %s telah sukses dihapus" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Gagal menghapus bookmark: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Tidak ada bookmark: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Tidak ada informasi tersedia" -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Argumen terlalu banyak" -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Tidak ada argumen yang diberikan" -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Dokumen telah disimpan" -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Gagal menyimpan dokumen" -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Jumlah argumen tidak valid" -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Tidak dapat menulis lampiran '%s' ke '%s'" -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Tidak dapat menyimpan lampiran '%s' ke '%s'" -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Menulis citra dari '%s' ke '%s'" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "Tidak dapat menulis citra '%s' ke %s'" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Citra tidak diketahui '%s'" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Lampiran atau gambar tidak diketahui '%s'" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Argumen harus berupa angka." @@ -142,318 +147,326 @@ msgid "Images" msgstr "Citra" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Tingkat pembesaran" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Selisih antar halaman" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Jumlah halaman tiap kolom" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "Kolom pada halaman pertama" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Tingkat menggulung" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "Tingkat penggulungan horisontal" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Pembesaran minimum" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Pembesaran maksimal" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "Jumlah posisi yang diingat pada jumplist" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Mewarnai ulang (warna gelap)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Mewarnai ulang (warna cerah)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Warna sorotan" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Warna sorotan (aktif)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Mewarnai ulang halaman" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "Ketika mewarnai ulang, jaga hue dan sesuaikan kecerahan saja" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "Penggulungan sadar halaman" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Jumlah halaman per baris \"lanjutan\"" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "Pembesaran horisontal tengah" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "Tengah-horisontalkan hasil" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Transparansi sorotan" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Memuat Render..." -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Menyesuaikan ketika membuka file" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Perlihatkan file dan direktori tersembunyi" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Perlihatkan direktori" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Selalu buka halaman pertama" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Sorot hasil pencarian" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "Fungsikan pencarian berkelanjutan" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Hapus hasil pencarian ketika batal mencari" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "Gunakan nama dasar file pada judul jendela" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "Support synctex" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Tambahkan pada bookmark" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Hapus bookmark" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Perlihatkan semua bookmark" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Tutup file ini" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Informasi file" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "Jalankan perintah" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Bantuan" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Buka dokumen" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Tutup zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Cetak dokumen" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Simpan dokumen" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Simpan dokumen (dan menimpa berkas)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Simpan lampiran" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Set offset halaman" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Tandai lokasi sekarang dalam dokumen" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Hapus tanda terpilih" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "Jangan menyorot hasil cari sekarang" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Tunjukan informasi versi" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Gagal menjalankan program xdg-open" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "Link: halaman %d" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "Link: %s" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "Link: Tidak valid" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Mengembalikan jendela sesuai dengan xid yang ditentukan" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Path ke direktori konfigurasi" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Path ke direktori data" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Path ke direktori plugin" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Jalankan pada latar" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Kata sandi dokumen" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Tingkat log (debug, info, peringatan, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Cetak informasi versi" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "Synctex editor (diteruskan ke perintah synctex)" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Memuat....." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Menyalin teks terpilih ke papan semat: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Salin gambar" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Simpan gambar sebagai" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Dokumen ini tidak mempunyai indeks" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Tidak berjudul]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/it.po b/po/it.po index 74f0ca9..59e848a 100644 --- a/po/it.po +++ b/po/it.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:45+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:35+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Italian (http://www.transifex.com/projects/p/zathura/language/" "it/)\n" @@ -18,112 +18,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Input inserito '%s' non valido." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Indice inserito '%s' non valido." -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Nessun documento aperto." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Numero di argomenti errato." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Segnalibro aggiornato con successo:%s" +msgid "Could not update bookmark: %s" +msgstr "Impossibile creare il segnalibro:%s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Impossibile creare il segnalibro:%s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Segnalibro aggiornato con successo:%s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Segnalibro creato con successo:%s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Segnalibro rimosso:%s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Impossibile rimuovere il segnalibro:%s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Nessun segnalibro corrispondente:%s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Nessun' informazione disponibile." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Numero di argomenti eccessivo." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Nessun argomento specificato." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Documento salvato." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Impossibile salvare il documento." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Numero di argomenti non valido." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Impossibile salvare l' allegato '%s' in '%s'" -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Allegato '%s' salvato in '%s'" -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "L' argomento dev' essere un numero." @@ -142,318 +147,326 @@ msgid "Images" msgstr "" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Backend del database" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Spaziatura tra le pagine" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Numero di pagine per riga" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Zoom minimo" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Zoom massimo" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Ricolora le pagine" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Scrolling continuo" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Mostra file e cartelle nascosti" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Mostra cartelle" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Apri sempre alla prima pagina" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Aggiungi un segnalibro" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Elimina un segnalibro" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Mostra i segnalibri" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Chiudi il file corrente" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Mostra le informazioni sul file" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Mostra l' aiuto" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Apri un documento" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Chiudi zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Stampa il documento" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Salva il documento" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Salva il documento (e sovrascrivi)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Salva allegati" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Imposta l' offset della pagina" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Impossibile eseguire xdg-open." -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Percorso della directory della configurazione" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Percorso della directory dei dati" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Percorso della directory contenente i plugin" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Crea un processo separato" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Livello di log (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Mostra le informazioni sul file" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "" -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "La selezione è stato copiata negli appunti:%s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Copia immagine" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Questo documento non contiene l' indice" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Nessun nome]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/pl.po b/po/pl.po index f1d1b72..fe35cc7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:45+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:35+0200\n" "Last-Translator: p \n" "Language-Team: Polish (http://www.transifex.net/projects/p/zathura/language/" "pl/)\n" @@ -19,112 +19,117 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Nieprawidłowy argument: %s" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Nieprawidłowy indeks: %s" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Nie otwarto żadnego pliku" -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Nieprawidłowa liczba parametrów polecenia" -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Zaktualizowano zakładkę: %s" +msgid "Could not update bookmark: %s" +msgstr "Nie można stworzyć zakładki: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Nie można stworzyć zakładki: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Zaktualizowano zakładkę: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Utworzono zakładkę: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Usunięto zakładkę: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Nie można usunąć zakładki: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Nie znaleziono zakładki: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Brak informacji o pliku" -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Za dużo parametrów polecenia" -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Nie podano parametrów polecenia" -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Zapisano dokument" -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Błąd zapisu" -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Niewłaściwa liczba parametrów polecenia" -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Nie można dodać załącznika %s do pliku %s" -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Zapisano załącznik %s do pliku %s" -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Zapisano obrazek %s do pliku %s" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "Nie można dodać obrazka %s do pliku %s" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Nieznany obrazek '%s'." -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Nieznany załącznik lub obrazek '%s'." -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Parametr polecenia musi być liczbą" @@ -143,318 +148,326 @@ msgid "Images" msgstr "Obrazki" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Baza danych" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Skok powiększenia" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Odstęp pomiędzy stronami" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Liczba stron w wierszu" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Skok przewijania" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Minimalne powiększenie" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Maksymalne powiększenie" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Ciemny kolor negatywu" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Jasny kolor negatywu" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Kolor wyróżnienia" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Kolor wyróżnienia bieżącego elementu" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Negatyw" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Zawijanie dokumentu" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Liczba stron w wierszu" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Przezroczystość wyróżnienia" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Wyświetlaj: „Wczytywanie pliku...”" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Dopasowanie widoku pliku" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Wyświetl ukryte pliki i katalogi" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Wyświetl katalogi" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Zawsze otwieraj na pierwszej stronie" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Podświetl wyniki wyszukiwania" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Wyczyść wyniki wyszukiwania po przerwaniu" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Dodaj zakładkę" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Usuń zakładkę" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Wyświetl zakładki" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Zamknij plik" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Wyświetl informacje o pliku" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Wyświetl pomoc" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Otwórz plik" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Zakończ" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Wydrukuj" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Zapisz" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Zapisz (nadpisując istniejący plik)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Zapisz załączniki" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Ustaw przesunięcie numerów stron" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Zaznacz aktualną pozycję w dokumencie" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Skasuj określone zakładki" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "Nie podświetlaj aktualnych wyników wyszukiwania " -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Podświetl aktualne wyniki wyszukiwania" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Wyświetl informacje o wersji" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Wystąpił problem z uruchomieniem xdg-open" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Przypisz proces do rodzica o danym xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Ścieżka do katalogu konfiguracyjnego" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Ścieżka do katalogu danych" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Ścieżka do katalogu wtyczek" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Forkuj w tle" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Hasło dokumentu" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Szczegółowość komunikatów (debug, info, warning, error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Wyświetl informacje o wersji" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Wczytywanie pliku..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Zaznaczony tekst skopiowano do schowka: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Skopiuj obrazek" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Zapisz obrazek jako" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Dokument nie zawiera indeksu" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[bez nazwy]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index e39c7c0..5e678ef 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:46+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:35+0200\n" "Last-Translator: salmora8 \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "zathura/language/pt_BR/)\n" @@ -19,112 +19,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Dados de entrada inválida '%s' ." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Dados de índice invalido '%s'." -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Nenhum documento aberto." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Número de argumentos dados inválidos." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Favorito atualizado com sucesso: %s" +msgid "Could not update bookmark: %s" +msgstr "Não foi possível criar favorito: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Não foi possível criar favorito: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Favorito atualizado com sucesso: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Favorito criado com sucesso: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Favorito removido: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Falha ao remover favorito: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Não há favoritos: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Nenhuma informação disponível." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Muitos argumentos." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Nenhum argumento dado." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Documento salvo." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Falha ao salvar o documento." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Número de argumento invalido." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Não foi possível gravar anexo '%s' para '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Escreveu anexo '%s' para '%s'." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "Escreveu imagem '%s' para '%s'." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "Não foi possível gravar imagem '%s' para '%s'." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Imagem desconhecida '%s'." -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Anexo desconhecido ou imagem '%s'." -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "O argumento deve ser um número." @@ -143,319 +148,327 @@ msgid "Images" msgstr "Imagens" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Fim da base de dados" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Grau de Zoom" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Preenchimento entre páginas" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Número de paginas por linha" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "Coluna da primeira página" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Fase de Rolagem" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "Etapa de rolagem horizontal" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "Sobreposição de rolagem de página inteira" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Zoom minimo" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Zoom máximo" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "Número máximo de páginas para manter no cache" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "Numero de posições para lembrar na lista de salto" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Recolorindo (cor escura)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Recolorindo (cor clara)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Cor para destacar" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Cor para destacar (ativo)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "'Carregando ...' cor de fundo" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "'Carregando ...' cor de primeiro plano" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Recolorir páginas" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" "Quando recolorir, manter tonalidade original e ajustar somente a luminosidade" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Rolagem envoltório" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "Rolagem de página consciente" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Numero de avanço de paginas por linha" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "Zoom centrado horizontalmente" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "Alinhe destino do link à esquerda" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "Resultado centrado horizontalmente" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Transparência para destacar" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Renderizando 'Carregando...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Ajuste para quando abrir o arquivo" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Mostrar arquivos ocultos e diretórios" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Mostrar diretórios" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Sempre abrir na primeira página" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Destaque resultados de busca" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "Ativar pesquisa incremental" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Limpar resultados de busca ou abortar" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "Usar nome do arquivo na barra de titulo" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "Use o nome do arquivo na barra de status" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "Ativar suporte synctex" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Adicionar um favorito" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Deletar um favorito" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Listar todos favoritos" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Fechar arquivo atual" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Mostrar informações do arquivo" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "Executar um comando" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Mostrar ajuda" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Abrir documento" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Fechar zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Imprimir documento" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Salvar documento" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Salvar documento (e forçar sobrescrever)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Salvar anexos" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Definir deslocamento da página" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Marcar localização atual no documento" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Apagar as marcas especificadas" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "Não destacar resultados de busca atual" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Destacar resultado de busca atual" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Mostrar informações sobre a versão" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Falha ao executar xdg-open." -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "Link: página %d" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "Link: %s" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "Link: Inválido" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Reparar a janela especificada por xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Caminho de diretório para configuração" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Caminho para diretório de dados" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Caminho de diretório que contenham plugins" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Deslocar no fundo" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Senha do documento" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "Número da página para ir" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Nível de log (depurar, informação, aviso, erro)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Imprimir informações sobre a versão" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "Editor synctex (encaminhado para o comando synctex)" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Carregando..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Texto selecionado copiado para área de transferência: %s " -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Copiar imagem" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Salvar imagem para" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Este documento não contem qualquer índice" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Sem nome]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "Documento não contém quaisquer páginas" diff --git a/po/ru.po b/po/ru.po index f61cd1e..69498fe 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:46+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:35+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Russian (http://www.transifex.com/projects/p/zathura/language/" "ru/)\n" @@ -19,112 +19,117 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Неправильный ввод: %s" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Получен неверный индекс %s" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Документ не открыт" -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Неверное число аргументов" -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Закладка %s успешно обновлена" +msgid "Could not update bookmark: %s" +msgstr "Не могу создать закладку %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Не могу создать закладку %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Закладка %s успешно обновлена" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Закладка %s успешно создана" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Закладка %s удалена" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Не удалось удалить закладку %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Закладки %s не существует" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Нет доступной информации" -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Слишком много аргументов" -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Отсутствуют аргументы" -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Документ сохранён" -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Не удалось сохранить документ" -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Неверное количество аргументов" -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Не могу сохранить приложенный файл %s в %s" -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Файл %s сохранён в %s" -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Аргумент должен быть числом" @@ -143,318 +148,326 @@ msgid "Images" msgstr "" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Бэкэнд базы данных" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Шаг увеличения" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Разрыв между страницами" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Количество страниц в ряд" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Шаг прокрутки" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Минимальное увеличение" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Максимальное увеличение" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Перекрашивание (тёмные тона)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Перекрашивание (светлые тона)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Цвет для подсветки" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Цвет для подсветки (активной)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Перекрасить страницы" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Плавная прокрутка" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Увеличить количество страниц в ряду" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Прозрачность подсветки" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Рендер 'Загружается ...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Показывать скрытые файлы и директории" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Показывать директории" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Всегда открывать на первой странице" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Добавить закладку" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Удалить закладку" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Показать все закладки" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Закрыть текущий файл" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Показать информацию о файле" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Помощь" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Открыть документ" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Выход" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Печать" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Сохранить документ" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Сохранить документ (с перезапиьсю)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Сохранить прикреплённые файлы" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Сохранить смещение страницы" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Пометить текущую позицию в документе" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Удалить указанные пометки" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Не удалось запустить xdg-open" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Сменить материнское окно на окно, указанное в xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Путь к директории конфига" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Путь к директории с данными" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Путь к директории с плагинами" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Уйти в бэкграунд" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Уровень логирования (debug,info,warning,error)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Показать информацию о файле" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "" -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Выделенный текст скопирован в буфер: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Скопировать изображение" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "В документе нету индекса" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[No name]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/ta_IN.po b/po/ta_IN.po index 0f9c0cd..50b4452 100644 --- a/po/ta_IN.po +++ b/po/ta_IN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:46+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:35+0200\n" "Last-Translator: mankand007 \n" "Language-Team: Tamil (India) (http://www.transifex.net/projects/p/zathura/" "language/ta_IN/)\n" @@ -18,112 +18,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "கொடுக்கப்பட்ட உள்ளீடு(input) '%s' தவறு" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "கொடுக்கப்பட்ட index '%s' தவறு" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "எந்தக் ஆவணமும் திறக்கப்படவில்லை" -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "கொடுக்கப்பட்ட arguments-களின் எண்ணிக்கை தவறு" -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Bookmark வெற்றிகரமாக நிகழ்நிலை(update) படுத்தப்பட்டது: %s" +msgid "Could not update bookmark: %s" +msgstr "Bookmark-ஐ உருவாக்க முடியவில்லை: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Bookmark-ஐ உருவாக்க முடியவில்லை: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Bookmark வெற்றிகரமாக நிகழ்நிலை(update) படுத்தப்பட்டது: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Bookmark வெற்றிகரமாக உருவாக்கப்பட்டது: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Bookmark அழிக்கப்பட்டது: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Bookmark-ஐ அழிக்க இயலவில்லை: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "அந்தப் பெயரில் எந்த bookmark-ம் இல்லை: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "எந்தத் தகவலும் இல்லை" -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Argumentகளின் எண்ணிக்கை மிகவும் அதிகம்" -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "எந்த argument-ம் தரப்படவில்லை" -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "கோப்பு சேமிக்கப்பட்டது" -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "ஆவணத்தை சேமிக்க இயலவில்லை" -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "கொடுக்கப்பட்ட argument-களின் எண்ணிக்கை தவறு" -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "" -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "" -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Argument ஒரு எண்ணாக இருக்க வேண்டும்" @@ -142,318 +147,326 @@ msgid "Images" msgstr "" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Zoom அமைப்பு" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "இரு பக்கங்களுக்கிடையில் உள்ள நிரப்பல்(padding)" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "ஒரு வரிசையில் எத்தனை பக்கங்களைக் காட்ட வேண்டும்" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "திரை உருளல்(scroll) அளவு" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "முடிந்தவரை சிறியதாகக் காட்டு" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "முடிந்தவரை பெரிதாகக் காட்டு" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "புதிய bookmark உருவாக்கு" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Bookmark-ஐ அழித்துவிடு" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "அனைத்து bookmark-களையும் பட்டியலிடு" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "ஆவணம் பற்றிய தகவல்களைக் காட்டு" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "உதவியைக் காட்டு" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "ஒரு ஆவணத்தைத் திற" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "zathura-வை விட்டு வெளியேறு" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "ஆவணத்தை அச்சிடு" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "ஆவணத்தை சேமிக்கவும்" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "இணைப்புகளைச் சேமிக்கவும்" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "xdg-open-ஐ இயக்க முடியவில்லை" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "ஆவணம் பற்றிய தகவல்களைக் காட்டு" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "" -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "படத்தை ஒரு பிரதியெடு" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "இந்த ஆவணத்தில் எந்த index-ம் இல்லை" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "பெயரற்ற ஆவணம்" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/tr.po b/po/tr.po index 61fea33..4eea9f8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:46+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:36+0200\n" "Last-Translator: hsngrms \n" "Language-Team: Turkish (http://www.transifex.net/projects/p/zathura/language/" "tr/)\n" @@ -19,112 +19,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Hatalı girdi '%s'" -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Hatalı dizin '%s'" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Açık belge yok." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Yanlış sayıda argüman" -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Yer imi başarıyla güncellendi: %s" +msgid "Could not update bookmark: %s" +msgstr "Yer imi yaratılamadı: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Yer imi yaratılamadı: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Yer imi başarıyla güncellendi: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Yer imi yaratıldı: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Yer imi silindi: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Yer imi silinemedi: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Böyle bir yer imi yok: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Bilgi mevcut değil." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Çok fazla sayıda argüman." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Argüman verilmedi." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Belge kaydedildi." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Belge kaydedilemedi." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Yanlış sayıda argüman." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "'%s' eki '%s' konumuna yazılamadı." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "'%s' eki '%s' konumuna yazıldı." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "'%s' eki '%s' konumuna yazıldı." -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "'%s' eki '%s' konumuna yazılamadı." -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "Tanınmayan resim dosyası '%s'" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "Tanınmayan eklenti veya resim dosyası '%s'" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Argüman bir sayı olmalı." @@ -143,318 +148,326 @@ msgid "Images" msgstr "Resimler" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Veritabanı arkayüzü" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Yakınlaşma/uzaklaşma aralığı" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Sayfalar arasındaki boşluk" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Satır başına sayfa sayısı" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "İlk sayfanın sütunu" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Kaydırma aralığı" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "Yatay kaydırma adımı" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "Tam ekran kaydırma kaplaması" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "En fazla uzaklaşma" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "En fazla yakınlaşma" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "Atlama listesinde hatırlanacak pozisyon sayısı" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Renk değişimi (koyu renk)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Renk değişimi (açık renk)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "İşaretleme rengi" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "İşaretleme rengi (etkin)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Sayga rengini değiştir" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "Yeniden renklendirirken renk değerini tut ve sadece parlaklığı ayarla" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Kaydırmayı sarmala" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "Satır başına sayfa sayısı" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "Yatay olarak ortalanmış büyütme" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Ön plana çıkarmak için saydamlaştır" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "'Yüklüyor ...' yazısını göster" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Dosya açarken ayarla" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Gizli dosyaları ve dizinleri göster" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Dizinleri göster" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Her zaman ilk sayfayı aç" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "Arama sonuçlarını vurgula" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "Artımlı aramayı etkinleştir" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "Kapatınca arama sonuçlarını temizle" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "Pencere başlığı olarak dosyanın adını kullan" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Yer imi ekle" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Yer imi sil" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Yer imlerini listele" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Geçerli dosyayı kapat" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Dosya bilgisi göster" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "Bir komut çalıştır" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Yardım bilgisi göster" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Belge aç" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Zathura'yı kapat" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Belge yazdır" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Belgeyi kaydet" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Belgeyi kaydet (ve sormadan üzerine yaz)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Ekleri kaydet" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Sayfa derinliğini ayarla" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "Bu belgede bu konumu işaretle" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "Seçilen işaretlemeleri sil" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "Şuanki arama sonuçlarını vurgulama" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "Şuanki arama sonuçlarını vurgula" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "Versiyon bilgisi göster" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "xdg-open çalıştırılamadı" -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Xid tarafından belirlendiği gibi bir üst seviye pencereye bağlı" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Ayar dizini adresi" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Veri dizini adresi" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Eklentileri içeren dizinin adresi" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Arka planda işlemden çocuk oluştur" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "Belge şifresi" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Kayıt seviyesi (hata ayıklama, bilgi, uyarı, hata)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Dosya bilgisi göster" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "Yüklüyor ..." -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Seçili metin panoya kopyalandı: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Resim kopyala" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "Resmi farklı kaydet" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Bu belge fihrist içermiyor" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[İsimsiz]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" diff --git a/po/uk_UA.po b/po/uk_UA.po index 8bd90af..4c026e0 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2013-04-28 13:23+0200\n" -"PO-Revision-Date: 2013-04-28 14:46+0200\n" +"POT-Creation-Date: 2013-08-15 00:28+0200\n" +"PO-Revision-Date: 2013-08-15 00:36+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/" "zathura/language/uk_UA/)\n" @@ -19,112 +19,117 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../callbacks.c:304 +#: ../callbacks.c:314 #, c-format msgid "Invalid input '%s' given." msgstr "Вказано невірний аргумент: %s." -#: ../callbacks.c:342 +#: ../callbacks.c:350 #, c-format msgid "Invalid index '%s' given." msgstr "Вказано невірний індекс: %s" -#: ../commands.c:35 ../commands.c:70 ../commands.c:97 ../commands.c:139 -#: ../commands.c:255 ../commands.c:285 ../commands.c:311 ../commands.c:410 -#: ../commands.c:531 ../shortcuts.c:486 ../shortcuts.c:1205 -#: ../shortcuts.c:1234 +#: ../commands.c:36 ../commands.c:76 ../commands.c:103 ../commands.c:158 +#: ../commands.c:274 ../commands.c:304 ../commands.c:330 ../commands.c:425 +#: ../commands.c:546 ../shortcuts.c:485 ../shortcuts.c:1251 +#: ../shortcuts.c:1280 msgid "No document opened." msgstr "Документ не відкрито." -#: ../commands.c:41 ../commands.c:76 ../commands.c:103 ../commands.c:415 +#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:430 msgid "Invalid number of arguments given." msgstr "Вказана невірна кількість аргументів." -#: ../commands.c:49 +#: ../commands.c:53 #, c-format -msgid "Bookmark successfuly updated: %s" -msgstr "Закладку вдало поновлено: %s" +msgid "Could not update bookmark: %s" +msgstr "Не можу створити закладку: %s" #: ../commands.c:55 #, c-format msgid "Could not create bookmark: %s" msgstr "Не можу створити закладку: %s" -#: ../commands.c:59 +#: ../commands.c:60 #, c-format -msgid "Bookmark successfuly created: %s" +msgid "Bookmark successfully updated: %s" +msgstr "Закладку вдало поновлено: %s" + +#: ../commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" msgstr "Закладку створено вдало: %s" -#: ../commands.c:82 +#: ../commands.c:88 #, c-format msgid "Removed bookmark: %s" msgstr "Закладку видалено: %s" -#: ../commands.c:84 +#: ../commands.c:90 #, c-format msgid "Failed to remove bookmark: %s" msgstr "Видалення закладки невдалося: %s" -#: ../commands.c:110 +#: ../commands.c:116 #, c-format msgid "No such bookmark: %s" msgstr "Такої закладки немає: %s" -#: ../commands.c:161 ../commands.c:183 +#: ../commands.c:180 ../commands.c:202 msgid "No information available." msgstr "Інформація недоступна." -#: ../commands.c:221 +#: ../commands.c:240 msgid "Too many arguments." msgstr "Забагато аргументів." -#: ../commands.c:232 +#: ../commands.c:251 msgid "No arguments given." msgstr "Жодного аргументу не вказано." -#: ../commands.c:291 ../commands.c:317 +#: ../commands.c:310 ../commands.c:336 msgid "Document saved." msgstr "Документ збережено." -#: ../commands.c:293 ../commands.c:319 +#: ../commands.c:312 ../commands.c:338 msgid "Failed to save document." msgstr "Документ не вдалося зберегти." -#: ../commands.c:296 ../commands.c:322 +#: ../commands.c:315 ../commands.c:341 msgid "Invalid number of arguments." msgstr "Невірна кількість аргументів." -#: ../commands.c:434 +#: ../commands.c:449 #, c-format msgid "Couldn't write attachment '%s' to '%s'." msgstr "Неможливо записати прикріплення '%s' до '%s'." -#: ../commands.c:436 +#: ../commands.c:451 #, c-format msgid "Wrote attachment '%s' to '%s'." msgstr "Прикріплення записано %s до %s." -#: ../commands.c:480 +#: ../commands.c:495 #, c-format msgid "Wrote image '%s' to '%s'." msgstr "" -#: ../commands.c:482 +#: ../commands.c:497 #, c-format msgid "Couldn't write image '%s' to '%s'." msgstr "" -#: ../commands.c:489 +#: ../commands.c:504 #, c-format msgid "Unknown image '%s'." msgstr "" -#: ../commands.c:493 +#: ../commands.c:508 #, c-format msgid "Unknown attachment or image '%s'." msgstr "" -#: ../commands.c:544 +#: ../commands.c:559 msgid "Argument must be a number." msgstr "Аргумент повинен бути цифрою." @@ -143,318 +148,326 @@ msgid "Images" msgstr "" #. zathura settings -#: ../config.c:139 +#: ../config.c:147 msgid "Database backend" msgstr "Буфер бази" -#: ../config.c:141 +#: ../config.c:149 msgid "Zoom step" msgstr "Збільшення" -#: ../config.c:143 +#: ../config.c:151 msgid "Padding between pages" msgstr "Заповнення між сторінками" -#: ../config.c:145 +#: ../config.c:153 msgid "Number of pages per row" msgstr "Кількість сторінок в одному рядку" -#: ../config.c:147 +#: ../config.c:155 msgid "Column of the first page" msgstr "" -#: ../config.c:149 +#: ../config.c:157 msgid "Scroll step" msgstr "Прокручування" -#: ../config.c:151 +#: ../config.c:159 msgid "Horizontal scroll step" msgstr "" -#: ../config.c:153 +#: ../config.c:161 msgid "Full page scroll overlap" msgstr "" -#: ../config.c:155 +#: ../config.c:163 msgid "Zoom minimum" msgstr "Максимальне зменшення" -#: ../config.c:157 +#: ../config.c:165 msgid "Zoom maximum" msgstr "Максимальне збільшення" -#: ../config.c:159 +#: ../config.c:167 msgid "Maximum number of pages to keep in the cache" msgstr "" -#: ../config.c:161 +#: ../config.c:169 msgid "Number of positions to remember in the jumplist" msgstr "" -#: ../config.c:163 +#: ../config.c:171 msgid "Recoloring (dark color)" msgstr "Перефарбування (темний колір)" -#: ../config.c:165 +#: ../config.c:173 msgid "Recoloring (light color)" msgstr "Перефарбування (світлий колір)" -#: ../config.c:167 +#: ../config.c:175 msgid "Color for highlighting" msgstr "Колір для виділення" -#: ../config.c:169 +#: ../config.c:177 msgid "Color for highlighting (active)" msgstr "Колір для виділення (активний)" -#: ../config.c:171 +#: ../config.c:179 msgid "'Loading ...' background color" msgstr "" -#: ../config.c:173 +#: ../config.c:181 msgid "'Loading ...' foreground color" msgstr "" -#: ../config.c:177 +#: ../config.c:185 msgid "Recolor pages" msgstr "Змінити кольори" -#: ../config.c:179 +#: ../config.c:187 msgid "When recoloring keep original hue and adjust lightness only" msgstr "" -#: ../config.c:181 +#: ../config.c:189 msgid "Wrap scrolling" msgstr "Плавне прокручування" -#: ../config.c:183 +#: ../config.c:191 msgid "Page aware scrolling" msgstr "" -#: ../config.c:185 +#: ../config.c:193 msgid "Advance number of pages per row" msgstr "" -#: ../config.c:187 +#: ../config.c:195 msgid "Horizontally centered zoom" msgstr "" -#: ../config.c:189 +#: ../config.c:197 msgid "Align link target to the left" msgstr "" -#: ../config.c:191 +#: ../config.c:199 msgid "Center result horizontally" msgstr "" -#: ../config.c:193 +#: ../config.c:201 msgid "Transparency for highlighting" msgstr "Прозорість для виділення" -#: ../config.c:195 +#: ../config.c:203 msgid "Render 'Loading ...'" msgstr "Рендер 'Завантажується ...'" -#: ../config.c:196 +#: ../config.c:204 msgid "Adjust to when opening file" msgstr "Підлаштовутись при відкритті файлу" -#: ../config.c:198 +#: ../config.c:206 msgid "Show hidden files and directories" msgstr "Показати приховані файли та директорії" -#: ../config.c:200 +#: ../config.c:208 msgid "Show directories" msgstr "Показати диреторії" -#: ../config.c:202 +#: ../config.c:210 msgid "Always open on first page" msgstr "Завжди відкривати на першій сторінці" -#: ../config.c:204 +#: ../config.c:212 msgid "Highlight search results" msgstr "" -#: ../config.c:206 +#: ../config.c:214 msgid "Enable incremental search" msgstr "" -#: ../config.c:208 +#: ../config.c:216 msgid "Clear search results on abort" msgstr "" -#: ../config.c:210 +#: ../config.c:218 msgid "Use basename of the file in the window title" msgstr "" -#: ../config.c:212 +#: ../config.c:220 +msgid "Display the page number in the window title" +msgstr "" + +#: ../config.c:222 msgid "Use basename of the file in the statusbar" msgstr "" -#: ../config.c:214 ../main.c:64 +#: ../config.c:224 ../main.c:65 msgid "Enable synctex support" msgstr "" #. define default inputbar commands -#: ../config.c:373 +#: ../config.c:383 msgid "Add a bookmark" msgstr "Додати закладку" -#: ../config.c:374 +#: ../config.c:384 msgid "Delete a bookmark" msgstr "Вилучити закладку" -#: ../config.c:375 +#: ../config.c:385 msgid "List all bookmarks" msgstr "Дивитись усі закладки" -#: ../config.c:376 +#: ../config.c:386 msgid "Close current file" msgstr "Закрити документ" -#: ../config.c:377 +#: ../config.c:387 msgid "Show file information" msgstr "Показати інформацію файлу" -#: ../config.c:378 +#: ../config.c:388 msgid "Execute a command" msgstr "" -#: ../config.c:379 +#: ../config.c:389 msgid "Show help" msgstr "Показати довідку" -#: ../config.c:380 +#: ../config.c:390 msgid "Open document" msgstr "Відкрити документ" -#: ../config.c:381 +#: ../config.c:391 msgid "Close zathura" msgstr "Вийти із zathura" -#: ../config.c:382 +#: ../config.c:392 msgid "Print document" msgstr "Друкувати документ" -#: ../config.c:383 +#: ../config.c:393 msgid "Save document" msgstr "Зберегти документ" -#: ../config.c:384 +#: ../config.c:394 msgid "Save document (and force overwriting)" msgstr "Зберегти документ (форсувати перезапис)" -#: ../config.c:385 +#: ../config.c:395 msgid "Save attachments" msgstr "Зберегти прикріплення" -#: ../config.c:386 +#: ../config.c:396 msgid "Set page offset" msgstr "Встановити зміщення сторінки" -#: ../config.c:387 +#: ../config.c:397 msgid "Mark current location within the document" msgstr "" -#: ../config.c:388 +#: ../config.c:398 msgid "Delete the specified marks" msgstr "" -#: ../config.c:389 +#: ../config.c:399 msgid "Don't highlight current search results" msgstr "" -#: ../config.c:390 +#: ../config.c:400 msgid "Highlight current search results" msgstr "" -#: ../config.c:391 +#: ../config.c:401 msgid "Show version information" msgstr "" -#: ../links.c:171 ../links.c:250 +#: ../links.c:175 ../links.c:254 msgid "Failed to run xdg-open." msgstr "Запуск xdg-open не вдався." -#: ../links.c:189 +#: ../links.c:193 #, c-format msgid "Link: page %d" msgstr "" -#: ../links.c:196 +#: ../links.c:200 #, c-format msgid "Link: %s" msgstr "" -#: ../links.c:200 +#: ../links.c:204 msgid "Link: Invalid" msgstr "" -#: ../main.c:55 +#: ../main.c:56 msgid "Reparents to window specified by xid" msgstr "Вертатися до вікна, вказаного xid" -#: ../main.c:56 +#: ../main.c:57 msgid "Path to the config directory" msgstr "Шлях до теки конфігурації" -#: ../main.c:57 +#: ../main.c:58 msgid "Path to the data directory" msgstr "Шлях до теки з даними" -#: ../main.c:58 +#: ../main.c:59 msgid "Path to the directories containing plugins" msgstr "Шлях до теки з плаґінами" -#: ../main.c:59 +#: ../main.c:60 msgid "Fork into the background" msgstr "Працювати у фоні" -#: ../main.c:60 +#: ../main.c:61 msgid "Document password" msgstr "" -#: ../main.c:61 +#: ../main.c:62 msgid "Page number to go to" msgstr "" -#: ../main.c:62 +#: ../main.c:63 msgid "Log level (debug, info, warning, error)" msgstr "Рівень логування (налагодження, інфо, застереження, помилка)" -#: ../main.c:63 +#: ../main.c:64 msgid "Print version information" msgstr "Показати інформацію файлу" -#: ../main.c:65 +#: ../main.c:66 msgid "Synctex editor (forwarded to the synctex command)" msgstr "" -#: ../page-widget.c:460 +#: ../page-widget.c:474 msgid "Loading..." msgstr "" -#: ../page-widget.c:657 +#: ../page-widget.c:678 #, c-format msgid "Copied selected text to clipboard: %s" msgstr "Вибраний текст скопійовано до буферу: %s" -#: ../page-widget.c:755 +#: ../page-widget.c:776 msgid "Copy image" msgstr "Копіювати картинку" -#: ../page-widget.c:756 +#: ../page-widget.c:777 msgid "Save image as" msgstr "" -#: ../shortcuts.c:1108 +#: ../shortcuts.c:1154 msgid "This document does not contain any index" msgstr "Індекс відсутній в цьому документі" -#: ../zathura.c:224 ../zathura.c:956 +#: ../zathura.c:227 ../zathura.c:975 msgid "[No name]" msgstr "[Без назви]" -#: ../zathura.c:589 +#: ../zathura.c:584 +msgid "Unsupported file type. Please install the necessary plugin." +msgstr "" + +#: ../zathura.c:594 msgid "Document does not contain any pages" msgstr "" From 3978dc30b49142d3cbb3a7c0c3dc3aafba0e16d8 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Thu, 15 Aug 2013 00:44:50 +0200 Subject: [PATCH 45/45] Version 0.2.4 --- config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk index 5bfa7c2..30a0285 100644 --- a/config.mk +++ b/config.mk @@ -3,7 +3,7 @@ ZATHURA_VERSION_MAJOR = 0 ZATHURA_VERSION_MINOR = 2 -ZATHURA_VERSION_REV = 3 +ZATHURA_VERSION_REV = 4 # If the API changes, the API version and the ABI version have to be bumped. ZATHURA_API_VERSION = 2 # If the ABI breaks for any reason, this has to be bumped.