From 4d57751b2392a58c9b11398a318f9663170172a7 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Tue, 14 Apr 2015 23:28:36 +0200 Subject: [PATCH 01/94] Build with c11 standard --- config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk index af6a1b4..47df220 100644 --- a/config.mk +++ b/config.mk @@ -103,7 +103,7 @@ INCS = ${GIRARA_INC} ${GTK_INC} ${GTHREAD_INC} ${GMODULE_INC} ${GLIB_INC} LIBS = ${GIRARA_LIB} ${GTK_LIB} ${GTHREAD_LIB} ${GMODULE_LIB} ${GLIB_LIB} -lpthread -lm # flags -CFLAGS += -std=c99 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS) +CFLAGS += -std=c11 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS) # debug DFLAGS ?= -g From 303277124bbb0f5405c3269b8125a4105cada207 Mon Sep 17 00:00:00 2001 From: MicheleSr Date: Tue, 28 Apr 2015 23:32:50 +0200 Subject: [PATCH 02/94] replaced deprecated gdk_cursor_new() replaced with gdk_cursor_new_for_display() --- zathura/callbacks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zathura/callbacks.c b/zathura/callbacks.c index 145bc85..228cb80 100644 --- a/zathura/callbacks.c +++ b/zathura/callbacks.c @@ -622,7 +622,7 @@ cb_page_widget_link(ZathuraPage* page, void* data) bool enter = (bool) data; GdkWindow* window = gtk_widget_get_parent_window(GTK_WIDGET(page)); - GdkCursor* cursor = gdk_cursor_new(enter == true ? GDK_HAND1 : GDK_LEFT_PTR); + GdkCursor* cursor = gdk_cursor_new_for_display(gdk_display_get_default(), enter == true ? GDK_HAND1 : GDK_LEFT_PTR); gdk_window_set_cursor(window, cursor); g_object_unref(cursor); } From e4281c159c3d5129f262f6176f97877f6f603061 Mon Sep 17 00:00:00 2001 From: Sebastian Neuser Date: Fri, 8 May 2015 13:09:10 +0200 Subject: [PATCH 03/94] Fix .gitignore: Ignore the build directory instead of binaries --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 43c2516..31dd511 100644 --- a/.gitignore +++ b/.gitignore @@ -24,13 +24,10 @@ zathura-*.tar.gz # build dirs .depend .tx +build/ gcov/ doc/_build -# binaries -zathura -zathura-debug - # version file version.h .version-checks/ From 3c5e9e67ed60a9050ade9cbb45fb85a46c224bfa Mon Sep 17 00:00:00 2001 From: Sebastian Neuser Date: Fri, 8 May 2015 13:09:54 +0200 Subject: [PATCH 04/94] config.c: Add quit shortcut for index mode --- zathura/config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/zathura/config.c b/zathura/config.c index 25275af..03c36c4 100644 --- a/zathura/config.c +++ b/zathura/config.c @@ -381,6 +381,7 @@ config_load_default(zathura_t* zathura) girara_shortcut_add(gsession, 0, GDK_KEY_Right, NULL, sc_navigate_index, INDEX, EXPAND, NULL); girara_shortcut_add(gsession, 0, GDK_KEY_space, NULL, sc_navigate_index, INDEX, SELECT, NULL); girara_shortcut_add(gsession, 0, GDK_KEY_Return, NULL, sc_navigate_index, INDEX, SELECT, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_q, NULL, sc_quit, INDEX, 0, NULL); girara_shortcut_add(gsession, 0, 0, "gg", sc_navigate_index, INDEX, TOP, NULL); girara_shortcut_add(gsession, 0, 0, "G", sc_navigate_index, INDEX, BOTTOM, NULL); From 7b947cc7e8d47912e0fc3fd0c3b23be3f1eeb98a Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 12 Jul 2015 21:03:32 +0200 Subject: [PATCH 05/94] Use LFS everywhere Signed-off-by: Sebastian Ramacher --- config.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index 47df220..1da1e58 100644 --- a/config.mk +++ b/config.mk @@ -102,13 +102,16 @@ endif INCS = ${GIRARA_INC} ${GTK_INC} ${GTHREAD_INC} ${GMODULE_INC} ${GLIB_INC} LIBS = ${GIRARA_LIB} ${GTK_LIB} ${GTHREAD_LIB} ${GMODULE_LIB} ${GLIB_LIB} -lpthread -lm -# flags +# pre-processor flags +CPPFLAGS += -D_FILE_OFFSET_BITS=64 + +# compiler flags CFLAGS += -std=c11 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS) # debug DFLAGS ?= -g -# ld +# linker flags LDFLAGS += -rdynamic # compiler From 1cd609d33b18ccfe707568e058de754c5c96a9ea Mon Sep 17 00:00:00 2001 From: Matthew hague Date: Mon, 20 Jul 2015 02:00:10 +0100 Subject: [PATCH 06/94] added bindings for ctrl-[/ctrl-c/esc and ctrl-j in index view Signed-off-by: Sebastian Ramacher --- zathura/config.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/zathura/config.c b/zathura/config.c index 03c36c4..245911a 100644 --- a/zathura/config.c +++ b/zathura/config.c @@ -369,22 +369,25 @@ config_load_default(zathura_t* zathura) /* Index mode */ girara_shortcut_add(gsession, 0, GDK_KEY_Tab, NULL, sc_toggle_index, INDEX, 0, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_k, NULL, sc_navigate_index, INDEX, UP, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_j, NULL, sc_navigate_index, INDEX, DOWN, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_h, NULL, sc_navigate_index, INDEX, COLLAPSE, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_l, NULL, sc_navigate_index, INDEX, EXPAND, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_L, NULL, sc_navigate_index, INDEX, EXPAND_ALL, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_H, NULL, sc_navigate_index, INDEX, COLLAPSE_ALL, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_Up, NULL, sc_navigate_index, INDEX, UP, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_Down, NULL, sc_navigate_index, INDEX, DOWN, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_Left, NULL, sc_navigate_index, INDEX, COLLAPSE, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_Right, NULL, sc_navigate_index, INDEX, EXPAND, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_space, NULL, sc_navigate_index, INDEX, SELECT, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_Return, NULL, sc_navigate_index, INDEX, SELECT, NULL); - girara_shortcut_add(gsession, 0, GDK_KEY_q, NULL, sc_quit, INDEX, 0, NULL); - girara_shortcut_add(gsession, 0, 0, "gg", sc_navigate_index, INDEX, TOP, NULL); - girara_shortcut_add(gsession, 0, 0, "G", sc_navigate_index, INDEX, BOTTOM, NULL); - + girara_shortcut_add(gsession, 0, GDK_KEY_k, NULL, sc_navigate_index, INDEX, UP, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_j, NULL, sc_navigate_index, INDEX, DOWN, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_h, NULL, sc_navigate_index, INDEX, COLLAPSE, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_l, NULL, sc_navigate_index, INDEX, EXPAND, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_L, NULL, sc_navigate_index, INDEX, EXPAND_ALL, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_H, NULL, sc_navigate_index, INDEX, COLLAPSE_ALL, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_Up, NULL, sc_navigate_index, INDEX, UP, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_Down, NULL, sc_navigate_index, INDEX, DOWN, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_Left, NULL, sc_navigate_index, INDEX, COLLAPSE, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_Right, NULL, sc_navigate_index, INDEX, EXPAND, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_space, NULL, sc_navigate_index, INDEX, SELECT, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_Return, NULL, sc_navigate_index, INDEX, SELECT, NULL); + girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_j, NULL, sc_navigate_index, INDEX, SELECT, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_q, NULL, sc_quit, INDEX, 0, NULL); + girara_shortcut_add(gsession, 0, 0, "gg", sc_navigate_index, INDEX, TOP, NULL); + girara_shortcut_add(gsession, 0, 0, "G", sc_navigate_index, INDEX, BOTTOM, NULL); + girara_shortcut_add(gsession, 0, GDK_KEY_Escape, NULL, sc_toggle_index, INDEX, 0, NULL); + girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_bracketleft, NULL, sc_toggle_index, INDEX, 0, NULL); + girara_shortcut_add(gsession, GDK_CONTROL_MASK, GDK_KEY_c, NULL, sc_toggle_index, INDEX, 0, NULL); /* Presentation mode */ girara_shortcut_add(gsession, 0, GDK_KEY_J, NULL, sc_navigate, PRESENTATION, NEXT, NULL); From 47cd9b1895f24472041442545d94edc105962484 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 24 Jul 2015 16:35:51 +0200 Subject: [PATCH 07/94] List recent files Signed-off-by: Sebastian Ramacher --- zathura/database.c | 8 ++++++++ zathura/database.h | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/zathura/database.c b/zathura/database.c index 92a8c34..62c69df 100644 --- a/zathura/database.c +++ b/zathura/database.c @@ -68,3 +68,11 @@ zathura_db_get_fileinfo(zathura_database_t* db, const char* file, return ZATHURA_DATABASE_GET_INTERFACE(db)->get_fileinfo(db, file, file_info); } + +girara_list_t* +zathura_db_get_recent_files(zathura_database_t* db) +{ + g_return_val_if_fail(ZATHURA_IS_DATABASE(db), NULL); + + return ZATHURA_DATABASE_GET_INTERFACE(db)->get_recent_files(db); +} diff --git a/zathura/database.h b/zathura/database.h index 5cc5eea..7804411 100644 --- a/zathura/database.h +++ b/zathura/database.h @@ -50,6 +50,8 @@ struct _ZathuraDatabaseInterface 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); + + girara_list_t* (*get_recent_files)(ZathuraDatabase* db); }; GType zathura_database_get_type(void); @@ -128,4 +130,13 @@ bool zathura_db_set_fileinfo(zathura_database_t* db, const char* file, bool zathura_db_get_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info); +/* Get a list of recent files from the database. The most recent file is listed + * first. + * + * @param db The database instance + * @return list of files + */ +girara_list_t* zathura_db_get_recent_files(zathura_database_t* db); + + #endif // DATABASE_H From 6db534caeaa99c8b6f9888a7a75e59742136d484 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 24 Jul 2015 17:19:58 +0200 Subject: [PATCH 08/94] Implement recent files support Signed-off-by: Sebastian Ramacher --- zathura/database-sqlite.c | 59 +++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/zathura/database-sqlite.c b/zathura/database-sqlite.c index 804e7af..6de1d9a 100644 --- a/zathura/database-sqlite.c +++ b/zathura/database-sqlite.c @@ -28,6 +28,7 @@ static bool sqlite_get_fileinfo(zathura_database_t* db, const char* fi 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); +static girara_list_t* sqlite_get_recent_files(zathura_database_t* db); typedef struct zathura_sqldatabase_private_s { sqlite3* session; @@ -45,13 +46,14 @@ static void zathura_database_interface_init(ZathuraDatabaseInterface* iface) { /* initialize interface */ - 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; + 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; + iface->get_recent_files = sqlite_get_recent_files; } static void @@ -148,7 +150,8 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) "pages_per_row INTEGER," "first_page_column INTEGER," "position_x FLOAT," - "position_y FLOAT" + "position_y FLOAT," + "time TIMESTAMP" ");"; /* create history table */ @@ -175,6 +178,10 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) static const char SQL_FILEINFO_ALTER2[] = "ALTER TABLE fileinfo ADD COLUMN first_page_column INTEGER;"; + /* update fileinfo table (part 2) */ + static const char SQL_FILEINFO_ALTER3[] = + "ALTER TABLE fileinfo ADD COLUMN time TIMESTAMP;"; + /* update bookmark table */ static const char SQL_BOOKMARK_ALTER[] = "ALTER TABLE bookmarks ADD COLUMN hadj_ratio FLOAT;" @@ -216,6 +223,15 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) } } + ret1 = check_column(session, "fileinfo", "time", &res1); + + if (ret1 == true && res1 == false) { + girara_debug("old database table layout detected; updating ..."); + if (sqlite3_exec(session, SQL_FILEINFO_ALTER3, NULL, 0, NULL) != SQLITE_OK) { + girara_warning("failed to update database table layout"); + } + } + ret1 = check_column(session, "bookmarks", "hadj_ratio", &res1); ret2 = check_column(session, "bookmarks", "vadj_ratio", &res2); @@ -558,7 +574,7 @@ sqlite_set_fileinfo(zathura_database_t* db, const char* file, zathura_sqldatabase_private_t* priv = ZATHURA_SQLDATABASE_GET_PRIVATE(db); static const char SQL_FILEINFO_SET[] = - "REPLACE INTO fileinfo (file, page, offset, scale, rotation, pages_per_row, first_page_column, position_x, position_y) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);"; + "REPLACE INTO fileinfo (file, page, offset, scale, rotation, pages_per_row, first_page_column, position_x, position_y, time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, DATETIME('now'));"; sqlite3_stmt* stmt = prepare_statement(priv->session, SQL_FILEINFO_SET); if (stmt == NULL) { @@ -677,3 +693,28 @@ sqlite_io_read(GiraraInputHistoryIO* db) return list; } +static girara_list_t* +sqlite_get_recent_files(zathura_database_t* db) +{ + static const char SQL_HISTORY_GET[] = + "SELECT file FROM fileinfo ORDER BY time DESC"; + + zathura_sqldatabase_private_t* priv = ZATHURA_SQLDATABASE_GET_PRIVATE(db); + sqlite3_stmt* stmt = prepare_statement(priv->session, SQL_HISTORY_GET); + if (stmt == NULL) { + return NULL; + } + + girara_list_t* list = girara_list_new2((girara_free_function_t) g_free); + if (list == NULL) { + sqlite3_finalize(stmt); + return NULL; + } + + while (sqlite3_step(stmt) == SQLITE_ROW) { + girara_list_append(list, g_strdup((const char*) sqlite3_column_text(stmt, 0))); + } + + sqlite3_finalize(stmt); + return list; +} From 83fe96e81446540d7dcefe987546810859927df4 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 24 Jul 2015 17:20:17 +0200 Subject: [PATCH 09/94] Implement recent files --- zathura/database-plain.c | 71 +++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/zathura/database-plain.c b/zathura/database-plain.c index f3b5c46..084b705 100644 --- a/zathura/database-plain.c +++ b/zathura/database-plain.c @@ -9,9 +9,11 @@ #include #include #include +#include #include #include #include +#include #include "database-plain.h" #include "utils.h" @@ -29,6 +31,7 @@ #define KEY_POSITION_X "position-x" #define KEY_POSITION_Y "position-y" #define KEY_JUMPLIST "jumplist" +#define KEY_TIME "time" #ifdef __GNU__ #include @@ -60,6 +63,7 @@ static bool plain_get_fileinfo(zathura_database_t* db, const char* fil 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); +static girara_list_t* plain_get_recent_files(zathura_database_t* db); /* forward declaration */ static bool zathura_db_check_file(const char* path); @@ -105,13 +109,14 @@ static void zathura_database_interface_init(ZathuraDatabaseInterface* iface) { /* initialize interface */ - 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; + 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; + iface->get_recent_files = plain_get_recent_files; } static void @@ -557,6 +562,7 @@ plain_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* g_key_file_set_integer(priv->history, name, KEY_FIRST_PAGE_COLUMN, file_info->first_page_column); g_key_file_set_double (priv->history, name, KEY_POSITION_X, file_info->position_x); g_key_file_set_double (priv->history, name, KEY_POSITION_Y, file_info->position_y); + g_key_file_set_integer(priv->history, name, KEY_TIME, time(NULL)); g_free(name); @@ -781,8 +787,6 @@ plain_io_read(GiraraInputHistoryIO* db) return res; } -#include - static void plain_io_append(GiraraInputHistoryIO* db, const char* input) { @@ -822,3 +826,52 @@ plain_io_append(GiraraInputHistoryIO* db, const char* input) file_lock_set(fileno(file), F_UNLCK); fclose(file); } + +static int +compare_time(const void* l, const void* r, void* data) +{ + const gchar* lhs = l; + const gchar* rhs = r; + GKeyFile* keyfile = data; + + time_t lhs_time = 0; + time_t rhs_time = 0; + + if (g_key_file_has_key(keyfile, lhs, KEY_TIME, NULL) == TRUE) { + lhs_time = g_key_file_get_uint64(keyfile, lhs, KEY_TIME, NULL); + } + if (g_key_file_has_key(keyfile, rhs, KEY_TIME, NULL) == TRUE) { + rhs_time = g_key_file_get_uint64(keyfile, rhs, KEY_TIME, NULL); + } + + if (lhs_time < rhs_time) { + return 1; + } else if (lhs_time > rhs_time) { + return -1; + } + return 0; +} + +static girara_list_t* +plain_get_recent_files(zathura_database_t* db) +{ + zathura_plaindatabase_private_t* priv = ZATHURA_PLAINDATABASE_GET_PRIVATE(db); + + girara_list_t* result = girara_list_new2(g_free); + if (result == NULL) { + return NULL; + } + + gsize groups_size = 0; + gchar** groups = g_key_file_get_groups(priv->history, &groups_size); + + if (groups_size > 0) { + g_qsort_with_data(groups, groups_size, sizeof(gchar*), compare_time, priv->history); + } + + for (gsize s = 0; s != groups_size; ++s) { + girara_list_append(result, groups[s]); + } + + return result; +} From 4e5ae52bc5e611b0f1441011e6ac1c0512370c1e Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 24 Jul 2015 17:25:57 +0200 Subject: [PATCH 10/94] Display recent files in completion (fixes #490) Signed-off-by: Sebastian Ramacher --- doc/man/zathurarc.5.rst | 22 +++++++++++++++++++++ zathura/completion.c | 44 +++++++++++++++++++++++++++++++++-------- zathura/config.c | 2 ++ 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst index 85a4656..15023bc 100644 --- a/doc/man/zathurarc.5.rst +++ b/doc/man/zathurarc.5.rst @@ -820,6 +820,28 @@ Defines if the last/first page should be wrapped * Value type: Boolean * Default value: false + +show-directories +^^^^^^^^^^^^^^^^ +Defines if the directories should be displayed in completion. + +* Value type: Boolean +* Default value: true + +show-hidden +^^^^^^^^^^^ +Defines if hidden files and directories should be displayed in completion. + +* Value type: Boolean +* Default value: false + +show-recent +^^^^^^^^^^^ +Defines if recent files should be displayed in completion. + +* Value type: Boolean +* Default value: true + scroll-page-aware ^^^^^^^^^^^^^^^^^ Defines if scrolling by half or full pages stops at page boundaries. diff --git a/zathura/completion.c b/zathura/completion.c index d558fd0..708c12d 100644 --- a/zathura/completion.c +++ b/zathura/completion.c @@ -12,6 +12,7 @@ #include "completion.h" #include "utils.h" #include "page.h" +#include "database.h" #include #include @@ -32,7 +33,7 @@ compare_case_insensitive(const char* str1, const char* str2) static girara_list_t* list_files(zathura_t* zathura, const char* current_path, const char* current_file, - unsigned int current_file_length, bool is_dir, bool check_file_ext) + size_t current_file_length, bool is_dir, bool check_file_ext) { if (zathura == NULL || zathura->ui.session == NULL || current_path == NULL) { return NULL; @@ -113,15 +114,20 @@ error_free: } static girara_completion_t* -list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext) +list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext, bool include_history) { girara_completion_t* completion = girara_completion_init(); - girara_completion_group_t* group = girara_completion_group_create(zathura->ui.session, NULL); + girara_completion_group_t* group = girara_completion_group_create(zathura->ui.session, "files"); + girara_completion_group_t* history_group = NULL; gchar* path = NULL; gchar* current_path = NULL; - if (completion == NULL || group == NULL) { + if (include_history == true) { + history_group = girara_completion_group_create(zathura->ui.session, "recent files"); + } + + if (completion == NULL || group == NULL || (include_history == true && history_group == NULL)) { goto error_free; } @@ -169,12 +175,12 @@ list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext) /* get current file */ gchar* current_file = is_dir ? "" : basename(path); - int current_file_length = strlen(current_file); + const size_t current_file_length = strlen(current_file); /* read directory */ if (g_file_test(current_path, G_FILE_TEST_IS_DIR) == TRUE) { girara_list_t* names = list_files(zathura, current_path, current_file, current_file_length, is_dir, check_file_ext); - if (!names) { + if (names == NULL) { goto error_free; } @@ -184,10 +190,26 @@ list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext) girara_list_free(names); } + if (include_history == true) { + girara_list_t* recent_files = zathura_db_get_recent_files(zathura->database); + if (recent_files == NULL) { + goto error_free; + } + + const size_t path_len = strlen(path); + GIRARA_LIST_FOREACH(recent_files, const char*, iter, file) + if (strncmp(path, file, path_len) == 0) { + girara_completion_group_add_element(history_group, file, NULL); + } + GIRARA_LIST_FOREACH_END(recent_files, const char*, iter, file); + girara_list_free(recent_files); + } + g_free(path); g_free(current_path); girara_completion_add_group(completion, group); + girara_completion_add_group(completion, history_group); return completion; @@ -196,6 +218,9 @@ error_free: if (completion) { girara_completion_free(completion); } + if (history_group) { + girara_completion_group_free(history_group); + } if (group) { girara_completion_group_free(group); } @@ -213,7 +238,10 @@ cc_open(girara_session_t* session, const char* input) g_return_val_if_fail(session->global.data != NULL, NULL); zathura_t* zathura = session->global.data; - return list_files_for_cc(zathura, input, true); + bool show_recent = true; + girara_setting_get(zathura->ui.session, "show-recent", &show_recent); + + return list_files_for_cc(zathura, input, true, show_recent); } girara_completion_t* @@ -223,7 +251,7 @@ cc_write(girara_session_t* session, const char* input) g_return_val_if_fail(session->global.data != NULL, NULL); zathura_t* zathura = session->global.data; - return list_files_for_cc(zathura, input, false); + return list_files_for_cc(zathura, input, false, false); } girara_completion_t* diff --git a/zathura/config.c b/zathura/config.c index 245911a..8e4e101 100644 --- a/zathura/config.c +++ b/zathura/config.c @@ -212,6 +212,8 @@ config_load_default(zathura_t* zathura) girara_setting_add(gsession, "show-hidden", &bool_value, BOOLEAN, false, _("Show hidden files and directories"), NULL, NULL); bool_value = true; girara_setting_add(gsession, "show-directories", &bool_value, BOOLEAN, false, _("Show directories"), NULL, NULL); + bool_value = true; + girara_setting_add(gsession, "show-recent", &bool_value, BOOLEAN, false, _("Show recent files"), NULL, NULL); bool_value = false; girara_setting_add(gsession, "open-first-page", &bool_value, BOOLEAN, false, _("Always open on first page"), NULL, NULL); bool_value = false; From 4f3b1b257b1bfe7dbe9948a99bdb937b3668caf2 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 26 Jul 2015 23:19:22 +0200 Subject: [PATCH 11/94] Make show-recent both an option to show recent files and the maximum number to be shown Signed-off-by: Sebastian Ramacher --- doc/man/zathurarc.5.rst | 8 +++++--- zathura/completion.c | 16 +++++++++------- zathura/config.c | 4 ++-- zathura/database-plain.c | 8 ++++++-- zathura/database-sqlite.c | 16 +++++++++++++--- zathura/database.c | 4 ++-- zathura/database.h | 6 ++++-- 7 files changed, 41 insertions(+), 21 deletions(-) diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst index 15023bc..eea00d3 100644 --- a/doc/man/zathurarc.5.rst +++ b/doc/man/zathurarc.5.rst @@ -837,10 +837,12 @@ Defines if hidden files and directories should be displayed in completion. show-recent ^^^^^^^^^^^ -Defines if recent files should be displayed in completion. +Defines the number of recent files that should be displayed in completion. +If the value is negative, no upper bounds are applied. If the value is 0, no +recent files are shown. -* Value type: Boolean -* Default value: true +* Value type: Integer +* Default value: 10 scroll-page-aware ^^^^^^^^^^^^^^^^^ diff --git a/zathura/completion.c b/zathura/completion.c index 708c12d..d85735c 100644 --- a/zathura/completion.c +++ b/zathura/completion.c @@ -114,7 +114,7 @@ error_free: } static girara_completion_t* -list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext, bool include_history) +list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext, int show_recent) { girara_completion_t* completion = girara_completion_init(); girara_completion_group_t* group = girara_completion_group_create(zathura->ui.session, "files"); @@ -123,11 +123,11 @@ list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext, bo gchar* path = NULL; gchar* current_path = NULL; - if (include_history == true) { + if (show_recent > 0) { history_group = girara_completion_group_create(zathura->ui.session, "recent files"); } - if (completion == NULL || group == NULL || (include_history == true && history_group == NULL)) { + if (completion == NULL || group == NULL || (show_recent > 0 && history_group == NULL)) { goto error_free; } @@ -190,8 +190,8 @@ list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext, bo girara_list_free(names); } - if (include_history == true) { - girara_list_t* recent_files = zathura_db_get_recent_files(zathura->database); + if (show_recent > 0) { + girara_list_t* recent_files = zathura_db_get_recent_files(zathura->database, show_recent); if (recent_files == NULL) { goto error_free; } @@ -208,8 +208,10 @@ list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext, bo g_free(path); g_free(current_path); + if (history_group != NULL) { + girara_completion_add_group(completion, history_group); + } girara_completion_add_group(completion, group); - girara_completion_add_group(completion, history_group); return completion; @@ -238,7 +240,7 @@ cc_open(girara_session_t* session, const char* input) g_return_val_if_fail(session->global.data != NULL, NULL); zathura_t* zathura = session->global.data; - bool show_recent = true; + int show_recent = 0; girara_setting_get(zathura->ui.session, "show-recent", &show_recent); return list_files_for_cc(zathura, input, true, show_recent); diff --git a/zathura/config.c b/zathura/config.c index 8e4e101..cdd0609 100644 --- a/zathura/config.c +++ b/zathura/config.c @@ -212,8 +212,8 @@ config_load_default(zathura_t* zathura) girara_setting_add(gsession, "show-hidden", &bool_value, BOOLEAN, false, _("Show hidden files and directories"), NULL, NULL); bool_value = true; girara_setting_add(gsession, "show-directories", &bool_value, BOOLEAN, false, _("Show directories"), NULL, NULL); - bool_value = true; - girara_setting_add(gsession, "show-recent", &bool_value, BOOLEAN, false, _("Show recent files"), NULL, NULL); + int_value = 10; + girara_setting_add(gsession, "show-recent", &int_value, INT, false, _("Show recent files"), NULL, NULL); bool_value = false; girara_setting_add(gsession, "open-first-page", &bool_value, BOOLEAN, false, _("Always open on first page"), NULL, NULL); bool_value = false; diff --git a/zathura/database-plain.c b/zathura/database-plain.c index 084b705..12fc2ed 100644 --- a/zathura/database-plain.c +++ b/zathura/database-plain.c @@ -63,7 +63,7 @@ static bool plain_get_fileinfo(zathura_database_t* db, const char* fil 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); -static girara_list_t* plain_get_recent_files(zathura_database_t* db); +static girara_list_t* plain_get_recent_files(zathura_database_t* db, int max); /* forward declaration */ static bool zathura_db_check_file(const char* path); @@ -853,7 +853,7 @@ compare_time(const void* l, const void* r, void* data) } static girara_list_t* -plain_get_recent_files(zathura_database_t* db) +plain_get_recent_files(zathura_database_t* db, int max) { zathura_plaindatabase_private_t* priv = ZATHURA_PLAINDATABASE_GET_PRIVATE(db); @@ -869,6 +869,10 @@ plain_get_recent_files(zathura_database_t* db) g_qsort_with_data(groups, groups_size, sizeof(gchar*), compare_time, priv->history); } + if (max >= 0 && (gsize) max < groups_size) { + groups_size = max; + } + for (gsize s = 0; s != groups_size; ++s) { girara_list_append(result, groups[s]); } diff --git a/zathura/database-sqlite.c b/zathura/database-sqlite.c index 6de1d9a..176f3dc 100644 --- a/zathura/database-sqlite.c +++ b/zathura/database-sqlite.c @@ -28,7 +28,7 @@ static bool sqlite_get_fileinfo(zathura_database_t* db, const char* fi 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); -static girara_list_t* sqlite_get_recent_files(zathura_database_t* db); +static girara_list_t* sqlite_get_recent_files(zathura_database_t* db, int max); typedef struct zathura_sqldatabase_private_s { sqlite3* session; @@ -694,10 +694,10 @@ sqlite_io_read(GiraraInputHistoryIO* db) } static girara_list_t* -sqlite_get_recent_files(zathura_database_t* db) +sqlite_get_recent_files(zathura_database_t* db, int max) { static const char SQL_HISTORY_GET[] = - "SELECT file FROM fileinfo ORDER BY time DESC"; + "SELECT file FROM fileinfo ORDER BY time DESC LIMIT ?"; zathura_sqldatabase_private_t* priv = ZATHURA_SQLDATABASE_GET_PRIVATE(db); sqlite3_stmt* stmt = prepare_statement(priv->session, SQL_HISTORY_GET); @@ -705,6 +705,16 @@ sqlite_get_recent_files(zathura_database_t* db) return NULL; } + if (max < 0) { + max = INT_MAX; + } + + if (sqlite3_bind_int(stmt, 1, max) != SQLITE_OK) { + sqlite3_finalize(stmt); + girara_error("Failed to bind arguments."); + return false; + } + girara_list_t* list = girara_list_new2((girara_free_function_t) g_free); if (list == NULL) { sqlite3_finalize(stmt); diff --git a/zathura/database.c b/zathura/database.c index 62c69df..d67b507 100644 --- a/zathura/database.c +++ b/zathura/database.c @@ -70,9 +70,9 @@ zathura_db_get_fileinfo(zathura_database_t* db, const char* file, } girara_list_t* -zathura_db_get_recent_files(zathura_database_t* db) +zathura_db_get_recent_files(zathura_database_t* db, int max) { g_return_val_if_fail(ZATHURA_IS_DATABASE(db), NULL); - return ZATHURA_DATABASE_GET_INTERFACE(db)->get_recent_files(db); + return ZATHURA_DATABASE_GET_INTERFACE(db)->get_recent_files(db, max); } diff --git a/zathura/database.h b/zathura/database.h index 7804411..3d46132 100644 --- a/zathura/database.h +++ b/zathura/database.h @@ -51,7 +51,7 @@ struct _ZathuraDatabaseInterface bool (*get_fileinfo)(ZathuraDatabase* db, const char* file, zathura_fileinfo_t* file_info); - girara_list_t* (*get_recent_files)(ZathuraDatabase* db); + girara_list_t* (*get_recent_files)(ZathuraDatabase* db, int max); }; GType zathura_database_get_type(void); @@ -134,9 +134,11 @@ bool zathura_db_get_fileinfo(zathura_database_t* db, const char* file, * first. * * @param db The database instance + * @param max The maximum number of recent files. If max is less than zero, now + * limit is applied. * @return list of files */ -girara_list_t* zathura_db_get_recent_files(zathura_database_t* db); +girara_list_t* zathura_db_get_recent_files(zathura_database_t* db, int max); #endif // DATABASE_H From 5d490f6895303c32fa38fa9a098744c0a69af5c6 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 26 Jul 2015 23:35:23 +0200 Subject: [PATCH 12/94] Fix sorting --- zathura/database-plain.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zathura/database-plain.c b/zathura/database-plain.c index 12fc2ed..3f4133d 100644 --- a/zathura/database-plain.c +++ b/zathura/database-plain.c @@ -830,8 +830,8 @@ plain_io_append(GiraraInputHistoryIO* db, const char* input) static int compare_time(const void* l, const void* r, void* data) { - const gchar* lhs = l; - const gchar* rhs = r; + const gchar* lhs = *(const gchar**) l; + const gchar* rhs = *(const gchar**) r; GKeyFile* keyfile = data; time_t lhs_time = 0; @@ -874,8 +874,9 @@ plain_get_recent_files(zathura_database_t* db, int max) } for (gsize s = 0; s != groups_size; ++s) { - girara_list_append(result, groups[s]); + girara_list_append(result, g_strdup(groups[s])); } + g_strfreev(groups); return result; } From 7da7bcb4c1328897d3c9f4d736ae214bb72fa166 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 26 Jul 2015 23:38:10 +0200 Subject: [PATCH 13/94] Do not display recent files if there aren't any Signed-off-by: Sebastian Ramacher --- doc/man/conf.py | 14 ++++++++++++++ zathura/completion.c | 19 ++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/doc/man/conf.py b/doc/man/conf.py index d149036..743031b 100644 --- a/doc/man/conf.py +++ b/doc/man/conf.py @@ -2,11 +2,25 @@ # # See LICENSE file for license and copyright information +import os.path +import glob +import time + +dirname = os.path.dirname(__file__) +files = glob.glob(os.path.join(dirname, '*.rst')) +files.extend(glob.glob(os.path.join(dirname, '*.txt'))) + +maxdate = 0 +for path in files: + s = os.stat(path) + maxdate = max(maxdate, s.st_mtime) + # -- General configuration ------------------------------------------------ source_suffix = '.rst' master_doc = 'zathura.1' templates_path = ['_templates'] +today = time.strftime('%Y-%m-%d', time.gmtime(maxdate)) # -- Project configuration ------------------------------------------------ diff --git a/zathura/completion.c b/zathura/completion.c index d85735c..696aabb 100644 --- a/zathura/completion.c +++ b/zathura/completion.c @@ -196,13 +196,18 @@ list_files_for_cc(zathura_t* zathura, const char* input, bool check_file_ext, in goto error_free; } - const size_t path_len = strlen(path); - GIRARA_LIST_FOREACH(recent_files, const char*, iter, file) - if (strncmp(path, file, path_len) == 0) { - girara_completion_group_add_element(history_group, file, NULL); - } - GIRARA_LIST_FOREACH_END(recent_files, const char*, iter, file); - girara_list_free(recent_files); + if (girara_list_size(recent_files) != 0) { + const size_t path_len = strlen(path); + GIRARA_LIST_FOREACH(recent_files, const char*, iter, file) + if (strncmp(path, file, path_len) == 0) { + girara_completion_group_add_element(history_group, file, NULL); + } + GIRARA_LIST_FOREACH_END(recent_files, const char*, iter, file); + girara_list_free(recent_files); + } else { + girara_completion_group_free(history_group); + history_group = NULL; + } } g_free(path); From f1f65664dab973ebe85f0169bf6f5eb210c0d15f Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Thu, 1 Oct 2015 16:55:07 -0500 Subject: [PATCH 14/94] Add feature to show ~ instead of $HOME in title --- zathura/config.c | 2 ++ zathura/zathura.c | 40 +++++++++++++++++++++++++++++++++------- zathura/zathura.h | 2 ++ 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/zathura/config.c b/zathura/config.c index 25275af..22078ca 100644 --- a/zathura/config.c +++ b/zathura/config.c @@ -224,6 +224,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-home-tilde", &bool_value, BOOLEAN, false, _("Use ~ instead of $HOME in the filename 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); diff --git a/zathura/zathura.c b/zathura/zathura.c index 391f756..6e92bca 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -546,6 +546,38 @@ document_info_open(gpointer data) return FALSE; } +const char* +get_window_title_filename(zathura_t* zathura, const char* file_path) +{ + bool basename_only = false; + girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); + if (basename_only == false) { + bool home_tilde = false; + girara_setting_get(zathura->ui.session, "window-title-home-tilde", &home_tilde); + if (home_tilde) { + char *home = getenv("HOME"); + int home_len = home ? strlen(home) : 0; + int file_path_len = file_path ? strlen(file_path) : 0; + + if (home_len > 1 && strncmp(home, file_path, home_len) == 0 && (!file_path[home_len] || file_path[home_len] == '/')) { + // Length should be total length of path - length of $HOME + 1 for '~' + 1 for '\0' + int tlen = file_path_len - home_len + 2; + char *tdir = malloc(sizeof(char) * tlen); + strncpy(tdir + 1, file_path + home_len, tlen); + tdir[0] = '~'; + tdir[tlen - 1] = '\0'; + return tdir; + } else { + return file_path; + } + } else { + return file_path; + } + } else { + return zathura_document_get_basename(zathura->document); + } +} + bool document_open(zathura_t* zathura, const char* path, const char* password, int page_number) @@ -838,13 +870,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, } /* update title */ - basename_only = false; - girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); - if (basename_only == false) { - girara_set_window_title(zathura->ui.session, file_path); - } else { - girara_set_window_title(zathura->ui.session, zathura_document_get_basename(document)); - } + girara_set_window_title(zathura->ui.session, get_window_title_filename(zathura, file_path)); g_free(file_uri); diff --git a/zathura/zathura.h b/zathura/zathura.h index d4b71af..a829415 100644 --- a/zathura/zathura.h +++ b/zathura/zathura.h @@ -278,6 +278,8 @@ void zathura_set_plugin_dir(zathura_t* zathura, const char* dir); */ void zathura_set_argv(zathura_t* zathura, char** argv); +const char* get_window_title_filename(zathura_t* zathura, const char* file_path); + /** * Opens a file * From 0c81a47eff9f31efb1b0071832c621de928b8bc3 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Thu, 1 Oct 2015 17:10:47 -0500 Subject: [PATCH 15/94] Use tilde-substitution in page number update --- zathura/zathura.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index 6e92bca..c3ef182 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -1125,9 +1125,7 @@ statusbar_page_number_update(zathura_t* zathura) 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), + get_window_title_filename(zathura, zathura_document_get_path(zathura->document)), page_number_text); girara_set_window_title(zathura->ui.session, title); g_free(title); From 7c3417bbe9aca097dc736ea77318a9dd347c00a6 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Thu, 1 Oct 2015 17:12:04 -0500 Subject: [PATCH 16/94] Remove unnecessary retrieval of settings --- zathura/zathura.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index c3ef182..a43b11f 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -1122,8 +1122,6 @@ statusbar_page_number_update(zathura_t* zathura) 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", get_window_title_filename(zathura, zathura_document_get_path(zathura->document)), page_number_text); From c0306b8706fb03015a08d9a5efb63894df264ae0 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Mon, 5 Oct 2015 10:17:49 -0500 Subject: [PATCH 17/94] Update manpage --- doc/man/zathurarc.5.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst index 85a4656..2e6f03a 100644 --- a/doc/man/zathurarc.5.rst +++ b/doc/man/zathurarc.5.rst @@ -965,6 +965,14 @@ Define the background color of the selected element in index mode. * Value type: String * Default value: #9FBC00 +window-title-home-tilde +^^^^^^^^^^^^^^^^^^^^^^^ + +Display a short version of the file path, which replaces $HOME with ~, in the window title. + +* Value type: Boolean +* Default value: false + SEE ALSO ======== From 1be84c6c3b8049a4d8d48ec3965c66c60fd0a349 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Mon, 5 Oct 2015 10:21:54 -0500 Subject: [PATCH 18/94] Use glib malloc instead of malloc --- zathura/zathura.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index a43b11f..c2c8b7b 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -556,13 +556,13 @@ get_window_title_filename(zathura_t* zathura, const char* file_path) girara_setting_get(zathura->ui.session, "window-title-home-tilde", &home_tilde); if (home_tilde) { char *home = getenv("HOME"); - int home_len = home ? strlen(home) : 0; - int file_path_len = file_path ? strlen(file_path) : 0; + size_t home_len = home ? strlen(home) : 0; + size_t file_path_len = file_path ? strlen(file_path) : 0; if (home_len > 1 && strncmp(home, file_path, home_len) == 0 && (!file_path[home_len] || file_path[home_len] == '/')) { // Length should be total length of path - length of $HOME + 1 for '~' + 1 for '\0' int tlen = file_path_len - home_len + 2; - char *tdir = malloc(sizeof(char) * tlen); + char *tdir = g_try_malloc(sizeof(char) * tlen); strncpy(tdir + 1, file_path + home_len, tlen); tdir[0] = '~'; tdir[tlen - 1] = '\0'; From 7991618d259d121c5412584264caef24f728c527 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Mon, 5 Oct 2015 10:37:25 -0500 Subject: [PATCH 19/94] Implement tilde feature for statusbar as well --- doc/man/zathurarc.5.rst | 21 ++++++++++++++------- zathura/config.c | 2 ++ zathura/zathura.c | 30 ++++++++++++++++++------------ zathura/zathura.h | 10 +++++++++- 4 files changed, 43 insertions(+), 20 deletions(-) diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst index 2e6f03a..ac38cc6 100644 --- a/doc/man/zathurarc.5.rst +++ b/doc/man/zathurarc.5.rst @@ -863,6 +863,13 @@ Use basename of the file in the window title. * Value type: Boolean * Default value: false +window-title-home-tilde +^^^^^^^^^^^^^^^^^^^^^^^ +Display a short version of the file path, which replaces $HOME with ~, in the window title. + +* Value type: Boolean +* Default value: false + window-title-page ^^^^^^^^^^^^^^^^^ Display the page number in the window title. @@ -877,6 +884,13 @@ Use basename of the file in the statusbar. * Value type: Boolean * Default value: false +statusbar-home-tilde +^^^^^^^^^^^^^^^^^^^^ +Display a short version of the file path, which replaces $HOME with ~, in the statusbar. + +* Value type: Boolean +* Default value: false + zoom-center ^^^^^^^^^^^ En/Disables horizontally centered zooming. @@ -965,13 +979,6 @@ Define the background color of the selected element in index mode. * Value type: String * Default value: #9FBC00 -window-title-home-tilde -^^^^^^^^^^^^^^^^^^^^^^^ - -Display a short version of the file path, which replaces $HOME with ~, in the window title. - -* Value type: Boolean -* Default value: false SEE ALSO diff --git a/zathura/config.c b/zathura/config.c index 22078ca..597b7c0 100644 --- a/zathura/config.c +++ b/zathura/config.c @@ -229,6 +229,8 @@ config_load_default(zathura_t* zathura) 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, "statusbar-home-tilde", &bool_value, BOOLEAN, false, _("Use ~ instead of $HOME in the filename in the statusbar"), NULL, NULL); bool_value = true; girara_setting_add(gsession, "synctex", &bool_value, BOOLEAN, false, _("Enable synctex support"), NULL, NULL); string_value = ""; diff --git a/zathura/zathura.c b/zathura/zathura.c index c2c8b7b..c47aae7 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -547,13 +547,24 @@ document_info_open(gpointer data) } const char* -get_window_title_filename(zathura_t* zathura, const char* file_path) +get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar) { bool basename_only = false; - girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); + if (statusbar) { + girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); + } else { + girara_setting_get(zathura->ui.session, "statusbar-basename", &basename_only); + } + if (basename_only == false) { + bool home_tilde = false; - girara_setting_get(zathura->ui.session, "window-title-home-tilde", &home_tilde); + if (statusbar) { + girara_setting_get(zathura->ui.session, "statusbar-home-tilde", &home_tilde); + } else { + girara_setting_get(zathura->ui.session, "window-title-home-tilde", &home_tilde); + } + if (home_tilde) { char *home = getenv("HOME"); size_t home_len = home ? strlen(home) : 0; @@ -697,13 +708,8 @@ document_open(zathura_t* zathura, const char* path, const char* password, zathura->bisect.end = number_of_pages - 1; /* update statusbar */ - bool basename_only = false; - girara_setting_get(zathura->ui.session, "statusbar-basename", &basename_only); - if (basename_only == false) { - girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, file_path); - } else { - girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, zathura_document_get_basename(document)); - } + girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, + get_formatted_filename(zathura, file_path, true)); /* install file monitor */ file_uri = g_filename_to_uri(file_path, NULL, NULL); @@ -870,7 +876,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, } /* update title */ - girara_set_window_title(zathura->ui.session, get_window_title_filename(zathura, file_path)); + girara_set_window_title(zathura->ui.session, get_formatted_filename(zathura, file_path, false)); g_free(file_uri); @@ -1123,7 +1129,7 @@ statusbar_page_number_update(zathura_t* zathura) if (page_number_in_window_title == true) { char* title = g_strdup_printf("%s %s", - get_window_title_filename(zathura, zathura_document_get_path(zathura->document)), + get_formatted_filename(zathura, zathura_document_get_path(zathura->document), false), page_number_text); girara_set_window_title(zathura->ui.session, title); g_free(title); diff --git a/zathura/zathura.h b/zathura/zathura.h index a829415..e397596 100644 --- a/zathura/zathura.h +++ b/zathura/zathura.h @@ -278,7 +278,15 @@ void zathura_set_plugin_dir(zathura_t* zathura, const char* dir); */ void zathura_set_argv(zathura_t* zathura, char** argv); -const char* get_window_title_filename(zathura_t* zathura, const char* file_path); +/** + * Returns the filename formatted according to the user config. + * Takes into account the basename setting and the home-tilde setting. + * + * @param zatura The zathura session + * @param file_path The filename to be formatted + * @param statusbar True if for statusbar, false if for window title + */ +const char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar); /** * Opens a file From f9d1d89bd4e367389c65b767d805dfaff995373c Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 5 Oct 2015 21:14:54 +0200 Subject: [PATCH 20/94] Use the widget's display Signed-off-by: Sebastian Ramacher --- zathura/callbacks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zathura/callbacks.c b/zathura/callbacks.c index 228cb80..dd6070c 100644 --- a/zathura/callbacks.c +++ b/zathura/callbacks.c @@ -622,7 +622,8 @@ cb_page_widget_link(ZathuraPage* page, void* data) bool enter = (bool) data; GdkWindow* window = gtk_widget_get_parent_window(GTK_WIDGET(page)); - GdkCursor* cursor = gdk_cursor_new_for_display(gdk_display_get_default(), enter == true ? GDK_HAND1 : GDK_LEFT_PTR); + GdkDisplay* display = gtk_widget_get_display(GTK_WIDGET(page)); + GdkCursor* cursor = gdk_cursor_new_for_display(display, enter == true ? GDK_HAND1 : GDK_LEFT_PTR); gdk_window_set_cursor(window, cursor); g_object_unref(cursor); } From 8bc9aa8af7fbaccfb1415649e1d8bfd666d2c065 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Mon, 5 Oct 2015 15:49:04 -0500 Subject: [PATCH 21/94] Fix memory leak, use girara_get_home_directory --- zathura/zathura.c | 35 +++++++++++++++++++++++------------ zathura/zathura.h | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index c47aae7..f82220b 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -546,7 +546,7 @@ document_info_open(gpointer data) return FALSE; } -const char* +char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar) { bool basename_only = false; @@ -565,10 +565,11 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar girara_setting_get(zathura->ui.session, "window-title-home-tilde", &home_tilde); } + size_t file_path_len = file_path ? strlen(file_path) : 0; + if (home_tilde) { - char *home = getenv("HOME"); + char *home = girara_get_home_directory(NULL); size_t home_len = home ? strlen(home) : 0; - size_t file_path_len = file_path ? strlen(file_path) : 0; if (home_len > 1 && strncmp(home, file_path, home_len) == 0 && (!file_path[home_len] || file_path[home_len] == '/')) { // Length should be total length of path - length of $HOME + 1 for '~' + 1 for '\0' @@ -579,13 +580,20 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar tdir[tlen - 1] = '\0'; return tdir; } else { - return file_path; + char* path = g_try_malloc(sizeof(char) * strlen(file_path)); + strncpy(path, file_path, file_path_len); + return path; } } else { - return file_path; + char* path = g_try_malloc(sizeof(char) * strlen(file_path)); + strncpy(path, file_path, file_path_len); + return path; } } else { - return zathura_document_get_basename(zathura->document); + const char* basename = zathura_document_get_basename(zathura->document); + char* basename_copy = g_try_malloc(sizeof(char) * strlen(basename)); + strncpy(basename_copy, basename, strlen(basename)); + return basename_copy; } } @@ -708,8 +716,9 @@ document_open(zathura_t* zathura, const char* path, const char* password, zathura->bisect.end = number_of_pages - 1; /* update statusbar */ - girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, - get_formatted_filename(zathura, file_path, true)); + char* filename = get_formatted_filename(zathura, file_path, true); + girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, filename); + g_free(filename); /* install file monitor */ file_uri = g_filename_to_uri(file_path, NULL, NULL); @@ -876,7 +885,9 @@ document_open(zathura_t* zathura, const char* path, const char* password, } /* update title */ - girara_set_window_title(zathura->ui.session, get_formatted_filename(zathura, file_path, false)); + char* formatted_filename = get_formatted_filename(zathura, file_path, false); + girara_set_window_title(zathura->ui.session, formatted_filename); + g_free(formatted_filename); g_free(file_uri); @@ -1128,11 +1139,11 @@ statusbar_page_number_update(zathura_t* zathura) girara_setting_get(zathura->ui.session, "window-title-page", &page_number_in_window_title); if (page_number_in_window_title == true) { - char* title = g_strdup_printf("%s %s", - get_formatted_filename(zathura, zathura_document_get_path(zathura->document), false), - page_number_text); + char* filename = get_formatted_filename(zathura, zathura_document_get_path(zathura->document), false); + char* title = g_strdup_printf("%s %s", filename, page_number_text); girara_set_window_title(zathura->ui.session, title); g_free(title); + g_free(filename); } g_free(page_number_text); diff --git a/zathura/zathura.h b/zathura/zathura.h index e397596..87f2322 100644 --- a/zathura/zathura.h +++ b/zathura/zathura.h @@ -286,7 +286,7 @@ void zathura_set_argv(zathura_t* zathura, char** argv); * @param file_path The filename to be formatted * @param statusbar True if for statusbar, false if for window title */ -const char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar); +char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar); /** * Opens a file From 93531c3effc6ab4e053d80a6ae542b94c80f3f33 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Mon, 5 Oct 2015 15:59:31 -0500 Subject: [PATCH 22/94] Use g_strdup instead of malloc+strcpy --- zathura/zathura.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index f82220b..f7094b9 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -580,20 +580,14 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar tdir[tlen - 1] = '\0'; return tdir; } else { - char* path = g_try_malloc(sizeof(char) * strlen(file_path)); - strncpy(path, file_path, file_path_len); - return path; + return g_strdup(file_path); } } else { - char* path = g_try_malloc(sizeof(char) * strlen(file_path)); - strncpy(path, file_path, file_path_len); - return path; + return g_strdup(file_path); } } else { const char* basename = zathura_document_get_basename(zathura->document); - char* basename_copy = g_try_malloc(sizeof(char) * strlen(basename)); - strncpy(basename_copy, basename, strlen(basename)); - return basename_copy; + return g_strdup(basename); } } From 1bc5a64dcdefb82da616eccaccb77fe62fdbef54 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Mon, 5 Oct 2015 16:41:38 -0500 Subject: [PATCH 23/94] Remove unnecessary space in zathurarc.5.rst --- doc/man/zathurarc.5.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst index ac38cc6..1a4a0d1 100644 --- a/doc/man/zathurarc.5.rst +++ b/doc/man/zathurarc.5.rst @@ -980,7 +980,6 @@ Define the background color of the selected element in index mode. * Default value: #9FBC00 - SEE ALSO ======== From 5aa3fa952b36c5ee415297f60f09f661203ab018 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 6 Oct 2015 22:02:51 +0200 Subject: [PATCH 24/94] Detect if -fdiagnostics-color is available Signed-off-by: Sebastian Ramacher --- colors.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/colors.mk b/colors.mk index e341942..774204b 100644 --- a/colors.mk +++ b/colors.mk @@ -1,16 +1,21 @@ # See LICENSE file for license and copyright information -# +ifeq ($(COLOR),1) +# GCC diagnostics colors +DIAGNOSTICS_COLOR_AVAILABLE ?= $(shell ($(CC) -fdiagnostics-color=always -E - /dev/null 2>/dev/null && echo 1) || echo 0) +ifeq ($(DIAGNOSTICS_COLOR_AVAILABLE),1) +CPPFLAGS += -fdiagnostics-color=always +endif + +# colorful output TPUT ?= /usr/bin/tput TPUT_AVAILABLE ?= $(shell ${TPUT} -V 2>/dev/null) ifdef TPUT_AVAILABLE -ifeq ($(COLOR),1) COLOR_NORMAL = `$(TPUT) sgr0` COLOR_ACTION = `$(TPUT) bold``$(TPUT) setaf 3` COLOR_COMMENT = `$(TPUT) bold``$(TPUT) setaf 2` COLOR_BRACKET = `$(TPUT) setaf 4` -CC += -fdiagnostics-color=always define colorecho @echo $(COLOR_BRACKET)" ["$(COLOR_ACTION)$1$(COLOR_BRACKET)"] "$(COLOR_COMMENT)$2$(COLOR_BRACKET) $(COLOR_NORMAL) endef From 5ca5264dd9ddbad2312c2b824215b972b9375238 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 6 Oct 2015 23:00:20 +0200 Subject: [PATCH 25/94] Fix grammar Signed-off-by: Sebastian Ramacher --- doc/man/zathurarc.5.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst index eea00d3..1159d01 100644 --- a/doc/man/zathurarc.5.rst +++ b/doc/man/zathurarc.5.rst @@ -74,9 +74,9 @@ the *zathurarc* file to make those changes permanent: include - Including another config file --------------------------------------- -This commands allows to include other configuration files. If a relative path is -given, the path will be resolved relative to the configuration file that is -currently processed. +This commands allows one to include other configuration files. If a relative +path is given, the path will be resolved relative to the configuration file that +is currently processed. :: From 2b73bfb6bd259f247b522ce8838576482d4036a6 Mon Sep 17 00:00:00 2001 From: Sidharth Kapur Date: Tue, 6 Oct 2015 23:31:15 -0500 Subject: [PATCH 26/94] Use more glib functions Also, check file_path_len >= home_len --- zathura/zathura.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index f7094b9..f5b4ea6 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -571,14 +571,18 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar char *home = girara_get_home_directory(NULL); size_t home_len = home ? strlen(home) : 0; - if (home_len > 1 && strncmp(home, file_path, home_len) == 0 && (!file_path[home_len] || file_path[home_len] == '/')) { - // Length should be total length of path - length of $HOME + 1 for '~' + 1 for '\0' - int tlen = file_path_len - home_len + 2; - char *tdir = g_try_malloc(sizeof(char) * tlen); - strncpy(tdir + 1, file_path + home_len, tlen); - tdir[0] = '~'; - tdir[tlen - 1] = '\0'; - return tdir; + if (home_len > 1 + && file_path_len >= home_len + && g_str_has_prefix(file_path, home) + && (!file_path[home_len] || file_path[home_len] == '/')) { + + size_t remaining_len = file_path_len - home_len; + + GString* remaining_path = g_string_new_len(&file_path[home_len], remaining_len); + char* tilde_path = g_strdup_printf("~%s", remaining_path->str); + g_string_free(remaining_path, true); + + return tilde_path; } else { return g_strdup(file_path); } From 6a676cc5b5b74912b2267fdda1aa2cc99a25b63c Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 20:10:32 +0200 Subject: [PATCH 27/94] Make get_formatted_filename static It's only used in zathura.c Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 2 +- zathura/zathura.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index f5b4ea6..bf6dcec 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -546,7 +546,7 @@ document_info_open(gpointer data) return FALSE; } -char* +static char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar) { bool basename_only = false; diff --git a/zathura/zathura.h b/zathura/zathura.h index 87f2322..d4b71af 100644 --- a/zathura/zathura.h +++ b/zathura/zathura.h @@ -278,16 +278,6 @@ void zathura_set_plugin_dir(zathura_t* zathura, const char* dir); */ void zathura_set_argv(zathura_t* zathura, char** argv); -/** - * Returns the filename formatted according to the user config. - * Takes into account the basename setting and the home-tilde setting. - * - * @param zatura The zathura session - * @param file_path The filename to be formatted - * @param statusbar True if for statusbar, false if for window title - */ -char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar); - /** * Opens a file * From 05c44474d19428b23309360a42b543ab272a2bac Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 20:10:40 +0200 Subject: [PATCH 28/94] Simplify code a bit --- zathura/zathura.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index bf6dcec..b44d8a5 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -576,13 +576,7 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar && g_str_has_prefix(file_path, home) && (!file_path[home_len] || file_path[home_len] == '/')) { - size_t remaining_len = file_path_len - home_len; - - GString* remaining_path = g_string_new_len(&file_path[home_len], remaining_len); - char* tilde_path = g_strdup_printf("~%s", remaining_path->str); - g_string_free(remaining_path, true); - - return tilde_path; + return g_strdup_printf("~%s", &file_path[home_len]); } else { return g_strdup(file_path); } From 013ac1f4b4cda9f68e49c36652c701bf5610a9b4 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 20:18:33 +0200 Subject: [PATCH 29/94] Fix a memory leak Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index b44d8a5..586cd17 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -575,9 +575,10 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar && file_path_len >= home_len && g_str_has_prefix(file_path, home) && (!file_path[home_len] || file_path[home_len] == '/')) { - + g_free(home); return g_strdup_printf("~%s", &file_path[home_len]); } else { + g_free(home); return g_strdup(file_path); } } else { From ce7f53e5e967a0d17f08d56571065fa07a8d6337 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 20:22:15 +0200 Subject: [PATCH 30/94] Some clean up Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index 586cd17..dff88d0 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -550,14 +550,13 @@ static char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar) { bool basename_only = false; - if (statusbar) { + if (statusbar == true) { girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); } else { girara_setting_get(zathura->ui.session, "statusbar-basename", &basename_only); } if (basename_only == false) { - bool home_tilde = false; if (statusbar) { girara_setting_get(zathura->ui.session, "statusbar-home-tilde", &home_tilde); @@ -565,11 +564,11 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar girara_setting_get(zathura->ui.session, "window-title-home-tilde", &home_tilde); } - size_t file_path_len = file_path ? strlen(file_path) : 0; + const size_t file_path_len = file_path ? strlen(file_path) : 0; - if (home_tilde) { - char *home = girara_get_home_directory(NULL); - size_t home_len = home ? strlen(home) : 0; + if (home_tilde == true) { + char* home = girara_get_home_directory(NULL); + const size_t home_len = home ? strlen(home) : 0; if (home_len > 1 && file_path_len >= home_len From fdd843e1167f29218f928594b31dfb9d9e336e61 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 20:48:34 +0200 Subject: [PATCH 31/94] Fix memory leak Signed-off-by: Sebastian Ramacher --- zathura/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/zathura/main.c b/zathura/main.c index 6f9bea0..7becac6 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -192,6 +192,7 @@ main(int argc, char* argv[]) char* string = zathura_get_version_string(zathura, false); if (string != NULL) { fprintf(stdout, "%s\n", string); + g_free(string); } zathura_free(zathura); From 08b341d4f87e740b49e43bb448dbef7935461168 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 21:11:39 +0200 Subject: [PATCH 32/94] Use correct type Signed-off-by: Sebastian Ramacher --- zathura/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zathura/main.c b/zathura/main.c index 7becac6..b9aecdd 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -151,7 +151,7 @@ main(int argc, char* argv[]) /* Fork into the background if the user really wants to ... */ if (forkback == true) { - const int pid = fork(); + const pid_t pid = fork(); if (pid > 0) { /* parent */ return 0; } else if (pid < 0) { /* error */ From 80582c9079af77cef005ef638457a856678c9c45 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 21:33:51 +0200 Subject: [PATCH 33/94] Check return value --- zathura/dbus-interface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/zathura/dbus-interface.c b/zathura/dbus-interface.c index cfc785e..7d1707a 100644 --- a/zathura/dbus-interface.c +++ b/zathura/dbus-interface.c @@ -441,6 +441,13 @@ handle_method_call(GDBusConnection* UNUSED(connection), } girara_list_t** all_rectangles = g_try_malloc0(number_of_pages * sizeof(girara_list_t*)); + if (all_rectangles == NULL) { + girara_list_free(rectangles); + GVariant* result = g_variant_new("(b)", false); + g_dbus_method_invocation_return_value(invocation, result); + return; + } + for (unsigned int p = 0; p != number_of_pages; ++p) { if (p == page) { all_rectangles[p] = rectangles; From 0ab1147543467cdb8ab93c53d468339a36694191 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 22:13:55 +0200 Subject: [PATCH 34/94] Factor out SyncTeX string parsing Signed-off-by: Sebastian Ramacher --- zathura/main.c | 24 ++++++++---------------- zathura/synctex.c | 29 +++++++++++++++++++++++++++++ zathura/synctex.h | 3 +++ 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/zathura/main.c b/zathura/main.c index b9aecdd..7bc0f6d 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -13,6 +13,7 @@ #include "zathura.h" #include "utils.h" #include "dbus-interface.h" +#include "synctex.h" /* main function */ int @@ -113,27 +114,18 @@ main(int argc, char* argv[]) return -1; } - char** split_fwd = g_strsplit(synctex_fwd, ":", 0); - if (split_fwd == NULL || split_fwd[0] == NULL || split_fwd[1] == NULL || - split_fwd[2] == NULL || split_fwd[3] != NULL) { + int line = 0; + int column = 0; + char* input_file = NULL; + if (synctex_parse_input(synctex_fwd, &input_file, &line, &column) == false) { girara_error("Failed to parse argument to --synctex-forward."); g_free(real_path); - g_strfreev(split_fwd); return -1; } - int line = MIN(INT_MAX, g_ascii_strtoll(split_fwd[0], NULL, 10)); - int column = MIN(INT_MAX, g_ascii_strtoll(split_fwd[1], NULL, 10)); - /* SyncTeX starts indexing at 1, but we use 0 */ - if (line > 0) { - --line; - } - if (column > 0) { - --column; - } - - const bool ret = zathura_dbus_synctex_position(real_path, split_fwd[2], line, column, synctex_pid); - g_strfreev(split_fwd); + const int ret = zathura_dbus_synctex_position(real_path, input_file, line, column, synctex_pid); + g_free(input_file); + g_free(real_path); if (ret == false) { girara_error("Could not find open instance for '%s' or got no usable data from synctex.", real_path); diff --git a/zathura/synctex.c b/zathura/synctex.c index 0486539..4ee059d 100644 --- a/zathura/synctex.c +++ b/zathura/synctex.c @@ -192,3 +192,32 @@ synctex_rectangles_from_position(const char* filename, const char* input_file, return hitlist; } +bool +synctex_parse_input(const char* synctex, char** input_file, int* line, + int* column) +{ + if (synctex == NULL || input_file == NULL || line == NULL || column == NULL) { + return false; + } + + char** split_fwd = g_strsplit(synctex, ":", 0); + if (split_fwd == NULL || split_fwd[0] == NULL || split_fwd[1] == NULL || + split_fwd[2] == NULL || split_fwd[3] != NULL) { + g_strfreev(split_fwd); + return false; + } + + *line = MIN(INT_MAX, g_ascii_strtoll(split_fwd[0], NULL, 10)); + *column = MIN(INT_MAX, g_ascii_strtoll(split_fwd[1], NULL, 10)); + /* SyncTeX starts indexing at 1, but we use 0 */ + if (*line > 0) { + --*line; + } + if (*column > 0) { + --*column; + } + *input_file = g_strdup(split_fwd[2]); + + g_strfreev(split_fwd); + return true; +} diff --git a/zathura/synctex.h b/zathura/synctex.h index 99d91ed..fdeaca1 100644 --- a/zathura/synctex.h +++ b/zathura/synctex.h @@ -15,6 +15,9 @@ bool synctex_get_input_line_column(const char* filename, unsigned int page, void synctex_edit(const char* editor, zathura_page_t* page, int x, int y); +bool synctex_parse_input(const char* synctex, char** input_file, int* line, + int* column); + girara_list_t* synctex_rectangles_from_position(const char* filename, const char* input_file, int line, int column, unsigned int* page, girara_list_t** secondary_rects); From 264aaed0bdb7198cf9df9b4d119987e6cbe47a03 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 22:43:10 +0200 Subject: [PATCH 35/94] Factor out highlight_rects Signed-off-by: Sebastian Ramacher --- zathura/dbus-interface.c | 117 +----------------------------------- zathura/synctex.c | 125 +++++++++++++++++++++++++++++++++++++++ zathura/synctex.h | 6 ++ 3 files changed, 134 insertions(+), 114 deletions(-) diff --git a/zathura/dbus-interface.c b/zathura/dbus-interface.c index 7d1707a..b5b838c 100644 --- a/zathura/dbus-interface.c +++ b/zathura/dbus-interface.c @@ -192,77 +192,6 @@ zathura_dbus_edit(ZathuraDbus* edit, unsigned int page, unsigned int x, unsigned /* D-Bus handler */ -static void -highlight_rects(zathura_t* zathura, unsigned int page, - girara_list_t** rectangles) -{ - const unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); - - for (unsigned int p = 0; p != number_of_pages; ++p) { - GObject* widget = G_OBJECT(zathura->pages[p]); - - g_object_set(widget, "draw-links", FALSE, "search-results", rectangles[p], - NULL); - if (p == page) { - g_object_set(widget, "search-current", 0, NULL); - } - } - - document_draw_search_results(zathura, true); - - girara_list_t* rect_list = rectangles[page]; - if (rect_list == NULL || girara_list_size(rect_list) == 0) { - girara_debug("No rectangles for the given page. Jumping to page %u.", page); - page_set(zathura, page); - return; - } - - bool search_hadjust = true; - girara_setting_get(zathura->ui.session, "search-hadjust", &search_hadjust); - - /* compute the position of the center of the page */ - double pos_x = 0; - double pos_y = 0; - page_number_to_position(zathura->document, page, 0.5, 0.5, &pos_x, &pos_y); - - /* correction to center the current result */ - /* NOTE: rectangle is in viewport units, already scaled and rotated */ - unsigned int cell_height = 0; - unsigned int cell_width = 0; - zathura_document_get_cell_size(zathura->document, &cell_height, &cell_width); - - unsigned int doc_height = 0; - unsigned int doc_width = 0; - zathura_document_get_document_size(zathura->document, &doc_height, &doc_width); - - /* Need to adjust rectangle to page scale and orientation */ - zathura_page_t* doc_page = zathura_document_get_page(zathura->document, page); - zathura_rectangle_t* rect = girara_list_nth(rect_list, 0); - if (rect == NULL) { - girara_debug("List of rectangles is broken. Jumping to page %u.", page); - page_set(zathura, page); - return; - } - - zathura_rectangle_t rectangle = recalc_rectangle(doc_page, *rect); - - /* compute the center of the rectangle, which will be aligned to the center - of the viewport */ - double center_x = (rectangle.x1 + rectangle.x2) / 2; - double center_y = (rectangle.y1 + rectangle.y2) / 2; - - pos_y += (center_y - (double)cell_height/2) / (double)doc_height; - if (search_hadjust == true) { - pos_x += (center_x - (double)cell_width/2) / (double)doc_width; - } - - /* move to position */ - girara_debug("Jumping to page %u position (%f, %f).", page, pos_x, pos_y); - zathura_jumplist_add(zathura); - position_set(zathura, pos_x, pos_y); - zathura_jumplist_add(zathura); -} - static void handle_method_call(GDBusConnection* UNUSED(connection), const gchar* UNUSED(sender), const gchar* object_path, @@ -416,7 +345,7 @@ handle_method_call(GDBusConnection* UNUSED(connection), } g_variant_iter_free(secondary_iter); - highlight_rects(priv->zathura, page, rectangles); + synctex_highlight_rects(priv->zathura, page, rectangles); g_free(rectangles); GVariant* result = g_variant_new("(b)", true); @@ -427,51 +356,11 @@ handle_method_call(GDBusConnection* UNUSED(connection), guint column = 0; g_variant_get(parameters, "(suu)", &input_file, &line, &column); - unsigned int page = 0; - girara_list_t* secondary_rects = NULL; - girara_list_t* rectangles = synctex_rectangles_from_position( - zathura_document_get_path(priv->zathura->document), input_file, line, - column, &page, &secondary_rects); + const bool ret = synctex_view(priv->zathura, input_file, line, column); g_free(input_file); - if (rectangles == NULL) { - GVariant* result = g_variant_new("(b)", false); - g_dbus_method_invocation_return_value(invocation, result); - return; - } - - girara_list_t** all_rectangles = g_try_malloc0(number_of_pages * sizeof(girara_list_t*)); - if (all_rectangles == NULL) { - girara_list_free(rectangles); - GVariant* result = g_variant_new("(b)", false); - g_dbus_method_invocation_return_value(invocation, result); - return; - } - - for (unsigned int p = 0; p != number_of_pages; ++p) { - if (p == page) { - all_rectangles[p] = rectangles; - } else { - all_rectangles[p] = girara_list_new2(g_free); - } - } - - if (secondary_rects != NULL) { - GIRARA_LIST_FOREACH(secondary_rects, synctex_page_rect_t*, iter, rect) - zathura_rectangle_t* newrect = g_try_malloc0(sizeof(zathura_rectangle_t)); - *newrect = rect->rect; - girara_list_append(all_rectangles[rect->page], newrect); - GIRARA_LIST_FOREACH_END(secondary_rects, synctex_page_rect_t*, iter, rect); - } - - highlight_rects(priv->zathura, page, all_rectangles); - - girara_list_free(secondary_rects); - g_free(all_rectangles); - - GVariant* result = g_variant_new("(b)", true); + GVariant* result = g_variant_new("(b)", ret); g_dbus_method_invocation_return_value(invocation, result); - } } diff --git a/zathura/synctex.c b/zathura/synctex.c index 4ee059d..cdb42fd 100644 --- a/zathura/synctex.c +++ b/zathura/synctex.c @@ -2,6 +2,7 @@ #include #include +#include #ifdef WITH_SYSTEM_SYNCTEX #include @@ -14,6 +15,7 @@ #include "page.h" #include "document.h" #include "utils.h" +#include "adjustment.h" bool synctex_get_input_line_column(const char* filename, unsigned int page, int x, int y, @@ -221,3 +223,126 @@ synctex_parse_input(const char* synctex, char** input_file, int* line, g_strfreev(split_fwd); return true; } + +void +synctex_highlight_rects(zathura_t* zathura, unsigned int page, + girara_list_t** rectangles) +{ + const unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); + + for (unsigned int p = 0; p != number_of_pages; ++p) { + GObject* widget = G_OBJECT(zathura->pages[p]); + + g_object_set(widget, "draw-links", FALSE, "search-results", rectangles[p], + NULL); + if (p == page) { + g_object_set(widget, "search-current", 0, NULL); + } + } + + document_draw_search_results(zathura, true); + + girara_list_t* rect_list = rectangles[page]; + if (rect_list == NULL || girara_list_size(rect_list) == 0) { + girara_debug("No rectangles for the given page. Jumping to page %u.", page); + page_set(zathura, page); + return; + } + + bool search_hadjust = true; + girara_setting_get(zathura->ui.session, "search-hadjust", &search_hadjust); + + /* compute the position of the center of the page */ + double pos_x = 0; + double pos_y = 0; + page_number_to_position(zathura->document, page, 0.5, 0.5, &pos_x, &pos_y); + + /* correction to center the current result */ + /* NOTE: rectangle is in viewport units, already scaled and rotated */ + unsigned int cell_height = 0; + unsigned int cell_width = 0; + zathura_document_get_cell_size(zathura->document, &cell_height, &cell_width); + + unsigned int doc_height = 0; + unsigned int doc_width = 0; + zathura_document_get_document_size(zathura->document, &doc_height, &doc_width); + + /* Need to adjust rectangle to page scale and orientation */ + zathura_page_t* doc_page = zathura_document_get_page(zathura->document, page); + zathura_rectangle_t* rect = girara_list_nth(rect_list, 0); + if (rect == NULL) { + girara_debug("List of rectangles is broken. Jumping to page %u.", page); + page_set(zathura, page); + return; + } + + zathura_rectangle_t rectangle = recalc_rectangle(doc_page, *rect); + + /* compute the center of the rectangle, which will be aligned to the center + of the viewport */ + double center_x = (rectangle.x1 + rectangle.x2) / 2; + double center_y = (rectangle.y1 + rectangle.y2) / 2; + + pos_y += (center_y - (double)cell_height/2) / (double)doc_height; + if (search_hadjust == true) { + pos_x += (center_x - (double)cell_width/2) / (double)doc_width; + } + + /* move to position */ + girara_debug("Jumping to page %u position (%f, %f).", page, pos_x, pos_y); + zathura_jumplist_add(zathura); + position_set(zathura, pos_x, pos_y); + zathura_jumplist_add(zathura); +} + +bool +synctex_view(zathura_t* zathura, const char* input_file, + unsigned int line, unsigned int column) +{ + if (zathura == NULL || input_file == NULL) { + return false; + } + + const unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); + + unsigned int page = 0; + girara_list_t* secondary_rects = NULL; + girara_list_t* rectangles = synctex_rectangles_from_position( + zathura_document_get_path(zathura->document), input_file, line, + column, &page, &secondary_rects); + + if (rectangles == NULL) { + return false; + } + + girara_list_t** all_rectangles = g_try_malloc0(number_of_pages * sizeof(girara_list_t*)); + if (all_rectangles == NULL) { + girara_list_free(rectangles); + return false; + } + + for (unsigned int p = 0; p != number_of_pages; ++p) { + if (p == page) { + all_rectangles[p] = rectangles; + } else { + all_rectangles[p] = girara_list_new2(g_free); + } + } + + if (secondary_rects != NULL) { + GIRARA_LIST_FOREACH(secondary_rects, synctex_page_rect_t*, iter, rect) + zathura_rectangle_t* newrect = g_try_malloc0(sizeof(zathura_rectangle_t)); + if (newrect != NULL) { + *newrect = rect->rect; + girara_list_append(all_rectangles[rect->page], newrect); + } + GIRARA_LIST_FOREACH_END(secondary_rects, synctex_page_rect_t*, iter, rect); + } + + synctex_highlight_rects(zathura, page, all_rectangles); + + girara_list_free(secondary_rects); + g_free(all_rectangles); + + return true; +} diff --git a/zathura/synctex.h b/zathura/synctex.h index fdeaca1..8c69d6d 100644 --- a/zathura/synctex.h +++ b/zathura/synctex.h @@ -22,4 +22,10 @@ girara_list_t* synctex_rectangles_from_position(const char* filename, const char* input_file, int line, int column, unsigned int* page, girara_list_t** secondary_rects); +void synctex_highlight_rects(zathura_t* zathura, unsigned int page, + girara_list_t** rectangles); + +bool synctex_view(zathura_t* zathura, const char* input_file, + unsigned int line, unsigned int column); + #endif From 1652c2aab38894fd06a4791446e9c3e37b1a4ebb Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 7 Oct 2015 22:46:47 +0200 Subject: [PATCH 36/94] Auto start instance if --synctex-forward is passed but no instance exists --- zathura/dbus-interface.c | 21 +++++++++------------ zathura/dbus-interface.h | 2 +- zathura/main.c | 14 +++++++++----- zathura/zathura.c | 39 ++++++++++++++++++++++++++++++++++++--- zathura/zathura.h | 16 +++++++++++++++- 5 files changed, 70 insertions(+), 22 deletions(-) diff --git a/zathura/dbus-interface.c b/zathura/dbus-interface.c index b5b838c..33e3b9c 100644 --- a/zathura/dbus-interface.c +++ b/zathura/dbus-interface.c @@ -445,13 +445,13 @@ call_synctex_view(GDBusConnection* connection, const char* filename, return true; } -static bool +static int iterate_instances_call_synctex_view(const char* filename, const char* input_file, unsigned int line, unsigned int column, pid_t hint) { if (filename == NULL) { - return false; + return -1; } GError* error = NULL; @@ -460,7 +460,7 @@ iterate_instances_call_synctex_view(const char* filename, if (connection == NULL) { girara_error("Could not connect to session bus: %s", error->message); g_error_free(error); - return false; + return -1; } if (hint != -1) { @@ -468,7 +468,7 @@ iterate_instances_call_synctex_view(const char* filename, const bool ret = call_synctex_view(connection, filename, well_known_name, input_file, line, column); g_free(well_known_name); - return ret; + return ret ? 1 : 0; } GVariant* vnames = g_dbus_connection_call_sync( @@ -479,7 +479,7 @@ iterate_instances_call_synctex_view(const char* filename, girara_error("Could not list available names: %s", error->message); g_error_free(error); g_object_unref(connection); - return false; + return -1; } GVariantIter* iter = NULL; @@ -487,25 +487,22 @@ iterate_instances_call_synctex_view(const char* filename, gchar* name = NULL; bool found_one = false; - while (g_variant_iter_loop(iter, "s", &name) == TRUE) { + while (found_one == false && g_variant_iter_loop(iter, "s", &name) == TRUE) { if (g_str_has_prefix(name, "org.pwmt.zathura.PID") == FALSE) { continue; } girara_debug("Found name: %s", name); - if (call_synctex_view(connection, filename, name, input_file, line, column) - == true) { - found_one = true; - } + found_one = call_synctex_view(connection, filename, name, input_file, line, column); } g_variant_iter_free(iter); g_variant_unref(vnames); g_object_unref(connection); - return found_one; + return found_one ? 1 : 0; } -bool +int zathura_dbus_synctex_position(const char* filename, const char* input_file, int line, int column, pid_t hint) { diff --git a/zathura/dbus-interface.h b/zathura/dbus-interface.h index 2a7c728..b2d240c 100644 --- a/zathura/dbus-interface.h +++ b/zathura/dbus-interface.h @@ -62,7 +62,7 @@ void zathura_dbus_edit(ZathuraDbus* dbus, unsigned int page, unsigned int x, uns * @param column column index (starts at 0) * @param hint zathura process ID that has filename open */ -bool zathura_dbus_synctex_position(const char* filename, const char* input_file, +int zathura_dbus_synctex_position(const char* filename, const char* input_file, int line, int column, pid_t hint); #endif diff --git a/zathura/main.c b/zathura/main.c index 7bc0f6d..68bc3ca 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -127,12 +127,16 @@ main(int argc, char* argv[]) g_free(input_file); g_free(real_path); - if (ret == false) { - girara_error("Could not find open instance for '%s' or got no usable data from synctex.", real_path); + if (ret == -1) { + /* D-Bus or SyncTeX failed */ + girara_error("Got no usable data from SyncTeX or D-Bus failed in some way."); + return -1; + } else if (ret == 1) { + /* Found a instance */ + return 0; } - g_free(real_path); - return ret == true ? 0 : -1; + girara_debug("No instance found. Starting new one."); } /* check mode */ @@ -195,7 +199,7 @@ main(int argc, char* argv[]) if (argc > 1) { if (page_number > 0) --page_number; - document_open_idle(zathura, argv[1], password, page_number, mode); + document_open_idle(zathura, argv[1], password, page_number, mode, synctex_fwd); /* open additional files */ for (int i = 2; i < argc; i++) { diff --git a/zathura/zathura.c b/zathura/zathura.c index dff88d0..f2edbb4 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -41,6 +41,7 @@ #include "adjustment.h" #include "dbus-interface.h" #include "css-definitions.h" +#include "synctex.h" typedef struct zathura_document_info_s { zathura_t* zathura; @@ -48,6 +49,7 @@ typedef struct zathura_document_info_s { const char* password; int page_number; const char* mode; + const char* synctex; } zathura_document_info_t; @@ -524,8 +526,13 @@ document_info_open(gpointer data) } if (file != NULL) { - document_open(document_info->zathura, file, document_info->password, - document_info->page_number); + if (document_info->synctex != NULL) { + document_open_synctex(document_info->zathura, file, + document_info->password, document_info->synctex); + } else { + document_open(document_info->zathura, file, document_info->password, + document_info->page_number); + } g_free(file); if (document_info->mode != NULL) { @@ -929,9 +936,34 @@ error_out: return false; } +bool +document_open_synctex(zathura_t* zathura, const char* path, + const char* password, const char* synctex) +{ + bool ret = document_open(zathura, path, password, + ZATHURA_PAGE_NUMBER_UNSPECIFIED); + if (ret == false) { + return false; + } + if (synctex == NULL) { + return true; + } + + int line = 0; + int column = 0; + char* input_file = NULL; + if (synctex_parse_input(synctex, &input_file, &line, &column) == false) { + return false; + } + + ret = synctex_view(zathura, input_file, line, column); + g_free(input_file); + return ret; +} + void document_open_idle(zathura_t* zathura, const char* path, const char* password, - int page_number, const char* mode) + int page_number, const char* mode, const char* synctex) { if (zathura == NULL || path == NULL) { return; @@ -947,6 +979,7 @@ document_open_idle(zathura_t* zathura, const char* path, const char* password, document_info->password = password; document_info->page_number = page_number; document_info->mode = mode; + document_info->synctex = synctex; gdk_threads_add_idle(document_info_open, document_info); } diff --git a/zathura/zathura.h b/zathura/zathura.h index d4b71af..3806ce9 100644 --- a/zathura/zathura.h +++ b/zathura/zathura.h @@ -291,6 +291,19 @@ void zathura_set_argv(zathura_t* zathura, char** argv); bool document_open(zathura_t* zathura, const char* path, const char* password, int page_number); +/** + * Opens a file + * + * @param zathura The zathura session + * @param path The path to the file + * @param password The password of the file + * @param synctex Open at the given SyncTeX string + * + * @return If no error occured true, otherwise false, is returned. + */ +bool document_open_synctex(zathura_t* zathura, const char* path, + const char* password, const char* synctex); + /** * Opens a file (idle) * @@ -299,10 +312,11 @@ bool document_open(zathura_t* zathura, const char* path, const char* password, * @param password The password of the file * @param page_number Open given page number * @param mode Open in given page mode + * @param synctex SyncTeX string */ void document_open_idle(zathura_t* zathura, const char* path, const char* password, int page_number, - const char* mode); + const char* mode, const char* synctex); /** * Save a open file From 66b9870d76c85abfc4e72ffeb70ac87c34be1c80 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 8 Oct 2015 00:05:16 +0200 Subject: [PATCH 37/94] Pass arguments to spawned processes (fixes #504) Signed-off-by: Sebastian Ramacher --- zathura/main.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/zathura/main.c b/zathura/main.c index 68bc3ca..a8b4ed3 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -200,17 +200,70 @@ main(int argc, char* argv[]) if (page_number > 0) --page_number; document_open_idle(zathura, argv[1], password, page_number, mode, synctex_fwd); + } + if (argc > 2) { + char* new_argv[2 * sizeof(entries) / sizeof(GOptionEntry) + 3] = { + NULL + }; + + size_t idx = 0; + new_argv[idx++] = g_strdup(zathura->global.arguments[0]); + + /* pass arguments to new process */ + if (config_dir != NULL) { + new_argv[idx++] = g_strdup("--config-dir"); + new_argv[idx++] = g_strdup(config_dir); + } + if (data_dir != NULL) { + new_argv[idx++] = g_strdup("--data-dir"); + new_argv[idx++] = g_strdup(data_dir); + } + if (cache_dir != NULL) { + new_argv[idx++] = g_strdup("--cache-dir"); + new_argv[idx++] = g_strdup(cache_dir); + } + if (plugin_path != NULL) { + new_argv[idx++] = g_strdup("--plugins-dir"); + new_argv[idx++] = g_strdup(plugin_path); + } + /* no need to pass fork */ + if (password != NULL) { + new_argv[idx++] = g_strdup("--password"); + new_argv[idx++] = g_strdup(password); + } + if (page_number != ZATHURA_PAGE_NUMBER_UNSPECIFIED) { + new_argv[idx++] = g_strdup("--page"); + new_argv[idx++] = g_strdup_printf("%d", page_number); + } + if (loglevel != NULL) { + new_argv[idx++] = g_strdup("--debug"); + new_argv[idx++] = g_strdup(loglevel); + } + if (synctex_editor != NULL) { + new_argv[idx++] = g_strdup("--synctex-editor-command"); + new_argv[idx++] = g_strdup(synctex_editor); + } + if (synctex_fwd != NULL) { + new_argv[idx++] = g_strdup("--synctex-forward"); + new_argv[idx++] = g_strdup(synctex_fwd); + } + /* no need to pass synctex-pid */ + if (mode != NULL) { + new_argv[idx++] = g_strdup("--mode"); + new_argv[idx++] = g_strdup(mode); + } /* open additional files */ for (int i = 2; i < argc; i++) { - char* new_argv[] = { - *(zathura->global.arguments), - argv[i], - NULL - }; + g_free(new_argv[idx]); + new_argv[idx] = g_strdup(argv[i]); g_spawn_async(NULL, new_argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); } + + for (size_t s = 0; s <= idx; ++s) { + g_free(new_argv[s]); + } } /* run zathura */ From 5c60ce41567750eebd6136b0a121b4c2e9c82a06 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 8 Oct 2015 21:26:22 +0200 Subject: [PATCH 38/94] Get rid of embedded copy of libsynctex TeXLive 2015 including libsynctex is out long enough. Signed-off-by: Sebastian Ramacher --- Makefile | 18 +- config.mk | 7 +- tests/Makefile | 15 +- zathura/main.c | 18 + zathura/synctex.c | 31 +- zathura/synctex/LICENSE | 27 - zathura/synctex/Makefile | 7 - zathura/synctex/synctex_parser.c | 4419 -------------------- zathura/synctex/synctex_parser.h | 360 -- zathura/synctex/synctex_parser_utils.c | 502 --- zathura/synctex/synctex_parser_utils.h | 152 - zathura/synctex/synctex_parser_version.txt | 1 - 12 files changed, 54 insertions(+), 5503 deletions(-) delete mode 100644 zathura/synctex/LICENSE delete mode 100644 zathura/synctex/Makefile delete mode 100644 zathura/synctex/synctex_parser.c delete mode 100644 zathura/synctex/synctex_parser.h delete mode 100644 zathura/synctex/synctex_parser_utils.c delete mode 100644 zathura/synctex/synctex_parser_utils.h delete mode 100644 zathura/synctex/synctex_parser_version.txt diff --git a/Makefile b/Makefile index 19c5a39..203d0fb 100644 --- a/Makefile +++ b/Makefile @@ -21,20 +21,10 @@ LIBS += $(MAGIC_LIB) CPPFLAGS += -DWITH_MAGIC endif -ifneq ($(WITH_SYSTEM_SYNCTEX),0) -INCS += $(SYNCTEX_INC) -LIBS += $(SYNCTEX_LIB) -else -INCS += $(ZLIB_INC) -LIBS += $(ZLIB_LIB) -SOURCE += $(wildcard ${PROJECT}/synctex/*.c) - -ifeq (,$(findstring -Isynctex,${CPPFLAGS})) -CPPFLAGS += -I${PROJECT}/synctex -endif -ifeq (,$(findstring -DSYNCTEX_VERBOSE=0,${CPPFLAGS})) -CPPFLAGS += -DSYNCTEX_VERBOSE=0 -endif +ifneq ($(WITH_SYNCTEX),0) +INCS += $(SYNCTEX_INC) +LIBS += $(SYNCTEX_LIB) +CPPFLAGS += -DWITH_SYNCTEX endif ifneq ($(wildcard ${VALGRIND_SUPPRESSION_FILE}),) diff --git a/config.mk b/config.mk index 1da1e58..620c25c 100644 --- a/config.mk +++ b/config.mk @@ -38,7 +38,7 @@ WITH_SQLITE ?= $(shell (${PKG_CONFIG} --atleast-version=3.5.9 sqlite3 && echo 1) # synctex # To use the embedded copy of the syntex parser set WITH_SYSTEM_SYNCTEX to 0. -WITH_SYSTEM_SYNCTEX ?= $(shell (${PKG_CONFIG} synctex && echo 1) || echo 0) +WITH_SYNCTEX ?= $(shell (${PKG_CONFIG} synctex && echo 1) || echo 0) # mimetype detection # To disable support for mimetype detction with libmagic set WITH_MAGIC to 0. @@ -91,12 +91,9 @@ MAGIC_INC ?= MAGIC_LIB ?= -lmagic endif -ifneq ($(WITH_SYSTEM_SYNCTEX),0) +ifneq ($(WITH_SYNCTEX),0) SYNCTEX_INC ?= $(shell ${PKG_CONFIG} --cflags synctex) SYNCTEX_LIB ?= $(shell ${PKG_CONFIG} --libs synctex) -else -ZLIB_INC ?= $(shell ${PKG_CONFIG} --cflags zlib) -ZLIB_LIB ?= $(shell ${PKG_CONFIG} --libs zlib) endif INCS = ${GIRARA_INC} ${GTK_INC} ${GTHREAD_INC} ${GMODULE_INC} ${GLIB_INC} diff --git a/tests/Makefile b/tests/Makefile index 8ec87fb..a1e7e4b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -33,21 +33,10 @@ LIBS += $(MAGIC_LIB) CPPFLAGS += -DWITH_MAGIC endif -ifneq ($(WITH_SYSTEM_SYNCTEX),0) +ifneq ($(WITH_SYNCTEX),0) INCS += $(SYNCTEX_INC) LIBS += $(SYNCTEX_LIB) -else -ZATHURA_OBJECTS += $(wildcard ../${BUILDDIR_RELEASE}/zathura/synctex/*.o) -ZATHURA_OBJECTS_DEBUG += $(wildcard ../${BUILDDIR_DEBUG}/zathura/synctex/*.o) -ZATHURA_OBJECTS_GCOV += $(wildcard ../${BUILDDIR_GCOV}/zathura/synctex/*.o) -LIBS += $(ZLIB_LIB) - -ifeq (,$(findstring -Isynctex,${CPPFLAGS})) -CPPFLAGS += -I../zathura/synctex -endif -ifeq (,$(findstring -DSYNCTEX_VERBOSE=0,${CPPFLAGS})) -CPPFLAGS += -DSYNCTEX_VERBOSE=0 -endif +CPPFLAGS += -DWITH_SYNCTEX endif ifneq ($(wildcard ${VALGRIND_SUPPRESSION_FILE}),) diff --git a/zathura/main.c b/zathura/main.c index a8b4ed3..c94f535 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -13,7 +13,9 @@ #include "zathura.h" #include "utils.h" #include "dbus-interface.h" +#ifdef WITH_SYNCTEX #include "synctex.h" +#endif /* main function */ int @@ -41,13 +43,17 @@ main(int argc, char* argv[]) gchar* plugin_path = NULL; gchar* loglevel = NULL; gchar* password = NULL; +#ifdef WITH_SYNCTEX gchar* synctex_editor = NULL; gchar* synctex_fwd = NULL; +#endif gchar* mode = NULL; bool forkback = false; bool print_version = false; int page_number = ZATHURA_PAGE_NUMBER_UNSPECIFIED; +#ifdef WITH_SYNCTEX int synctex_pid = -1; +#endif #ifdef GDK_WINDOWING_X11 Window embed = 0; #endif @@ -65,9 +71,11 @@ main(int argc, char* argv[]) { "page", 'P', 0, G_OPTION_ARG_INT, &page_number, _("Page number to go to"), "number" }, { "debug", 'l', 0, G_OPTION_ARG_STRING, &loglevel, _("Log level (debug, info, warning, error)"), "level" }, { "version", 'v', 0, G_OPTION_ARG_NONE, &print_version, _("Print version information"), NULL }, +#ifdef WITH_SYNCTEX { "synctex-editor-command", 'x', 0, G_OPTION_ARG_STRING, &synctex_editor, _("Synctex editor (forwarded to the synctex command)"), "cmd" }, { "synctex-forward", '\0', 0, G_OPTION_ARG_STRING, &synctex_fwd, _("Move to given synctex position"), "position" }, { "synctex-pid", '\0', 0, G_OPTION_ARG_INT, &synctex_pid, _("Highlight given position in the given process"), "pid" }, +#endif { "mode", '\0', 0, G_OPTION_ARG_STRING, &mode, _("Start in a non-default mode"), "mode" }, { NULL, '\0', 0, 0, NULL, NULL, NULL } }; @@ -94,6 +102,7 @@ main(int argc, char* argv[]) girara_set_debug_level(GIRARA_ERROR); } +#ifdef WITH_SYNCTEX /* handle synctex forward synchronization */ if (synctex_fwd != NULL) { if (argc != 2) { @@ -138,6 +147,7 @@ main(int argc, char* argv[]) girara_debug("No instance found. Starting new one."); } +#endif /* check mode */ if (mode != NULL && g_strcmp0(mode, "presentation") != 0 && g_strcmp0(mode, "fullscreen") != 0) { @@ -179,9 +189,11 @@ main(int argc, char* argv[]) return -1; } +#ifdef WITH_SYNCTEX if (synctex_editor != NULL) { girara_setting_set(zathura->ui.session, "synctex-editor-command", synctex_editor); } +#endif /* Print version */ if (print_version == true) { @@ -199,7 +211,11 @@ main(int argc, char* argv[]) if (argc > 1) { if (page_number > 0) --page_number; +#ifdef WITH_SYNCTEX document_open_idle(zathura, argv[1], password, page_number, mode, synctex_fwd); +#else + document_open_idle(zathura, argv[1], password, page_number, mode, NULL); +#endif } if (argc > 2) { char* new_argv[2 * sizeof(entries) / sizeof(GOptionEntry) + 3] = { @@ -239,6 +255,7 @@ main(int argc, char* argv[]) new_argv[idx++] = g_strdup("--debug"); new_argv[idx++] = g_strdup(loglevel); } +#ifdef WITH_SYNCTEX if (synctex_editor != NULL) { new_argv[idx++] = g_strdup("--synctex-editor-command"); new_argv[idx++] = g_strdup(synctex_editor); @@ -247,6 +264,7 @@ main(int argc, char* argv[]) new_argv[idx++] = g_strdup("--synctex-forward"); new_argv[idx++] = g_strdup(synctex_fwd); } +#endif /* no need to pass synctex-pid */ if (mode != NULL) { new_argv[idx++] = g_strdup("--mode"); diff --git a/zathura/synctex.c b/zathura/synctex.c index cdb42fd..87ae15f 100644 --- a/zathura/synctex.c +++ b/zathura/synctex.c @@ -4,10 +4,8 @@ #include #include -#ifdef WITH_SYSTEM_SYNCTEX +#ifdef WITH_SYNCTEX #include -#else -#include "synctex/synctex_parser.h" #endif #include "synctex.h" @@ -17,6 +15,7 @@ #include "utils.h" #include "adjustment.h" +#ifdef WITH_SYNCTEX bool synctex_get_input_line_column(const char* filename, unsigned int page, int x, int y, char** input_file, unsigned int* line, unsigned int* column) @@ -193,6 +192,32 @@ synctex_rectangles_from_position(const char* filename, const char* input_file, return hitlist; } +#else +bool +synctex_get_input_line_column(const char* UNUSED(filename), + unsigned int UNUSED(page), int UNUSED(x), + int UNUSED(y), char** UNUSED(input_file), + unsigned int* UNUSED(line), + unsigned int* UNUSED(column)) +{ + return false; +} + +void +synctex_edit(const char* UNUSED(editor), zathura_page_t* UNUSED(page), + int UNUSED(x), int UNUSED(y)) +{} + +girara_list_t* +synctex_rectangles_from_position(const char* UNUSED(filename), + const char* UNUSED(input_file), + int UNUSED(line), int UNUSED(column), + unsigned int* UNUSED(page), + girara_list_t** UNUSED(secondary_rects)) +{ + return NULL; +} +#endif bool synctex_parse_input(const char* synctex, char** input_file, int* line, diff --git a/zathura/synctex/LICENSE b/zathura/synctex/LICENSE deleted file mode 100644 index c739c44..0000000 --- a/zathura/synctex/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2008, 2009, 2010, 2011 jerome DOT laurens AT u-bourgogne DOT fr - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE - -Except as contained in this notice, the name of the copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in this Software without prior written -authorization from the copyright holder. diff --git a/zathura/synctex/Makefile b/zathura/synctex/Makefile deleted file mode 100644 index a26a879..0000000 --- a/zathura/synctex/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -FILES=synctex_parser.c synctex_parser.h synctex_parser_utils.c synctex_parser_utils.h synctex_parser_version.txt - -.PHONY: update -update: - set -e; for FILE in $(FILES) ; do \ - wget -O "$$FILE" "http://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/synctexdir/$$FILE?view=co" ; \ - done diff --git a/zathura/synctex/synctex_parser.c b/zathura/synctex/synctex_parser.c deleted file mode 100644 index 3175495..0000000 --- a/zathura/synctex/synctex_parser.c +++ /dev/null @@ -1,4419 +0,0 @@ -/* -Copyright (c) 2008, 2009, 2010 , 2011 jerome DOT laurens AT u-bourgogne DOT fr - -This file is part of the SyncTeX package. - -Latest Revision: Tue Jun 14 08:23:30 UTC 2011 - -Version: 1.17 - -See synctex_parser_readme.txt for more details - -License: --------- -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE - -Except as contained in this notice, the name of the copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in this Software without prior written -authorization from the copyright holder. - -Acknowledgments: ----------------- -The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh, -and significant help from XeTeX developer Jonathan Kew - -Nota Bene: ----------- -If you include or use a significant part of the synctex package into a software, -I would appreciate to be listed as contributor and see "SyncTeX" highlighted. - -Version 1 -Thu Jun 19 09:39:21 UTC 2008 - -*/ - -/* We assume that high level application like pdf viewers will want - * to embed this code as is. We assume that they also have locale.h and setlocale. - * For other tools such as TeXLive tools, you must define SYNCTEX_USE_LOCAL_HEADER, - * when building. You also have to create and customize synctex_parser_local.h to fit your system. - * In particular, the HAVE_LOCALE_H and HAVE_SETLOCALE macros should be properly defined. - * With this design, you should not need to edit this file. */ - -# if defined(SYNCTEX_USE_LOCAL_HEADER) -# include "synctex_parser_local.h" -# else -# define HAVE_LOCALE_H 1 -# define HAVE_SETLOCALE 1 -# if defined(_MSC_VER) -# define SYNCTEX_INLINE __inline -# else -# define SYNCTEX_INLINE inline -# endif -# endif - -#include -#include -#include -#include -#include - -#if defined(HAVE_LOCALE_H) -#include -#endif - -/* The data is organized in a graph with multiple entries. - * The root object is a scanner, it is created with the contents on a synctex file. - * Each leaf of the tree is a synctex_node_t object. - * There are 3 subtrees, two of them sharing the same leaves. - * The first tree is the list of input records, where input file names are associated with tags. - * The second tree is the box tree as given by TeX when shipping pages out. - * First level objects are sheets, containing boxes, glues, kerns... - * The third tree allows to browse leaves according to tag and line. - */ - -#include "synctex_parser.h" -#include "synctex_parser_utils.h" - -/* These are the possible extensions of the synctex file */ -const char * synctex_suffix = ".synctex"; -const char * synctex_suffix_gz = ".gz"; - -/* each synctex node has a class */ -typedef struct __synctex_class_t _synctex_class_t; -typedef _synctex_class_t * synctex_class_t; - - -/* synctex_node_t is a pointer to a node - * _synctex_node is the target of the synctex_node_t pointer - * It is a pseudo object oriented program. - * class is a pointer to the class object the node belongs to. - * implementation is meant to contain the private data of the node - * basically, there are 2 kinds of information: navigation information and - * synctex information. Both will depend on the type of the node, - * thus different nodes will have different private data. - * There is no inheritancy overhead. - */ -typedef union _synctex_info_t { - int INT; - char * PTR; -} synctex_info_t; - -# if defined(SYNCTEX_USE_CHARINDEX) -# define SYNCTEX_DECLARE_CHARINDEX synctex_charindex_t char_index; -# define SYNCTEX_CHARINDEX(NODE) (NODE->char_index) -# define SYNCTEX_PRINT_CHARINDEX printf("#%i\n",SYNCTEX_CHARINDEX(node)) -# define SYNCTEX_DECLARE_CHAR_OFFSET synctex_charindex_t charindex_offset -# define SYNCTEX_IMPLEMENT_CHARINDEX(NODE,CORRECTION) NODE->char_index = (synctex_charindex_t)(scanner->charindex_offset+SYNCTEX_CUR-SYNCTEX_START+(CORRECTION)); -# else -# define SYNCTEX_DECLARE_CHARINDEX -# define SYNCTEX_CHARINDEX(NODE) 0 -# define SYNCTEX_PRINT_CHARINDEX printf("\n") -# define SYNCTEX_DECLARE_CHAR_OFFSET synctex_charindex_t charindex_offset -# define SYNCTEX_IMPLEMENT_CHARINDEX(NODE,CORRECTION) -# endif - -struct _synctex_node { - SYNCTEX_DECLARE_CHARINDEX - synctex_class_t class; - synctex_info_t * implementation; -}; - -/* Each node of the tree, except the scanner itself belongs to a class. - * The class object is just a struct declaring the owning scanner - * This is a pointer to the scanner as root of the tree. - * The type is used to identify the kind of node. - * The class declares pointers to a creator and a destructor method. - * The log and display fields are used to log and display the node. - * display will also display the child, sibling and parent sibling. - * parent, child and sibling are used to navigate the tree, - * from TeX box hierarchy point of view. - * The friend field points to a method which allows to navigate from friend to friend. - * A friend is a node with very close tag and line numbers. - * Finally, the info field point to a method giving the private node info offset. - */ - -typedef synctex_node_t *(*_synctex_node_getter_t)(synctex_node_t); -typedef synctex_info_t *(*_synctex_info_getter_t)(synctex_node_t); - -struct __synctex_class_t { - synctex_scanner_t scanner; - int type; - synctex_node_t (*new)(synctex_scanner_t scanner); - void (*free)(synctex_node_t); - void (*log)(synctex_node_t); - void (*display)(synctex_node_t); - _synctex_node_getter_t parent; - _synctex_node_getter_t child; - _synctex_node_getter_t sibling; - _synctex_node_getter_t friend; - _synctex_node_getter_t next_hbox; - _synctex_info_getter_t info; -}; - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Abstract OBJECTS and METHODS -# endif - -/* These macros are shortcuts - * This macro checks if a message can be sent. - */ -# define SYNCTEX_CAN_PERFORM(NODE,SELECTOR)\ - (NULL!=((((NODE)->class))->SELECTOR)) - -/* This macro is some kind of objc_msg_send. - * It takes care of sending the proper message if possible. - */ -# define SYNCTEX_MSG_SEND(NODE,SELECTOR) if (NODE && SYNCTEX_CAN_PERFORM(NODE,SELECTOR)) {\ - (*((((NODE)->class))->SELECTOR))(NODE);\ - } - -/* read only safe getter - */ -# define SYNCTEX_GET(NODE,SELECTOR)((NODE && SYNCTEX_CAN_PERFORM(NODE,SELECTOR))?SYNCTEX_GETTER(NODE,SELECTOR)[0]:(NULL)) - -/* read/write getter - */ -# define SYNCTEX_GETTER(NODE,SELECTOR)\ - ((synctex_node_t *)((*((((NODE)->class))->SELECTOR))(NODE))) - -# define SYNCTEX_FREE(NODE) SYNCTEX_MSG_SEND(NODE,free); - -/* Parent getter and setter - */ -# define SYNCTEX_PARENT(NODE) SYNCTEX_GET(NODE,parent) -# define SYNCTEX_SET_PARENT(NODE,NEW_PARENT) if (NODE && NEW_PARENT && SYNCTEX_CAN_PERFORM(NODE,parent)){\ - SYNCTEX_GETTER(NODE,parent)[0]=NEW_PARENT;\ - } - -/* Child getter and setter - */ -# define SYNCTEX_CHILD(NODE) SYNCTEX_GET(NODE,child) -# define SYNCTEX_SET_CHILD(NODE,NEW_CHILD) if (NODE && NEW_CHILD){\ - SYNCTEX_GETTER(NODE,child)[0]=NEW_CHILD;\ - SYNCTEX_GETTER(NEW_CHILD,parent)[0]=NODE;\ - } - -/* Sibling getter and setter - */ -# define SYNCTEX_SIBLING(NODE) SYNCTEX_GET(NODE,sibling) -# define SYNCTEX_SET_SIBLING(NODE,NEW_SIBLING) if (NODE && NEW_SIBLING) {\ - SYNCTEX_GETTER(NODE,sibling)[0]=NEW_SIBLING;\ - if (SYNCTEX_CAN_PERFORM(NEW_SIBLING,parent) && SYNCTEX_CAN_PERFORM(NODE,parent)) {\ - SYNCTEX_GETTER(NEW_SIBLING,parent)[0]=SYNCTEX_GETTER(NODE,parent)[0];\ - }\ - } -/* Friend getter and setter. A friend is a kern, math, glue or void box node which tag and line numbers are similar. - * This is a first filter on the nodes that avoids testing all of them. - * Friends are used mainly in forward synchronization aka from source to output. - */ -# define SYNCTEX_FRIEND(NODE) SYNCTEX_GET(NODE,friend) -# define SYNCTEX_SET_FRIEND(NODE,NEW_FRIEND) if (NODE && NEW_FRIEND){\ - SYNCTEX_GETTER(NODE,friend)[0]=NEW_FRIEND;\ - } - -/* Next box getter and setter. The box tree can be traversed from one horizontal box to the other. - * Navigation starts with the deeper boxes. - */ -# define SYNCTEX_NEXT_hbox(NODE) SYNCTEX_GET(NODE,next_hbox) -# define SYNCTEX_SET_NEXT_hbox(NODE,NEXT_HBOX) if (NODE && NEXT_HBOX){\ - SYNCTEX_GETTER(NODE,next_hbox)[0]=NEXT_HBOX;\ - } - -/* A node is meant to own its child and sibling. - * It is not owned by its parent, unless it is its first child. - * This destructor is for all nodes with children. - */ -static void _synctex_free_node(synctex_node_t node) { - if (node) { - (*((node->class)->sibling))(node); - SYNCTEX_FREE(SYNCTEX_SIBLING(node)); - SYNCTEX_FREE(SYNCTEX_CHILD(node)); - free(node); - } - return; -} - -/* A node is meant to own its child and sibling. - * It is not owned by its parent, unless it is its first child. - * This destructor is for nodes with no child. - * The first sheet is onwned by the scanner. - */ -static void _synctex_free_leaf(synctex_node_t node) { - if (node) { - SYNCTEX_FREE(SYNCTEX_SIBLING(node)); - free(node); - } - return; -} -# ifdef __SYNCTEX_WORK__ -# include "/usr/include/zlib.h" -# else -# include -# endif - -/* The synctex scanner is the root object. - * Is is initialized with the contents of a text file or a gzipped file. - * The buffer_? are first used to parse the text. - */ -struct __synctex_scanner_t { - gzFile file; /* The (possibly compressed) file */ - SYNCTEX_DECLARE_CHAR_OFFSET; - char * buffer_cur; /* current location in the buffer */ - char * buffer_start; /* start of the buffer */ - char * buffer_end; /* end of the buffer */ - char * output_fmt; /* dvi or pdf, not yet used */ - char * output; /* the output name used to create the scanner */ - char * synctex; /* the .synctex or .synctex.gz name used to create the scanner */ - int version; /* 1, not yet used */ - struct { - unsigned has_parsed:1; /* Whether the scanner has parsed its underlying synctex file. */ - unsigned reserved:sizeof(unsigned)-1; /* alignment */ - } flags; - int pre_magnification; /* magnification from the synctex preamble */ - int pre_unit; /* unit from the synctex preamble */ - int pre_x_offset; /* X offste from the synctex preamble */ - int pre_y_offset; /* Y offset from the synctex preamble */ - int count; /* Number of records, from the synctex postamble */ - float unit; /* real unit, from synctex preamble or post scriptum */ - float x_offset; /* X offset, from synctex preamble or post scriptum */ - float y_offset; /* Y Offset, from synctex preamble or post scriptum */ - synctex_node_t sheet; /* The first sheet node, its siblings are the other sheet nodes */ - synctex_node_t input; /* The first input node, its siblings are the other input nodes */ - int number_of_lists; /* The number of friend lists */ - synctex_node_t * lists_of_friends;/* The friend lists */ - _synctex_class_t class[synctex_node_number_of_types]; /* The classes of the nodes of the scanner */ -}; - -/* SYNCTEX_CUR, SYNCTEX_START and SYNCTEX_END are convenient shortcuts - */ -# define SYNCTEX_CUR (scanner->buffer_cur) -# define SYNCTEX_START (scanner->buffer_start) -# define SYNCTEX_END (scanner->buffer_end) - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark OBJECTS, their creators and destructors. -# endif - -/* Here, we define the indices for the different informations. - * They are used to declare the size of the implementation. - * For example, if one object uses SYNCTEX_HORIZ_IDX is its size, - * then its info will contain a tag, line, column, horiz but no width nor height nor depth - */ - -/* The sheet is a first level node. - * It has no parent (the parent is the scanner itself) - * Its sibling points to another sheet. - * Its child points to its first child, in general a box. - * A sheet node contains only one synctex information: the page. - * This is the 1 based page index as given by TeX. - */ -/* The next macros are used to access the node info - * SYNCTEX_INFO(node) points to the first synctex integer or pointer data of node - * SYNCTEX_INFO(node)[index] is the information at index - * for example, the page of a sheet is stored in SYNCTEX_INFO(sheet)[SYNCTEX_PAGE_IDX] - */ -# define SYNCTEX_INFO(NODE) ((*((((NODE)->class))->info))(NODE)) -# define SYNCTEX_PAGE_IDX 0 -# define SYNCTEX_PAGE(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_PAGE_IDX].INT - -/* This macro defines implementation offsets - * It is only used for pointer values - */ -# define SYNCTEX_MAKE_GET(SYNCTEX_GETTER,OFFSET)\ -static synctex_node_t * SYNCTEX_GETTER (synctex_node_t node) {\ - return node?(synctex_node_t *)((&((node)->implementation))+OFFSET):NULL;\ -} -SYNCTEX_MAKE_GET(_synctex_implementation_0,0) -SYNCTEX_MAKE_GET(_synctex_implementation_1,1) -SYNCTEX_MAKE_GET(_synctex_implementation_2,2) -SYNCTEX_MAKE_GET(_synctex_implementation_3,3) -SYNCTEX_MAKE_GET(_synctex_implementation_4,4) -SYNCTEX_MAKE_GET(_synctex_implementation_5,5) - -typedef struct { - SYNCTEX_DECLARE_CHARINDEX - synctex_class_t class; - synctex_info_t implementation[3+SYNCTEX_PAGE_IDX+1];/* child, sibling, next box, - * SYNCTEX_PAGE_IDX */ -} synctex_node_sheet_t; - -/* sheet node creator */ - -#define DEFINE_synctex_new_NODE(NAME)\ -static synctex_node_t _synctex_new_##NAME(synctex_scanner_t scanner) {\ - if (scanner) {\ - synctex_node_t node = _synctex_malloc(sizeof(synctex_node_##NAME##_t));\ - if (node) {\ - SYNCTEX_IMPLEMENT_CHARINDEX(node,0);\ - ++SYNCTEX_CUR;\ - node->class = scanner->class+synctex_node_type_##NAME;\ - }\ - return node;\ - }\ - return NULL;\ -} -DEFINE_synctex_new_NODE(sheet) - -static void _synctex_display_sheet(synctex_node_t node); -static void _synctex_log_sheet(synctex_node_t node); - -static _synctex_class_t synctex_class_sheet = { - NULL, /* No scanner yet */ - synctex_node_type_sheet, /* Node type */ - &_synctex_new_sheet, /* creator */ - &_synctex_free_node, /* destructor */ - &_synctex_log_sheet, /* log */ - &_synctex_display_sheet, /* display */ - NULL, /* No parent */ - &_synctex_implementation_0, /* child */ - &_synctex_implementation_1, /* sibling */ - NULL, /* No friend */ - &_synctex_implementation_2, /* Next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_3 /* info */ -}; - -/* A box node contains navigation and synctex information - * There are different kind of boxes. - * Only horizontal boxes are treated differently because of their visible size. - */ -# define SYNCTEX_TAG_IDX 0 -# define SYNCTEX_LINE_IDX (SYNCTEX_TAG_IDX+1) -# define SYNCTEX_COLUMN_IDX (SYNCTEX_LINE_IDX+1) -# define SYNCTEX_HORIZ_IDX (SYNCTEX_COLUMN_IDX+1) -# define SYNCTEX_VERT_IDX (SYNCTEX_HORIZ_IDX+1) -# define SYNCTEX_WIDTH_IDX (SYNCTEX_VERT_IDX+1) -# define SYNCTEX_HEIGHT_IDX (SYNCTEX_WIDTH_IDX+1) -# define SYNCTEX_DEPTH_IDX (SYNCTEX_HEIGHT_IDX+1) -/* the corresponding info accessors */ -# define SYNCTEX_TAG(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_TAG_IDX].INT -# define SYNCTEX_LINE(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_LINE_IDX].INT -# define SYNCTEX_COLUMN(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_COLUMN_IDX].INT -# define SYNCTEX_HORIZ(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_HORIZ_IDX].INT -# define SYNCTEX_VERT(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_VERT_IDX].INT -# define SYNCTEX_WIDTH(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_WIDTH_IDX].INT -# define SYNCTEX_HEIGHT(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_HEIGHT_IDX].INT -# define SYNCTEX_DEPTH(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_DEPTH_IDX].INT -# define SYNCTEX_ABS_WIDTH(NODE) ((SYNCTEX_WIDTH(NODE)>0?SYNCTEX_WIDTH(NODE):-SYNCTEX_WIDTH(NODE))) -# define SYNCTEX_ABS_HEIGHT(NODE) ((SYNCTEX_HEIGHT(NODE)>0?SYNCTEX_HEIGHT(NODE):-SYNCTEX_HEIGHT(NODE))) -# define SYNCTEX_ABS_DEPTH(NODE) ((SYNCTEX_DEPTH(NODE)>0?SYNCTEX_DEPTH(NODE):-SYNCTEX_DEPTH(NODE))) - -typedef struct { - SYNCTEX_DECLARE_CHARINDEX - synctex_class_t class; - synctex_info_t implementation[5+SYNCTEX_DEPTH_IDX+1]; /* parent,child,sibling,friend,next box, - * SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN, - * SYNCTEX_HORIZ,SYNCTEX_VERT,SYNCTEX_WIDTH,SYNCTEX_HEIGHT,SYNCTEX_DEPTH */ -} synctex_node_vbox_t; - -/* vertical box node creator */ -DEFINE_synctex_new_NODE(vbox) - -static void _synctex_log_vbox(synctex_node_t node); -static void _synctex_display_vbox(synctex_node_t node); - -/* These are static class objects, each scanner will make a copy of them and setup the scanner field. - */ -static _synctex_class_t synctex_class_vbox = { - NULL, /* No scanner yet */ - synctex_node_type_vbox, /* Node type */ - &_synctex_new_vbox, /* creator */ - &_synctex_free_node, /* destructor */ - &_synctex_log_vbox, /* log */ - &_synctex_display_vbox, /* display */ - &_synctex_implementation_0, /* parent */ - &_synctex_implementation_1, /* child */ - &_synctex_implementation_2, /* sibling */ - &_synctex_implementation_3, /* friend */ - &_synctex_implementation_4, /* next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_5 -}; - -/* Horizontal boxes must contain visible size, because 0 width does not mean emptiness. - * They also contain an average of the line numbers of the containing nodes. */ -# define SYNCTEX_MEAN_LINE_IDX (SYNCTEX_DEPTH_IDX+1) -# define SYNCTEX_NODE_WEIGHT_IDX (SYNCTEX_MEAN_LINE_IDX+1) -# define SYNCTEX_HORIZ_V_IDX (SYNCTEX_NODE_WEIGHT_IDX+1) -# define SYNCTEX_VERT_V_IDX (SYNCTEX_HORIZ_V_IDX+1) -# define SYNCTEX_WIDTH_V_IDX (SYNCTEX_VERT_V_IDX+1) -# define SYNCTEX_HEIGHT_V_IDX (SYNCTEX_WIDTH_V_IDX+1) -# define SYNCTEX_DEPTH_V_IDX (SYNCTEX_HEIGHT_V_IDX+1) -/* the corresponding info accessors */ -# define SYNCTEX_MEAN_LINE(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_MEAN_LINE_IDX].INT -# define SYNCTEX_NODE_WEIGHT(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_NODE_WEIGHT_IDX].INT -# define SYNCTEX_HORIZ_V(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_HORIZ_V_IDX].INT -# define SYNCTEX_VERT_V(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_VERT_V_IDX].INT -# define SYNCTEX_WIDTH_V(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_WIDTH_V_IDX].INT -# define SYNCTEX_HEIGHT_V(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_HEIGHT_V_IDX].INT -# define SYNCTEX_DEPTH_V(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_DEPTH_V_IDX].INT -# define SYNCTEX_ABS_WIDTH_V(NODE) ((SYNCTEX_WIDTH_V(NODE)>0?SYNCTEX_WIDTH_V(NODE):-SYNCTEX_WIDTH_V(NODE))) -# define SYNCTEX_ABS_HEIGHT_V(NODE) ((SYNCTEX_HEIGHT_V(NODE)>0?SYNCTEX_HEIGHT_V(NODE):-SYNCTEX_HEIGHT_V(NODE))) -# define SYNCTEX_ABS_DEPTH_V(NODE) ((SYNCTEX_DEPTH_V(NODE)>0?SYNCTEX_DEPTH_V(NODE):-SYNCTEX_DEPTH_V(NODE))) - -typedef struct { - SYNCTEX_DECLARE_CHARINDEX - synctex_class_t class; - synctex_info_t implementation[5+SYNCTEX_DEPTH_V_IDX+1]; /*parent,child,sibling,friend,next box, - * SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN, - * SYNCTEX_HORIZ,SYNCTEX_VERT,SYNCTEX_WIDTH,SYNCTEX_HEIGHT,SYNCTEX_DEPTH, - * SYNCTEX_MEAN_LINE,SYNCTEX_NODE_WEIGHT, - * SYNCTEX_HORIZ_V,SYNCTEX_VERT_V,SYNCTEX_WIDTH_V,SYNCTEX_HEIGHT_V,SYNCTEX_DEPTH_V*/ -} synctex_node_hbox_t; - -/* horizontal box node creator */ -DEFINE_synctex_new_NODE(hbox) - -static void _synctex_display_hbox(synctex_node_t node); -static void _synctex_log_hbox(synctex_node_t node); - - -static _synctex_class_t synctex_class_hbox = { - NULL, /* No scanner yet */ - synctex_node_type_hbox, /* Node type */ - &_synctex_new_hbox, /* creator */ - &_synctex_free_node, /* destructor */ - &_synctex_log_hbox, /* log */ - &_synctex_display_hbox, /* display */ - &_synctex_implementation_0, /* parent */ - &_synctex_implementation_1, /* child */ - &_synctex_implementation_2, /* sibling */ - &_synctex_implementation_3, /* friend */ - &_synctex_implementation_4, /* next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_5 -}; - -/* This void box node implementation is either horizontal or vertical - * It does not contain a child field. - */ -typedef struct { - SYNCTEX_DECLARE_CHARINDEX - synctex_class_t class; - synctex_info_t implementation[3+SYNCTEX_DEPTH_IDX+1]; /* parent,sibling,friend, - * SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN, - * SYNCTEX_HORIZ,SYNCTEX_VERT,SYNCTEX_WIDTH,SYNCTEX_HEIGHT,SYNCTEX_DEPTH*/ -} synctex_node_void_vbox_t; - -/* vertical void box node creator */ -DEFINE_synctex_new_NODE(void_vbox) - -static void _synctex_log_void_box(synctex_node_t node); -static void _synctex_display_void_vbox(synctex_node_t node); - -static _synctex_class_t synctex_class_void_vbox = { - NULL, /* No scanner yet */ - synctex_node_type_void_vbox,/* Node type */ - &_synctex_new_void_vbox, /* creator */ - &_synctex_free_node, /* destructor */ - &_synctex_log_void_box, /* log */ - &_synctex_display_void_vbox,/* display */ - &_synctex_implementation_0, /* parent */ - NULL, /* No child */ - &_synctex_implementation_1, /* sibling */ - &_synctex_implementation_2, /* friend */ - NULL, /* No next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_3 -}; - -typedef synctex_node_void_vbox_t synctex_node_void_hbox_t; - -/* horizontal void box node creator */ -DEFINE_synctex_new_NODE(void_hbox) - -static void _synctex_display_void_hbox(synctex_node_t node); - -static _synctex_class_t synctex_class_void_hbox = { - NULL, /* No scanner yet */ - synctex_node_type_void_hbox,/* Node type */ - &_synctex_new_void_hbox, /* creator */ - &_synctex_free_node, /* destructor */ - &_synctex_log_void_box, /* log */ - &_synctex_display_void_hbox,/* display */ - &_synctex_implementation_0, /* parent */ - NULL, /* No child */ - &_synctex_implementation_1, /* sibling */ - &_synctex_implementation_2, /* friend */ - NULL, /* No next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_3 -}; - -/* The medium nodes correspond to kern, glue, penalty and math nodes. - * In LuaTeX, the size of the nodes may have changed. */ -typedef struct { - SYNCTEX_DECLARE_CHARINDEX - synctex_class_t class; - synctex_info_t implementation[3+SYNCTEX_WIDTH_IDX+1]; /* parent,sibling,friend, - * SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN, - * SYNCTEX_HORIZ,SYNCTEX_VERT,SYNCTEX_WIDTH */ -} synctex_node_medium_t; - -#define SYNCTEX_IS_BOX(NODE)\ - ((NODE->class->type == synctex_node_type_vbox)\ - || (NODE->class->type == synctex_node_type_void_vbox)\ - || (NODE->class->type == synctex_node_type_hbox)\ - || (NODE->class->type == synctex_node_type_void_hbox)) - -#define SYNCTEX_HAS_CHILDREN(NODE) (NODE && SYNCTEX_CHILD(NODE)) - -static void _synctex_log_medium_node(synctex_node_t node); - -typedef synctex_node_medium_t synctex_node_math_t; - -/* math node creator */ -DEFINE_synctex_new_NODE(math) - -static void _synctex_display_math(synctex_node_t node); - -static _synctex_class_t synctex_class_math = { - NULL, /* No scanner yet */ - synctex_node_type_math, /* Node type */ - &_synctex_new_math, /* creator */ - &_synctex_free_leaf, /* destructor */ - &_synctex_log_medium_node, /* log */ - &_synctex_display_math, /* display */ - &_synctex_implementation_0, /* parent */ - NULL, /* No child */ - &_synctex_implementation_1, /* sibling */ - &_synctex_implementation_2, /* friend */ - NULL, /* No next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_3 -}; - -typedef synctex_node_medium_t synctex_node_kern_t; - -/* kern node creator */ -DEFINE_synctex_new_NODE(kern) - -static void _synctex_display_kern(synctex_node_t node); - -static _synctex_class_t synctex_class_kern = { - NULL, /* No scanner yet */ - synctex_node_type_kern, /* Node type */ - &_synctex_new_kern, /* creator */ - &_synctex_free_leaf, /* destructor */ - &_synctex_log_medium_node, /* log */ - &_synctex_display_kern, /* display */ - &_synctex_implementation_0, /* parent */ - NULL, /* No child */ - &_synctex_implementation_1, /* sibling */ - &_synctex_implementation_2, /* friend */ - NULL, /* No next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_3 -}; - -/* The small nodes correspond to glue and boundary nodes. */ -typedef struct { - SYNCTEX_DECLARE_CHARINDEX - synctex_class_t class; - synctex_info_t implementation[3+SYNCTEX_VERT_IDX+1]; /* parent,sibling,friend, - * SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN, - * SYNCTEX_HORIZ,SYNCTEX_VERT */ -} synctex_node_small_t; - -static void _synctex_log_small_node(synctex_node_t node); - -/* glue node creator */ -typedef synctex_node_small_t synctex_node_glue_t; -DEFINE_synctex_new_NODE(glue) -static void _synctex_display_glue(synctex_node_t node); - -static _synctex_class_t synctex_class_glue = { - NULL, /* No scanner yet */ - synctex_node_type_glue, /* Node type */ - &_synctex_new_glue, /* creator */ - &_synctex_free_leaf, /* destructor */ - &_synctex_log_medium_node, /* log */ - &_synctex_display_glue, /* display */ - &_synctex_implementation_0, /* parent */ - NULL, /* No child */ - &_synctex_implementation_1, /* sibling */ - &_synctex_implementation_2, /* friend */ - NULL, /* No next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_3 -}; - -/* boundary node creator */ -typedef synctex_node_small_t synctex_node_boundary_t; -DEFINE_synctex_new_NODE(boundary) - -static void _synctex_display_boundary(synctex_node_t node); - -static _synctex_class_t synctex_class_boundary = { - NULL, /* No scanner yet */ - synctex_node_type_boundary, /* Node type */ - &_synctex_new_boundary, /* creator */ - &_synctex_free_leaf, /* destructor */ - &_synctex_log_small_node, /* log */ - &_synctex_display_boundary, /* display */ - &_synctex_implementation_0, /* parent */ - NULL, /* No child */ - &_synctex_implementation_1, /* sibling */ - &_synctex_implementation_2, /* friend */ - NULL, /* No next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_3 -}; - -# define SYNCTEX_NAME_IDX (SYNCTEX_TAG_IDX+1) -# define SYNCTEX_NAME(NODE) SYNCTEX_INFO(NODE)[SYNCTEX_NAME_IDX].PTR - -/* Input nodes only know about their sibling, which is another input node. - * The synctex information is the SYNCTEX_TAG and SYNCTEX_NAME*/ -typedef struct { - SYNCTEX_DECLARE_CHARINDEX - synctex_class_t class; - synctex_info_t implementation[1+SYNCTEX_NAME_IDX+1]; /* sibling, - * SYNCTEX_TAG,SYNCTEX_NAME */ -} synctex_input_t; - -# define SYNCTEX_INPUT_MARK "Input:" -static synctex_node_t _synctex_new_input(synctex_scanner_t scanner) { - if (scanner) { - synctex_node_t node = _synctex_malloc(sizeof(synctex_input_t)); - if (node) { - SYNCTEX_IMPLEMENT_CHARINDEX(node,strlen(SYNCTEX_INPUT_MARK)); - node->class = scanner->class+synctex_node_type_input; - } - return node; - } - return NULL; -} - -static void _synctex_free_input(synctex_node_t node){ - if (node) { - SYNCTEX_FREE(SYNCTEX_SIBLING(node)); - free(SYNCTEX_NAME(node)); - free(node); - } -} - -static void _synctex_display_input(synctex_node_t node); -static void _synctex_log_input(synctex_node_t node); - -static _synctex_class_t synctex_class_input = { - NULL, /* No scanner yet */ - synctex_node_type_input, /* Node type */ - &_synctex_new_input, /* creator */ - &_synctex_free_input, /* destructor */ - &_synctex_log_input, /* log */ - &_synctex_display_input, /* display */ - NULL, /* No parent */ - NULL, /* No child */ - &_synctex_implementation_0, /* sibling */ - NULL, /* No friend */ - NULL, /* No next hbox */ - (_synctex_info_getter_t)&_synctex_implementation_1 -}; - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Navigation -# endif -synctex_node_t synctex_node_parent(synctex_node_t node) -{ - return SYNCTEX_PARENT(node); -} -synctex_node_t synctex_node_sheet(synctex_node_t node) -{ - while(node && node->class->type != synctex_node_type_sheet) { - node = SYNCTEX_PARENT(node); - } - /* exit the while loop either when node is NULL or node is a sheet */ - return node; -} -synctex_node_t synctex_node_child(synctex_node_t node) -{ - return SYNCTEX_CHILD(node); -} -synctex_node_t synctex_node_sibling(synctex_node_t node) -{ - return SYNCTEX_SIBLING(node); -} -synctex_node_t synctex_node_next(synctex_node_t node) { - if (SYNCTEX_CHILD(node)) { - return SYNCTEX_CHILD(node); - } -sibling: - if (SYNCTEX_SIBLING(node)) { - return SYNCTEX_SIBLING(node); - } - if ((node = SYNCTEX_PARENT(node))) { - if (node->class->type == synctex_node_type_sheet) {/* EXC_BAD_ACCESS? */ - return NULL; - } - goto sibling; - } - return NULL; -} -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark CLASS -# endif - -/* Public node accessor: the type */ -synctex_node_type_t synctex_node_type(synctex_node_t node) { - if (node) { - return (((node)->class))->type; - } - return synctex_node_type_error; -} - -/* Public node accessor: the human readable type */ -const char * synctex_node_isa(synctex_node_t node) { -static const char * isa[synctex_node_number_of_types] = - {"Not a node","input","sheet","vbox","void vbox","hbox","void hbox","kern","glue","math","boundary"}; - return isa[synctex_node_type(node)]; -} - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark SYNCTEX_LOG -# endif - -# define SYNCTEX_LOG(NODE) SYNCTEX_MSG_SEND(NODE,log) - -/* Public node logger */ -void synctex_node_log(synctex_node_t node) { - SYNCTEX_LOG(node); -} - -static void _synctex_log_input(synctex_node_t node) { - if (node) { - printf("%s:%i,%s",synctex_node_isa(node),SYNCTEX_TAG(node),SYNCTEX_NAME(node)); - printf(" SYNCTEX_SIBLING:%p",(void *)SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_log_sheet(synctex_node_t node) { - if (node) { - printf("%s:%i",synctex_node_isa(node),SYNCTEX_PAGE(node)); - SYNCTEX_PRINT_CHARINDEX; - printf("SELF:%p",(void *)node); - printf(" SYNCTEX_PARENT:%p",(void *)SYNCTEX_PARENT(node)); - printf(" SYNCTEX_CHILD:%p",(void *)SYNCTEX_CHILD(node)); - printf(" SYNCTEX_SIBLING:%p",(void *)SYNCTEX_SIBLING(node)); - printf(" SYNCTEX_FRIEND:%p",(void *)SYNCTEX_FRIEND(node)); - printf(" SYNCTEX_NEXT_hbox:%p\n",(void *)SYNCTEX_NEXT_hbox(node)); - } -} - -static void _synctex_log_small_node(synctex_node_t node) { - if (node) { - printf("%s:%i,%i:%i,%i", - synctex_node_isa(node), - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node)); - SYNCTEX_PRINT_CHARINDEX; - printf("SELF:%p",(void *)node); - printf(" SYNCTEX_PARENT:%p",(void *)SYNCTEX_PARENT(node)); - printf(" SYNCTEX_CHILD:%p",(void *)SYNCTEX_CHILD(node)); - printf(" SYNCTEX_SIBLING:%p",(void *)SYNCTEX_SIBLING(node)); - printf(" SYNCTEX_FRIEND:%p\n",(void *)SYNCTEX_FRIEND(node)); - } -} - -static void _synctex_log_medium_node(synctex_node_t node) { - if (node) { - printf("%s:%i,%i:%i,%i:%i", - synctex_node_isa(node), - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node), - SYNCTEX_WIDTH(node)); - SYNCTEX_PRINT_CHARINDEX; - printf("SELF:%p",(void *)node); - printf(" SYNCTEX_PARENT:%p",(void *)SYNCTEX_PARENT(node)); - printf(" SYNCTEX_CHILD:%p",(void *)SYNCTEX_CHILD(node)); - printf(" SYNCTEX_SIBLING:%p",(void *)SYNCTEX_SIBLING(node)); - printf(" SYNCTEX_FRIEND:%p\n",(void *)SYNCTEX_FRIEND(node)); - } -} - -static void _synctex_log_void_box(synctex_node_t node) { - if (node) { - printf("%s",synctex_node_isa(node)); - printf(":%i",SYNCTEX_TAG(node)); - printf(",%i",SYNCTEX_LINE(node)); - printf(",%i",0); - printf(":%i",SYNCTEX_HORIZ(node)); - printf(",%i",SYNCTEX_VERT(node)); - printf(":%i",SYNCTEX_WIDTH(node)); - printf(",%i",SYNCTEX_HEIGHT(node)); - printf(",%i",SYNCTEX_DEPTH(node)); - SYNCTEX_PRINT_CHARINDEX; - printf("SELF:%p",(void *)node); - printf(" SYNCTEX_PARENT:%p",(void *)SYNCTEX_PARENT(node)); - printf(" SYNCTEX_CHILD:%p",(void *)SYNCTEX_CHILD(node)); - printf(" SYNCTEX_SIBLING:%p",(void *)SYNCTEX_SIBLING(node)); - printf(" SYNCTEX_FRIEND:%p\n",(void *)SYNCTEX_FRIEND(node)); - } -} - -static void _synctex_log_vbox(synctex_node_t node) { - if (node) { - printf("%s",synctex_node_isa(node)); - printf(":%i",SYNCTEX_TAG(node)); - printf(",%i",SYNCTEX_LINE(node)); - printf(",%i",0); - printf(":%i",SYNCTEX_HORIZ(node)); - printf(",%i",SYNCTEX_VERT(node)); - printf(":%i",SYNCTEX_WIDTH(node)); - printf(",%i",SYNCTEX_HEIGHT(node)); - printf(",%i",SYNCTEX_DEPTH(node)); - SYNCTEX_PRINT_CHARINDEX; - printf("SELF:%p",(void *)node); - printf(" SYNCTEX_PARENT:%p",(void *)SYNCTEX_PARENT(node)); - printf(" SYNCTEX_CHILD:%p",(void *)SYNCTEX_CHILD(node)); - printf(" SYNCTEX_SIBLING:%p",(void *)SYNCTEX_SIBLING(node)); - printf(" SYNCTEX_FRIEND:%p",(void *)SYNCTEX_FRIEND(node)); - printf(" SYNCTEX_NEXT_hbox:%p\n",(void *)SYNCTEX_NEXT_hbox(node)); - } -} - -static void _synctex_log_hbox(synctex_node_t node) { - if (node) { - printf("%s",synctex_node_isa(node)); - printf(":%i",SYNCTEX_TAG(node)); - printf(",%i~%i*%i",SYNCTEX_LINE(node),SYNCTEX_MEAN_LINE(node),SYNCTEX_NODE_WEIGHT(node)); - printf(",%i",0); - printf(":%i",SYNCTEX_HORIZ(node)); - printf(",%i",SYNCTEX_VERT(node)); - printf(":%i",SYNCTEX_WIDTH(node)); - printf(",%i",SYNCTEX_HEIGHT(node)); - printf(",%i",SYNCTEX_DEPTH(node)); - printf("/%i",SYNCTEX_HORIZ_V(node)); - printf(",%i",SYNCTEX_VERT_V(node)); - printf(":%i",SYNCTEX_WIDTH_V(node)); - printf(",%i",SYNCTEX_HEIGHT_V(node)); - printf(",%i",SYNCTEX_DEPTH_V(node)); - SYNCTEX_PRINT_CHARINDEX; - printf("SELF:%p",(void *)node); - printf(" SYNCTEX_PARENT:%p",(void *)SYNCTEX_PARENT(node)); - printf(" SYNCTEX_CHILD:%p",(void *)SYNCTEX_CHILD(node)); - printf(" SYNCTEX_SIBLING:%p",(void *)SYNCTEX_SIBLING(node)); - printf(" SYNCTEX_FRIEND:%p",(void *)SYNCTEX_FRIEND(node)); - printf(" SYNCTEX_NEXT_hbox:%p\n",(void *)SYNCTEX_NEXT_hbox(node)); - } -} - -# define SYNCTEX_DISPLAY(NODE) SYNCTEX_MSG_SEND(NODE,display) - -void synctex_node_display(synctex_node_t node) { - SYNCTEX_DISPLAY(node); -} - -static void _synctex_display_input(synctex_node_t node) { - if (node) { - printf("....Input:%i:%s", - SYNCTEX_TAG(node), - SYNCTEX_NAME(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_sheet(synctex_node_t node) { - if (node) { - printf("....{%i",SYNCTEX_PAGE(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_CHILD(node)); - printf("....}\n"); - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_vbox(synctex_node_t node) { - if (node) { - printf("....[%i,%i:%i,%i:%i,%i,%i", - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node), - SYNCTEX_WIDTH(node), - SYNCTEX_HEIGHT(node), - SYNCTEX_DEPTH(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_CHILD(node)); - printf("....]\n"); - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_hbox(synctex_node_t node) { - if (node) { - printf("....(%i,%i~%i*%i:%i,%i:%i,%i,%i", - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_MEAN_LINE(node), - SYNCTEX_NODE_WEIGHT(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node), - SYNCTEX_WIDTH(node), - SYNCTEX_HEIGHT(node), - SYNCTEX_DEPTH(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_CHILD(node)); - printf("....)\n"); - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_void_vbox(synctex_node_t node) { - if (node) { - printf("....v%i,%i;%i,%i:%i,%i,%i", - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node), - SYNCTEX_WIDTH(node), - SYNCTEX_HEIGHT(node), - SYNCTEX_DEPTH(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_void_hbox(synctex_node_t node) { - if (node) { - printf("....h%i,%i:%i,%i:%i,%i,%i", - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node), - SYNCTEX_WIDTH(node), - SYNCTEX_HEIGHT(node), - SYNCTEX_DEPTH(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_glue(synctex_node_t node) { - if (node) { - printf("....glue:%i,%i:%i,%i", - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_math(synctex_node_t node) { - if (node) { - printf("....math:%i,%i:%i,%i", - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_kern(synctex_node_t node) { - if (node) { - printf("....kern:%i,%i:%i,%i:%i", - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node), - SYNCTEX_WIDTH(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -static void _synctex_display_boundary(synctex_node_t node) { - if (node) { - printf("....boundary:%i,%i:%i,%i", - SYNCTEX_TAG(node), - SYNCTEX_LINE(node), - SYNCTEX_HORIZ(node), - SYNCTEX_VERT(node)); - SYNCTEX_PRINT_CHARINDEX; - SYNCTEX_DISPLAY(SYNCTEX_SIBLING(node)); - } -} - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark SCANNER -# endif - -/* Here are gathered all the possible status that the next scanning functions will return. - * All these functions return a status, and pass their result through pointers. - * Negative values correspond to errors. - * The management of the buffer is causing some significant overhead. - * Every function that may access the buffer returns a status related to the buffer and file state. - * status >= SYNCTEX_STATUS_OK means the function worked as expected - * status < SYNCTEX_STATUS_OK means the function did not work as expected - * status == SYNCTEX_STATUS_NOT_OK means the function did not work as expected but there is still some material to parse. - * status == SYNCTEX_STATUS_EOF means the function did not work as expected and there is no more material. - * statusfile) - -/* Actually, the minimum buffer size is driven by integer and float parsing. - * 0.123456789e123 - */ -# define SYNCTEX_BUFFER_MIN_SIZE 16 -# define SYNCTEX_BUFFER_SIZE 32768 - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Prototypes -# endif -synctex_status_t _synctex_buffer_get_available_size(synctex_scanner_t scanner, size_t * size_ptr); -synctex_status_t _synctex_next_line(synctex_scanner_t scanner); -synctex_status_t _synctex_match_string(synctex_scanner_t scanner, const char * the_string); -synctex_status_t _synctex_decode_int(synctex_scanner_t scanner, int* value_ref); -synctex_status_t _synctex_decode_string(synctex_scanner_t scanner, char ** value_ref); -synctex_status_t _synctex_scan_input(synctex_scanner_t scanner); -synctex_status_t _synctex_scan_preamble(synctex_scanner_t scanner); -synctex_status_t _synctex_scan_float_and_dimension(synctex_scanner_t scanner, float * value_ref); -synctex_status_t _synctex_scan_post_scriptum(synctex_scanner_t scanner); -int _synctex_scan_postamble(synctex_scanner_t scanner); -synctex_status_t _synctex_setup_visible_box(synctex_node_t box); -synctex_status_t _synctex_hbox_setup_visible(synctex_node_t node,int h, int v); -synctex_status_t _synctex_scan_sheet(synctex_scanner_t scanner, synctex_node_t parent); -synctex_status_t _synctex_scan_nested_sheet(synctex_scanner_t scanner); -synctex_status_t _synctex_scan_content(synctex_scanner_t scanner); -int synctex_scanner_pre_x_offset(synctex_scanner_t scanner); -int synctex_scanner_pre_y_offset(synctex_scanner_t scanner); -const char * synctex_scanner_get_output_fmt(synctex_scanner_t scanner); -int _synctex_node_is_box(synctex_node_t node); -int _synctex_bail(void); - -/* Try to ensure that the buffer contains at least size bytes. - * Passing a huge size argument means the whole buffer length. - * Passing a null size argument means return the available buffer length, without reading the file. - * In that case, the return status is always SYNCTEX_STATUS_OK unless the given scanner is NULL, - * in which case, SYNCTEX_STATUS_BAD_ARGUMENT is returned. - * The value returned in size_ptr is the number of bytes now available in the buffer. - * This is a nonnegative integer, it may take the value 0. - * It is the responsibility of the caller to test whether this size is conforming to its needs. - * Negative values may return in case of error, actually - * when there was an error reading the synctex file. */ -synctex_status_t _synctex_buffer_get_available_size(synctex_scanner_t scanner, size_t * size_ptr) { - size_t available = 0; - if (NULL == scanner || NULL == size_ptr) { - return SYNCTEX_STATUS_BAD_ARGUMENT; - } -# define size (* size_ptr) - if (size>SYNCTEX_BUFFER_SIZE){ - size = SYNCTEX_BUFFER_SIZE; - } - available = SYNCTEX_END - SYNCTEX_CUR; /* available is the number of unparsed chars in the buffer */ - if (size<=available) { - /* There are already sufficiently many characters in the buffer */ - size = available; - return SYNCTEX_STATUS_OK; - } - if (SYNCTEX_FILE) { - /* Copy the remaining part of the buffer to the beginning, - * then read the next part of the file */ - int already_read = 0; -# if defined(SYNCTEX_USE_CHARINDEX) - scanner->charindex_offset += SYNCTEX_CUR - SYNCTEX_START; -# endif - if (available) { - memmove(SYNCTEX_START, SYNCTEX_CUR, available); - } - SYNCTEX_CUR = SYNCTEX_START + available; /* the next character after the move, will change. */ - /* Fill the buffer up to its end */ - already_read = gzread(SYNCTEX_FILE,(void *)SYNCTEX_CUR,SYNCTEX_BUFFER_SIZE - available); - if (already_read>0) { - /* We assume that 0already_read) { - /* There is a possible error in reading the file */ - int errnum = 0; - const char * error_string = gzerror(SYNCTEX_FILE, &errnum); - if (Z_ERRNO == errnum) { - /* There is an error in zlib caused by the file system */ - _synctex_error("gzread error from the file system (%i)",errno); - return SYNCTEX_STATUS_ERROR; - } else if (errnum) { - _synctex_error("gzread error (%i:%i,%s)",already_read,errnum,error_string); - return SYNCTEX_STATUS_ERROR; - } - } - /* Nothing was read, we are at the end of the file. */ - gzclose(SYNCTEX_FILE); - SYNCTEX_FILE = NULL; - SYNCTEX_END = SYNCTEX_CUR; - SYNCTEX_CUR = SYNCTEX_START; - * SYNCTEX_END = '\0';/* Terminate the string properly.*/ - size = SYNCTEX_END - SYNCTEX_CUR; - return SYNCTEX_STATUS_EOF; /* there might be a bit of text left */ - } - /* We cannot enlarge the buffer because the end of the file was reached. */ - size = available; - return SYNCTEX_STATUS_EOF; -# undef size -} - -/* Used when parsing the synctex file. - * Advance to the next character starting a line. - * Actually, only '\n' is recognized as end of line marker. - * On normal completion, the returned value is the number of unparsed characters available in the buffer. - * In general, it is a positive value, 0 meaning that the end of file was reached. - * -1 is returned in case of error, actually because there was an error while feeding the buffer. - * When the function returns with no error, SYNCTEX_CUR points to the first character of the next line, if any. - * J. Laurens: Sat May 10 07:52:31 UTC 2008 - */ -synctex_status_t _synctex_next_line(synctex_scanner_t scanner) { - synctex_status_t status = SYNCTEX_STATUS_OK; - size_t available = 0; - if (NULL == scanner) { - return SYNCTEX_STATUS_BAD_ARGUMENT; - } -infinite_loop: - while(SYNCTEX_CUR=remaining_len) { - /* The buffer is sufficiently big to hold the expected number of characters. */ - if (strncmp((char *)SYNCTEX_CUR,the_string,remaining_len)) { - return SYNCTEX_STATUS_NOT_OK; - } -return_OK: - /* Advance SYNCTEX_CUR to the next character after the_string. */ - SYNCTEX_CUR += remaining_len; - return SYNCTEX_STATUS_OK; - } else if (strncmp((char *)SYNCTEX_CUR,the_string,available)) { - /* No need to go further, this is not the expected string in the buffer. */ - return SYNCTEX_STATUS_NOT_OK; - } else if (SYNCTEX_FILE) { - /* The buffer was too small to contain remaining_len characters. - * We have to cut the string into pieces. */ - z_off_t offset = 0L; - /* the first part of the string is found, advance the_string to the next untested character. */ - the_string += available; - /* update the remaining length and the parsed length. */ - remaining_len -= available; - tested_len += available; - SYNCTEX_CUR += available; /* We validate the tested characters. */ - if (0 == remaining_len) { - /* Nothing left to test, we have found the given string, we return the length. */ - return tested_len; - } - /* We also have to record the current state of the file cursor because - * if the_string does not match, all this should be a totally blank operation, - * for which the file and buffer states should not be modified at all. - * In fact, the states of the buffer before and after this function are in general different - * but they are totally equivalent as long as the values of the buffer before SYNCTEX_CUR - * can be safely discarded. */ - offset = gztell(SYNCTEX_FILE); - /* offset now corresponds to the first character of the file that was not buffered. */ - available = SYNCTEX_CUR - SYNCTEX_START; /* available can be used as temporary placeholder. */ - /* available now corresponds to the number of chars that where already buffered and - * that match the head of the_string. If in fine the_string does not match, all these chars must be recovered - * because the buffer contents is completely replaced by _synctex_buffer_get_available_size. - * They were buffered from offset-len location in the file. */ - offset -= available; -more_characters: - /* There is still some work to be done, so read another bunch of file. - * This is the second call to _synctex_buffer_get_available_size, - * which means that the actual contents of the buffer will be discarded. - * We will definitely have to recover the previous state in case we do not find the expected string. */ - available = remaining_len; - status = _synctex_buffer_get_available_size(scanner,&available); - if (statusptr) { - SYNCTEX_CUR = end; - if (value_ref) { - * value_ref = result; - } - return SYNCTEX_STATUS_OK;/* Successfully scanned an int */ - } - return SYNCTEX_STATUS_NOT_OK;/* Could not scan an int */ -} - -/* The purpose of this function is to read a string. - * A string is an array of characters from the current parser location - * and before the next '\n' character. - * If a string was properly decoded, it is returned in value_ref and - * the cursor points to the new line marker. - * The returned string was alloced on the heap, the caller is the owner and - * is responsible to free it in due time. - * If no string is parsed, * value_ref is undefined. - * The maximum length of a string that a scanner can decode is platform dependent, namely UINT_MAX. - * If you just want to blindly parse the file up to the end of the current line, - * use _synctex_next_line instead. - * On return, the scanner cursor is unchanged if a string could not be scanned or - * points to the terminating '\n' character otherwise. As a consequence, - * _synctex_next_line is necessary after. - * If either scanner or value_ref is NULL, it is considered as an error and - * SYNCTEX_STATUS_BAD_ARGUMENT is returned. - */ -synctex_status_t _synctex_decode_string(synctex_scanner_t scanner, char ** value_ref) { - char * end = NULL; - size_t current_size = 0; - size_t new_size = 0; - size_t len = 0;/* The number of bytes to copy */ - size_t available = 0; - synctex_status_t status = 0; - if (NULL == scanner || NULL == value_ref) { - return SYNCTEX_STATUS_BAD_ARGUMENT; - } - /* The buffer must at least contain one character: the '\n' end of line marker */ - if (SYNCTEX_CUR>=SYNCTEX_END) { - available = 1; - status = _synctex_buffer_get_available_size(scanner,&available); - if (status < 0) { - return status; - } - if (0 == available) { - return SYNCTEX_STATUS_EOF; - } - } - /* Now we are sure that there is at least one available character, either because - * SYNCTEX_CUR was already < SYNCTEX_END, or because the buffer has been properly filled. */ - /* end will point to the next unparsed '\n' character in the file, when mapped to the buffer. */ - end = SYNCTEX_CUR; - * value_ref = NULL;/* Initialize, it will be realloc'ed */ - /* We scan all the characters up to the next '\n' */ -next_character: - if (endUINT_MAX-len-1) { - /* But we have reached the limit: we do not have current_size+len+1>UINT_MAX. - * We return the missing amount of memory. - * This will never occur in practice. */ - return UINT_MAX-len-1 - current_size; - } - new_size = current_size+len; - /* We have current_size+len+1<=UINT_MAX - * or equivalently new_sizeUINT_MAX-len-1) { - /* We have reached the limit. */ - _synctex_error("limit reached (missing %i).",current_size-(UINT_MAX-len-1)); - return SYNCTEX_STATUS_ERROR; - } - new_size = current_size+len; - if ((* value_ref = realloc(* value_ref,new_size+1)) != NULL) { - if (memcpy((*value_ref)+current_size,SYNCTEX_CUR,len)) { - (* value_ref)[new_size]='\0'; /* Terminate the string */ - SYNCTEX_CUR = SYNCTEX_END;/* Advance the cursor to the end of the bufer */ - return SYNCTEX_STATUS_OK; - } - free(* value_ref); - * value_ref = NULL; - _synctex_error("could not copy memory (2)."); - return SYNCTEX_STATUS_ERROR; - } - /* Huge memory problem */ - _synctex_error("could not allocate memory (2)."); - return SYNCTEX_STATUS_ERROR; - } -} - -/* Used when parsing the synctex file. - * Read an Input record. - */ -synctex_status_t _synctex_scan_input(synctex_scanner_t scanner) { - synctex_status_t status = 0; - size_t available = 0; - synctex_node_t input = NULL; - if (NULL == scanner) { - return SYNCTEX_STATUS_BAD_ARGUMENT; - } - status = _synctex_match_string(scanner,SYNCTEX_INPUT_MARK); - if (statusinput); - scanner->input = input; -# if SYNCTEX_VERBOSE - synctex_node_log(input); -# endif - return _synctex_next_line(scanner);/* read the line termination character, if any */ - /* Now, set up the path */ -} - -typedef synctex_status_t (*synctex_decoder_t)(synctex_scanner_t,void *); - -synctex_status_t _synctex_scan_named(synctex_scanner_t scanner,const char * name,void * value_ref,synctex_decoder_t decoder); - -/* Used when parsing the synctex file. - * Read one of the settings. - * On normal completion, returns SYNCTEX_STATUS_OK. - * On error, returns SYNCTEX_STATUS_ERROR. - * Both arguments must not be NULL. - * On return, the scanner points to the next character after the decoded object whatever it is. - * It is the responsibility of the caller to prepare the scanner for the next line. - */ -synctex_status_t _synctex_scan_named(synctex_scanner_t scanner,const char * name,void * value_ref,synctex_decoder_t decoder) { - synctex_status_t status = 0; - if (NULL == scanner || NULL == name || NULL == value_ref || NULL == decoder) { - return SYNCTEX_STATUS_BAD_ARGUMENT; - } -not_found: - status = _synctex_match_string(scanner,name); - if (statusversion),(synctex_decoder_t)&_synctex_decode_int); - if (statusoutput_fmt),(synctex_decoder_t)&_synctex_decode_string); - if (statuspre_magnification),(synctex_decoder_t)&_synctex_decode_int); - if (statuspre_unit),(synctex_decoder_t)&_synctex_decode_int); - if (statuspre_x_offset),(synctex_decoder_t)&_synctex_decode_int); - if (statuspre_y_offset),(synctex_decoder_t)&_synctex_decode_int); - if (status= SYNCTEX_STATUS_OK) { - f *= 72.27f*65536; - } else if (status= SYNCTEX_STATUS_OK) { - f *= 72.27f*65536/2.54f; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"mm")) >= SYNCTEX_STATUS_OK) { - f *= 72.27f*65536/25.4f; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"pt")) >= SYNCTEX_STATUS_OK) { - f *= 65536.0f; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"bp")) >= SYNCTEX_STATUS_OK) { - f *= 72.27f/72*65536.0f; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"pc")) >= SYNCTEX_STATUS_OK) { - f *= 12.0*65536.0f; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"sp")) >= SYNCTEX_STATUS_OK) { - f *= 1.0f; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"dd")) >= SYNCTEX_STATUS_OK) { - f *= 1238.0f/1157*65536.0f; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"cc")) >= SYNCTEX_STATUS_OK) { - f *= 14856.0f/1157*65536; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"nd")) >= SYNCTEX_STATUS_OK) { - f *= 685.0f/642*65536; - } else if (status<0) { - goto report_unit_error; - } else if ((status = _synctex_match_string(scanner,"nc")) >= SYNCTEX_STATUS_OK) { - f *= 1370.0f/107*65536; - } else if (status<0) { - goto report_unit_error; - } - *value_ref = f; - return SYNCTEX_STATUS_OK; -} - -/* parse the post scriptum - * SYNCTEX_STATUS_OK is returned on completion - * a negative error is returned otherwise */ -synctex_status_t _synctex_scan_post_scriptum(synctex_scanner_t scanner) { - synctex_status_t status = 0; - char * endptr = NULL; -#ifdef HAVE_SETLOCALE - char * loc = setlocale(LC_NUMERIC, NULL); -#endif - if (NULL == scanner) { - return SYNCTEX_STATUS_BAD_ARGUMENT; - } - /* Scan the file until a post scriptum line is found */ -post_scriptum_not_found: - status = _synctex_match_string(scanner,"Post scriptum:"); - if (statusunit = strtod(SYNCTEX_CUR,&endptr); -#ifdef HAVE_SETLOCALE - setlocale(LC_NUMERIC, loc); -#endif - if (endptr == SYNCTEX_CUR) { - _synctex_error("bad magnification in the post scriptum, a float was expected."); - return SYNCTEX_STATUS_ERROR; - } - if (scanner->unit<=0) { - _synctex_error("bad magnification in the post scriptum, a positive float was expected."); - return SYNCTEX_STATUS_ERROR; - } - SYNCTEX_CUR = endptr; - goto next_line; - } - if (statusx_offset)); - if (statusy_offset)); - if (statuscount),(synctex_decoder_t)&_synctex_decode_int); - if (status < SYNCTEX_STATUS_EOF) { - return status; /* forward the error */ - } else if (status < SYNCTEX_STATUS_OK) { /* No Count record found */ - status = _synctex_next_line(scanner); /* Advance one more line */ - if (statusclass->type) { - case synctex_node_type_hbox: - if (SYNCTEX_INFO(box) != NULL) { - SYNCTEX_HORIZ_V(box) = SYNCTEX_HORIZ(box); - SYNCTEX_VERT_V(box) = SYNCTEX_VERT(box); - SYNCTEX_WIDTH_V(box) = SYNCTEX_WIDTH(box); - SYNCTEX_HEIGHT_V(box) = SYNCTEX_HEIGHT(box); - SYNCTEX_DEPTH_V(box) = SYNCTEX_DEPTH(box); - return SYNCTEX_STATUS_OK; - } - return SYNCTEX_STATUS_ERROR; - } - } - return SYNCTEX_STATUS_BAD_ARGUMENT; -} - -/* This method is sent to an horizontal box to setup the visible size - * Some box have 0 width but do contain text material. - * With this method, one can enlarge the box to contain the given point (h,v). - */ -synctex_status_t _synctex_hbox_setup_visible(synctex_node_t node,int h, int v) { -# ifdef __DARWIN_UNIX03 -# pragma unused(v) -# endif - int itsBtm, itsTop; - if (NULL == node || node->class->type != synctex_node_type_hbox) { - return SYNCTEX_STATUS_BAD_ARGUMENT; - } - if (SYNCTEX_WIDTH_V(node)<0) { - itsBtm = SYNCTEX_HORIZ_V(node); - itsTop = SYNCTEX_HORIZ_V(node)-SYNCTEX_WIDTH_V(node); - if (hitsTop) { - SYNCTEX_WIDTH_V(node) = SYNCTEX_HORIZ_V(node) - h; - } - } else { - itsBtm = SYNCTEX_HORIZ_V(node); - itsTop = SYNCTEX_HORIZ_V(node)+SYNCTEX_WIDTH_V(node); - if (hitsTop) { - SYNCTEX_WIDTH_V(node) = h - SYNCTEX_HORIZ_V(node); - } - } - return SYNCTEX_STATUS_OK; -} - -/* Here are the control characters that strat each line of the synctex output file. - * Their values define the meaning of the line. - */ -# define SYNCTEX_CHAR_BEGIN_SHEET '{' -# define SYNCTEX_CHAR_END_SHEET '}' -# define SYNCTEX_CHAR_BEGIN_VBOX '[' -# define SYNCTEX_CHAR_END_VBOX ']' -# define SYNCTEX_CHAR_BEGIN_HBOX '(' -# define SYNCTEX_CHAR_END_HBOX ')' -# define SYNCTEX_CHAR_ANCHOR '!' -# define SYNCTEX_CHAR_VOID_VBOX 'v' -# define SYNCTEX_CHAR_VOID_HBOX 'h' -# define SYNCTEX_CHAR_KERN 'k' -# define SYNCTEX_CHAR_GLUE 'g' -# define SYNCTEX_CHAR_MATH '$' -# define SYNCTEX_CHAR_BOUNDARY 'x' - -# define SYNCTEX_RETURN(STATUS) return STATUS; - -/* Used when parsing the synctex file. A '{' character has just been parsed. - * The purpose is to gobble everything until the closing '}'. - * Actually only one nesting depth has been observed when using the clip option - * of \includegraphics option. Here we use arbitrary level of depth. - */ -synctex_status_t _synctex_scan_nested_sheet(synctex_scanner_t scanner) { - unsigned int depth = 0; -deeper: - ++depth; - if (_synctex_next_line(scanner)0) { - goto scan_next_line; - } else { - SYNCTEX_RETURN(SYNCTEX_STATUS_OK); - } - } else if (*SYNCTEX_CUR == SYNCTEX_CHAR_BEGIN_SHEET) { - ++SYNCTEX_CUR; - goto deeper; - - } else if (_synctex_next_line(scanner)class->type != synctex_node_type_sheet - || _synctex_next_line(scanner)0){ - _synctex_error("Uncomplete sheet(0)"); - SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); - } - goto prepare_loop; - } - _synctex_bail(); -/* The child loop means that we go down one level, when we just created a box node, - * the next node created is a child of this box. */ -child_loop: - if (SYNCTEX_CURclass->type == synctex_node_type_vbox) { - #define SYNCTEX_UPDATE_BOX_FRIEND(NODE)\ - friend_index = ((SYNCTEX_INFO(NODE))[SYNCTEX_TAG_IDX].INT+(SYNCTEX_INFO(NODE))[SYNCTEX_LINE_IDX].INT)%(scanner->number_of_lists);\ - SYNCTEX_SET_FRIEND(NODE,(scanner->lists_of_friends)[friend_index]);\ - (scanner->lists_of_friends)[friend_index] = NODE; - if (NULL == SYNCTEX_CHILD(parent)) { - /* only void boxes are friends */ - SYNCTEX_UPDATE_BOX_FRIEND(parent); - } - child = parent; - parent = SYNCTEX_PARENT(child); - } else { - _synctex_error("Unexpected end of vbox, ignored."); - } - if (_synctex_next_line(scanner)class->type == synctex_node_type_hbox) { - /* Update the mean line number */ - synctex_node_t node = SYNCTEX_CHILD(parent); - if (node) { - unsigned int node_weight = 0; - unsigned int cumulated_line_numbers = 0; - do { - if (synctex_node_type(node)==synctex_node_type_hbox) { - if (SYNCTEX_NODE_WEIGHT(node)) { - node_weight += SYNCTEX_NODE_WEIGHT(node); - cumulated_line_numbers += SYNCTEX_MEAN_LINE(node)*SYNCTEX_NODE_WEIGHT(node); - } else { - ++node_weight; - cumulated_line_numbers += SYNCTEX_MEAN_LINE(node); - } - } else { - ++node_weight; - cumulated_line_numbers += SYNCTEX_LINE(node); - } - } while ((node = SYNCTEX_SIBLING(node))); - SYNCTEX_MEAN_LINE(parent)=(cumulated_line_numbers + node_weight/2)/node_weight; - SYNCTEX_NODE_WEIGHT(parent)=node_weight; - } else { - SYNCTEX_MEAN_LINE(parent)=SYNCTEX_LINE(parent); - SYNCTEX_NODE_WEIGHT(parent)=1; - } - if (NULL == child) { - /* Only boxes with no children are friends, - * boxes with children are indirectly friends through one of their contained nodes. */ - SYNCTEX_UPDATE_BOX_FRIEND(parent); - } - /* setting the next horizontal box at the end ensures that a child is recorded before any of its ancestors. */ - SYNCTEX_SET_NEXT_hbox(box,parent); - box = parent; - child = parent; - parent = SYNCTEX_PARENT(child); - } else { - _synctex_error("Unexpected end of hbox, ignored."); - } - if (_synctex_next_line(scanner)number_of_lists);\ - SYNCTEX_SET_FRIEND(NODE,(scanner->lists_of_friends)[friend_index]);\ - (scanner->lists_of_friends)[friend_index] = NODE; - SYNCTEX_UPDATE_FRIEND(child); -# if SYNCTEX_VERBOSE - synctex_node_log(child); -# endif - goto sibling_loop; - } else { - _synctex_error("Can't create vbox record."); - SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); - } - } else if (*SYNCTEX_CUR == SYNCTEX_CHAR_VOID_HBOX) { - if (NULL != (child = _synctex_new_void_hbox(scanner)) - && NULL != (info = SYNCTEX_INFO(child))) { - if (SYNCTEX_DECODE_FAILED(SYNCTEX_TAG_IDX) - || SYNCTEX_DECODE_FAILED(SYNCTEX_LINE_IDX) - || SYNCTEX_DECODE_FAILED(SYNCTEX_HORIZ_IDX) - || SYNCTEX_DECODE_FAILED(SYNCTEX_VERT_IDX) - || SYNCTEX_DECODE_FAILED(SYNCTEX_WIDTH_IDX) - || SYNCTEX_DECODE_FAILED(SYNCTEX_HEIGHT_IDX) - || SYNCTEX_DECODE_FAILED(SYNCTEX_DEPTH_IDX) - || _synctex_next_line(scanner)0){ - _synctex_error("Uncomplete sheet(0)"); - SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); - } else { - goto child_loop; - } - } - _synctex_bail(); -/* The vertical loop means that we are on the same level, for example when we just ended a box. - * If a node is created now, it will be a sibling of the current node, sharing the same parent. */ -sibling_loop: - if (SYNCTEX_CUR0){ - goto sibling_loop; - } else { - _synctex_error("Uncomplete sheet(2)"); - SYNCTEX_RETURN(SYNCTEX_STATUS_ERROR); - } - } -# undef SYNCTEX_DECODE_FAILED -} - -# define SYNCTEX_APPEND_SHEET(SCANNER,SHEET) if (SCANNER->sheet) {\ - synctex_node_t last_sheet = SCANNER->sheet;\ - synctex_node_t next_sheet = NULL;\ - while ((next_sheet = SYNCTEX_SIBLING(last_sheet))) {\ - last_sheet = next_sheet;\ - }\ - SYNCTEX_SET_SIBLING(last_sheet,SHEET);\ - } else {\ - SCANNER->sheet = SHEET;\ - } - -/* Used when parsing the synctex file - */ -synctex_status_t _synctex_scan_content(synctex_scanner_t scanner) { - synctex_node_t sheet = NULL; - synctex_status_t status = 0; - if (NULL == scanner) { - return SYNCTEX_STATUS_BAD_ARGUMENT; - } - /* set up the lists of friends */ - if (NULL == scanner->lists_of_friends) { - scanner->number_of_lists = 1024; - scanner->lists_of_friends = (synctex_node_t *)_synctex_malloc(scanner->number_of_lists*sizeof(synctex_node_t)); - if (NULL == scanner->lists_of_friends) { - _synctex_error("malloc:2"); - return SYNCTEX_STATUS_ERROR; - } - } - /* Find where this section starts */ -content_not_found: - status = _synctex_match_string(scanner,"Content:"); - if (status= SYNCTEX_STATUS_OK); - goto next_sheet; -} - -int _synctex_open(const char * output, const char * build_directory, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_t * io_modeRef); - -/* Where the synctex scanner is created. */ -synctex_scanner_t synctex_scanner_new_with_output_file(const char * output, const char * build_directory, int parse) { - gzFile file = NULL; - char * synctex = NULL; - synctex_scanner_t scanner = NULL; - synctex_io_mode_t io_mode = 0; - /* Here we assume that int are smaller than void * */ - if (sizeof(int)>sizeof(void*)) { - _synctex_error("INTERNAL INCONSISTENCY: int's are unexpectedly bigger than pointers, bailing out."); - return NULL; - } - /* We ensure that SYNCTEX_BUFFER_SIZE < UINT_MAX, I don't know if it makes sense... */ - if (SYNCTEX_BUFFER_SIZE >= UINT_MAX) { - _synctex_error("Internal inconsistency, bad SYNCTEX_BUFFER_SIZE (1)"); - return NULL; - } - /* for integers: */ - if (SYNCTEX_BUFFER_SIZE < SYNCTEX_BUFFER_MIN_SIZE) { - _synctex_error("Internal inconsistency, bad SYNCTEX_BUFFER_SIZE (2)"); - return NULL; - } - /* now open the synctex file */ - if (_synctex_open(output,build_directory,&synctex,&file,synctex_ADD_QUOTES,&io_mode) || !file) { - if (_synctex_open(output,build_directory,&synctex,&file,synctex_DONT_ADD_QUOTES,&io_mode) || !file) { - return NULL; - } - } - scanner = (synctex_scanner_t)_synctex_malloc(sizeof(_synctex_scanner_t)); - if (NULL == scanner) { - _synctex_error("malloc problem"); - free(synctex); - gzclose(file); - return NULL; - } - /* make a private copy of output for the scanner */ - if (NULL == (scanner->output = (char *)malloc(strlen(output)+1))){ - _synctex_error("! synctex_scanner_new_with_output_file: Memory problem (2), scanner's output is not reliable."); - } else if (scanner->output != strcpy(scanner->output,output)) { - _synctex_error("! synctex_scanner_new_with_output_file: Copy problem, scanner's output is not reliable."); - } - scanner->synctex = synctex;/* Now the scanner owns synctex */ - SYNCTEX_FILE = file; - return parse? synctex_scanner_parse(scanner):scanner; -} - -/* This functions opens the file at the "output" given location. - * It manages the problem of quoted filenames that appear with pdftex and filenames containing the space character. - * In TeXLive 2008, the synctex file created with pdftex did contain unexpected quotes. - * This function will remove them if possible. - * All the reference arguments will take a value on return. They must be non NULL. - * 0 on success, non 0 on error. */ -static int __synctex_open(const char * output, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_t * io_mode_ref) { - if (synctex_name_ref && file_ref && io_mode_ref) { - /* 1 local variables that uses dynamic memory */ - char * synctex_name = NULL; - gzFile the_file = NULL; - char * quoteless_synctex_name = NULL; - size_t size = 0; - synctex_io_mode_t io_mode = *io_mode_ref; - const char * mode = _synctex_get_io_mode_name(io_mode); - /* now create the synctex file name */ - size = strlen(output)+strlen(synctex_suffix)+strlen(synctex_suffix_gz)+1; - synctex_name = (char *)malloc(size); - if (NULL == synctex_name) { - _synctex_error("! __synctex_open: Memory problem (1)\n"); - return 1; - } - /* we have reserved for synctex enough memory to copy output (including its 2 eventual quotes), both suffices, - * including the terminating character. size is free now. */ - if (synctex_name != strcpy(synctex_name,output)) { - _synctex_error("! __synctex_open: Copy problem\n"); -return_on_error: - free(synctex_name); - free(quoteless_synctex_name); - return 2; - } - /* remove the last path extension if any */ - _synctex_strip_last_path_extension(synctex_name); - if (!strlen(synctex_name)) { - goto return_on_error; - } - /* now insert quotes. */ - if (add_quotes) { - char * quoted = NULL; - if (_synctex_copy_with_quoting_last_path_component(synctex_name,"ed,size) || (NULL == quoted)) { - /* There was an error or quoting does not make sense: */ - goto return_on_error; - } - quoteless_synctex_name = synctex_name; - synctex_name = quoted; - } - /* Now add to synctex_name the first path extension. */ - if (synctex_name != strcat(synctex_name,synctex_suffix)){ - _synctex_error("! __synctex_open: Concatenation problem (can't add suffix '%s')\n",synctex_suffix); - goto return_on_error; - } - /* Add to quoteless_synctex_name as well, if relevant. */ - if (quoteless_synctex_name && (quoteless_synctex_name != strcat(quoteless_synctex_name,synctex_suffix))){ - free(quoteless_synctex_name); - quoteless_synctex_name = NULL; - } - if (NULL == (the_file = gzopen(synctex_name,mode))) { - /* Could not open this file */ - if (errno != ENOENT) { - /* The file does exist, this is a lower level error, I can't do anything. */ - _synctex_error("could not open %s, error %i\n",synctex_name,errno); - goto return_on_error; - } - /* Apparently, there is no uncompressed synctex file. Try the compressed version */ - if (synctex_name != strcat(synctex_name,synctex_suffix_gz)){ - _synctex_error("! __synctex_open: Concatenation problem (can't add suffix '%s')\n",synctex_suffix_gz); - goto return_on_error; - } - io_mode |= synctex_io_gz_mask; - mode = _synctex_get_io_mode_name(io_mode); /* the file is a compressed and is a binary file, this caused errors on Windows */ - /* Add the suffix to the quoteless_synctex_name as well. */ - if (quoteless_synctex_name && (quoteless_synctex_name != strcat(quoteless_synctex_name,synctex_suffix_gz))){ - free(quoteless_synctex_name); - quoteless_synctex_name = NULL; - } - if (NULL == (the_file = gzopen(synctex_name,mode))) { - /* Could not open this file */ - if (errno != ENOENT) { - /* The file does exist, this is a lower level error, I can't do anything. */ - _synctex_error("Could not open %s, error %i\n",synctex_name,errno); - } - goto return_on_error; - } - } - /* At this point, the file is properly open. - * If we are in the add_quotes mode, we change the file name by removing the quotes. */ - if (quoteless_synctex_name) { - gzclose(the_file); - if (rename(synctex_name,quoteless_synctex_name)) { - _synctex_error("Could not rename %s to %s, error %i\n",synctex_name,quoteless_synctex_name,errno); - /* We could not rename, reopen the file with the quoted name. */ - if (NULL == (the_file = gzopen(synctex_name,mode))) { - /* No luck, could not re open this file, something has happened meanwhile */ - if (errno != ENOENT) { - /* The file does not exist any more, it has certainly be removed somehow - * this is a lower level error, I can't do anything. */ - _synctex_error("Could not open again %s, error %i\n",synctex_name,errno); - } - goto return_on_error; - } - } else { - /* The file has been successfully renamed */ - if (NULL == (the_file = gzopen(quoteless_synctex_name,mode))) { - /* Could not open this file */ - if (errno != ENOENT) { - /* The file does exist, this is a lower level error, I can't do anything. */ - _synctex_error("Could not open renamed %s, error %i\n",quoteless_synctex_name,errno); - } - goto return_on_error; - } - /* The quote free file name should replace the old one:*/ - free(synctex_name); - synctex_name = quoteless_synctex_name; - quoteless_synctex_name = NULL; - } - } - /* The operation is successfull, return the arguments by value. */ - * file_ref = the_file; - * io_mode_ref = io_mode; - * synctex_name_ref = synctex_name; - return 0; - } - return 3; /* Bad parameter. */ -} - -/* Opens the ouput file, taking into account the eventual build_directory. - * 0 on success, non 0 on error. */ -int _synctex_open(const char * output, const char * build_directory, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_t * io_mode_ref) { -# define synctex_name (*synctex_name_ref) -# define the_file (*file_ref) - int result = __synctex_open(output,synctex_name_ref,file_ref,add_quotes,io_mode_ref); - if ((result || !*file_ref) && build_directory && strlen(build_directory)) { - char * build_output; - const char *lpc; - size_t size; - synctex_bool_t is_absolute; - build_output = NULL; - lpc = _synctex_last_path_component(output); - size = strlen(build_directory)+strlen(lpc)+2; /* One for the '/' and one for the '\0'. */ - is_absolute = _synctex_path_is_absolute(build_directory); - if (!is_absolute) { - size += strlen(output); - } - if ((build_output = (char *)malloc(size))) { - if (is_absolute) { - build_output[0] = '\0'; - } else { - if (build_output != strcpy(build_output,output)) { - free(build_output); - return -4; - } - build_output[lpc-output]='\0'; - } - if (build_output == strcat(build_output,build_directory)) { - /* Append a path separator if necessary. */ - if (!SYNCTEX_IS_PATH_SEPARATOR(build_output[strlen(build_directory)-1])) { - if (build_output != strcat(build_output,"/")) { - free(build_output); - return -2; - } - } - /* Append the last path component of the output. */ - if (build_output != strcat(build_output,lpc)) { - free(build_output); - return -3; - } - result = __synctex_open(build_output,synctex_name_ref,file_ref,add_quotes,io_mode_ref); - free(build_output); - return result; - } - free(build_output); - } - return -1; - } - return result; -# undef synctex_name -# undef the_file -} - -/* The scanner destructor - */ -void synctex_scanner_free(synctex_scanner_t scanner) { - if (NULL == scanner) { - return; - } - if (SYNCTEX_FILE) { - gzclose(SYNCTEX_FILE); - SYNCTEX_FILE = NULL; - } - SYNCTEX_FREE(scanner->sheet); - SYNCTEX_FREE(scanner->input); - free(SYNCTEX_START); - free(scanner->output_fmt); - free(scanner->output); - free(scanner->synctex); - free(scanner->lists_of_friends); - free(scanner); -} - -/* Where the synctex scanner parses the contents of the file. */ -synctex_scanner_t synctex_scanner_parse(synctex_scanner_t scanner) { - synctex_status_t status = 0; - if (!scanner || scanner->flags.has_parsed) { - return scanner; - } - scanner->flags.has_parsed=1; - scanner->pre_magnification = 1000; - scanner->pre_unit = 8192; - scanner->pre_x_offset = scanner->pre_y_offset = 578; - /* initialize the offset with a fake unprobable value, - * If there is a post scriptum section, this value will be overriden by the real life value */ - scanner->x_offset = scanner->y_offset = 6.027e23f; -# define DEFINE_synctex_scanner_class(NAME)\ - scanner->class[synctex_node_type_##NAME] = synctex_class_##NAME;\ - (scanner->class[synctex_node_type_##NAME]).scanner = scanner - DEFINE_synctex_scanner_class(sheet); - DEFINE_synctex_scanner_class(input); - DEFINE_synctex_scanner_class(hbox); - DEFINE_synctex_scanner_class(void_hbox); - DEFINE_synctex_scanner_class(vbox); - DEFINE_synctex_scanner_class(void_vbox); - DEFINE_synctex_scanner_class(kern); - DEFINE_synctex_scanner_class(glue); - DEFINE_synctex_scanner_class(math); - DEFINE_synctex_scanner_class(boundary); - SYNCTEX_START = (char *)malloc(SYNCTEX_BUFFER_SIZE+1); /* one more character for null termination */ - if (NULL == SYNCTEX_START) { - _synctex_error("malloc error"); - synctex_scanner_free(scanner); - return NULL; - } - SYNCTEX_END = SYNCTEX_START+SYNCTEX_BUFFER_SIZE; - /* SYNCTEX_END always points to a null terminating character. - * Maybe there is another null terminating character between SYNCTEX_CUR and SYNCTEX_END-1. - * At least, we are sure that SYNCTEX_CUR points to a string covering a valid part of the memory. */ - *SYNCTEX_END = '\0'; - SYNCTEX_CUR = SYNCTEX_END; -# if defined(SYNCTEX_USE_CHARINDEX) - scanner->charindex_offset = -SYNCTEX_BUFFER_SIZE; -# endif - status = _synctex_scan_preamble(scanner); - if (statuspre_unit)/65536 pt = (scanner->pre_unit)/65781.76 bp - * 1 pt = 65536 sp */ - if (scanner->pre_unit<=0) { - scanner->pre_unit = 8192; - } - if (scanner->pre_magnification<=0) { - scanner->pre_magnification = 1000; - } - if (scanner->unit <= 0) { - /* no post magnification */ - scanner->unit = scanner->pre_unit / 65781.76;/* 65781.76 or 65536.0*/ - } else { - /* post magnification */ - scanner->unit *= scanner->pre_unit / 65781.76; - } - scanner->unit *= scanner->pre_magnification / 1000.0; - if (scanner->x_offset > 6e23) { - /* no post offset */ - scanner->x_offset = scanner->pre_x_offset * (scanner->pre_unit / 65781.76); - scanner->y_offset = scanner->pre_y_offset * (scanner->pre_unit / 65781.76); - } else { - /* post offset */ - scanner->x_offset /= 65781.76f; - scanner->y_offset /= 65781.76f; - } - return scanner; - #undef SYNCTEX_FILE -} - -/* Scanner accessors. - */ -int synctex_scanner_pre_x_offset(synctex_scanner_t scanner){ - return scanner?scanner->pre_x_offset:0; -} -int synctex_scanner_pre_y_offset(synctex_scanner_t scanner){ - return scanner?scanner->pre_y_offset:0; -} -int synctex_scanner_x_offset(synctex_scanner_t scanner){ - return scanner?scanner->x_offset:0; -} -int synctex_scanner_y_offset(synctex_scanner_t scanner){ - return scanner?scanner->y_offset:0; -} -float synctex_scanner_magnification(synctex_scanner_t scanner){ - return scanner?scanner->unit:1; -} -void synctex_scanner_display(synctex_scanner_t scanner) { - if (NULL == scanner) { - return; - } - printf("The scanner:\noutput:%s\noutput_fmt:%s\nversion:%i\n",scanner->output,scanner->output_fmt,scanner->version); - printf("pre_unit:%i\nx_offset:%i\ny_offset:%i\n",scanner->pre_unit,scanner->pre_x_offset,scanner->pre_y_offset); - printf("count:%i\npost_magnification:%f\npost_x_offset:%f\npost_y_offset:%f\n", - scanner->count,scanner->unit,scanner->x_offset,scanner->y_offset); - printf("The input:\n"); - SYNCTEX_DISPLAY(scanner->input); - if (scanner->count<1000) { - printf("The sheets:\n"); - SYNCTEX_DISPLAY(scanner->sheet); - printf("The friends:\n"); - if (scanner->lists_of_friends) { - int i = scanner->number_of_lists; - synctex_node_t node; - while(i--) { - printf("Friend index:%i\n",i); - node = (scanner->lists_of_friends)[i]; - while(node) { - printf("%s:%i,%i\n", - synctex_node_isa(node), - SYNCTEX_TAG(node), - SYNCTEX_LINE(node) - ); - node = SYNCTEX_FRIEND(node); - } - } - } - } else { - printf("SyncTeX Warning: Too many objects\n"); - } -} -/* Public*/ -const char * synctex_scanner_get_name(synctex_scanner_t scanner,int tag) { - synctex_node_t input = NULL; - if (NULL == scanner) { - return NULL; - } - input = scanner->input; - do { - if (tag == SYNCTEX_TAG(input)) { - return (SYNCTEX_NAME(input)); - } - } while((input = SYNCTEX_SIBLING(input)) != NULL); - return NULL; -} - -int _synctex_scanner_get_tag(synctex_scanner_t scanner,const char * name); -int _synctex_scanner_get_tag(synctex_scanner_t scanner,const char * name) { - synctex_node_t input = NULL; - if (NULL == scanner) { - return 0; - } - input = scanner->input; - do { - if (_synctex_is_equivalent_file_name(name,(SYNCTEX_NAME(input)))) { - return SYNCTEX_TAG(input); - } - } while((input = SYNCTEX_SIBLING(input)) != NULL); - // 2011 version - name = _synctex_base_name(name); - input = scanner->input; - do { - if (_synctex_is_equivalent_file_name(name,_synctex_base_name(SYNCTEX_NAME(input)))) { - synctex_node_t other_input = input; - while((other_input = SYNCTEX_SIBLING(other_input)) != NULL) { - if (_synctex_is_equivalent_file_name(name,_synctex_base_name(SYNCTEX_NAME(other_input))) - && (strlen(SYNCTEX_NAME(input))!=strlen(SYNCTEX_NAME(other_input)) - || strncmp(SYNCTEX_NAME(other_input),SYNCTEX_NAME(input),strlen(SYNCTEX_NAME(input))))) { - // There is a second possible candidate - return 0; - } - } - return SYNCTEX_TAG(input); - } - } while((input = SYNCTEX_SIBLING(input)) != NULL); - return 0; -} - -int synctex_scanner_get_tag(synctex_scanner_t scanner,const char * name) { - size_t char_index = strlen(name); - if ((scanner = synctex_scanner_parse(scanner)) && (0 < char_index)) { - /* the name is not void */ - char_index -= 1; - if (!SYNCTEX_IS_PATH_SEPARATOR(name[char_index])) { - /* the last character of name is not a path separator */ - int result = _synctex_scanner_get_tag(scanner,name); - if (result) { - return result; - } else { - /* the given name was not the one known by TeX - * try a name relative to the enclosing directory of the scanner->output file */ - const char * relative = name; - const char * ptr = scanner->output; - while((strlen(relative) > 0) && (strlen(ptr) > 0) && (*relative == *ptr)) - { - relative += 1; - ptr += 1; - } - /* Find the last path separator before relative */ - while(relative > name) { - if (SYNCTEX_IS_PATH_SEPARATOR(*(relative-1))) { - break; - } - relative -= 1; - } - if ((relative > name) && (result = _synctex_scanner_get_tag(scanner,relative))) { - return result; - } - if (SYNCTEX_IS_PATH_SEPARATOR(name[0])) { - /* No tag found for the given absolute name, - * Try each relative path starting from the shortest one */ - while(0input:NULL; -} -const char * synctex_scanner_get_output_fmt(synctex_scanner_t scanner) { - return NULL != scanner && scanner->output_fmt?scanner->output_fmt:""; -} -const char * synctex_scanner_get_output(synctex_scanner_t scanner) { - return NULL != scanner && scanner->output?scanner->output:""; -} -const char * synctex_scanner_get_synctex(synctex_scanner_t scanner) { - return NULL != scanner && scanner->synctex?scanner->synctex:""; -} -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Public node attributes -# endif -int synctex_node_h(synctex_node_t node){ - if (!node) { - return 0; - } - return SYNCTEX_HORIZ(node); -} -int synctex_node_v(synctex_node_t node){ - if (!node) { - return 0; - } - return SYNCTEX_VERT(node); -} -int synctex_node_width(synctex_node_t node){ - if (!node) { - return 0; - } - return SYNCTEX_WIDTH(node); -} -int synctex_node_box_h(synctex_node_t node){ - if (!node) { - return 0; - } - if (SYNCTEX_IS_BOX(node)) { -result: - return SYNCTEX_HORIZ(node); - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -int synctex_node_box_v(synctex_node_t node){ - if (!node) { - return 0; - } - if (SYNCTEX_IS_BOX(node)) { -result: - return SYNCTEX_VERT(node); - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -int synctex_node_box_width(synctex_node_t node){ - if (!node) { - return 0; - } - if (SYNCTEX_IS_BOX(node)) { -result: - return SYNCTEX_WIDTH(node); - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -int synctex_node_box_height(synctex_node_t node){ - if (!node) { - return 0; - } - if (SYNCTEX_IS_BOX(node)) { -result: - return SYNCTEX_HEIGHT(node); - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -int synctex_node_box_depth(synctex_node_t node){ - if (!node) { - return 0; - } - if (SYNCTEX_IS_BOX(node)) { -result: - return SYNCTEX_DEPTH(node); - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Public node visible attributes -# endif -float synctex_node_visible_h(synctex_node_t node){ - if (!node) { - return 0; - } - return SYNCTEX_HORIZ(node)*node->class->scanner->unit+node->class->scanner->x_offset; -} -float synctex_node_visible_v(synctex_node_t node){ - if (!node) { - return 0; - } - return SYNCTEX_VERT(node)*node->class->scanner->unit+node->class->scanner->y_offset; -} -float synctex_node_visible_width(synctex_node_t node){ - if (!node) { - return 0; - } - return SYNCTEX_WIDTH(node)*node->class->scanner->unit; -} -float synctex_node_box_visible_h(synctex_node_t node){ - if (!node) { - return 0; - } - switch(node->class->type) { - case synctex_node_type_vbox: - case synctex_node_type_void_vbox: - case synctex_node_type_void_hbox: - return SYNCTEX_HORIZ(node)*node->class->scanner->unit+node->class->scanner->x_offset; - case synctex_node_type_hbox: -result: - return SYNCTEX_HORIZ_V(node)*node->class->scanner->unit+node->class->scanner->x_offset; - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -float synctex_node_box_visible_v(synctex_node_t node){ - if (!node) { - return 0; - } - switch(node->class->type) { - case synctex_node_type_vbox: - case synctex_node_type_void_vbox: - case synctex_node_type_void_hbox: - return SYNCTEX_VERT(node)*node->class->scanner->unit+node->class->scanner->y_offset; - case synctex_node_type_hbox: -result: - return SYNCTEX_VERT_V(node)*node->class->scanner->unit+node->class->scanner->y_offset; - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -float synctex_node_box_visible_width(synctex_node_t node){ - if (!node) { - return 0; - } - switch(node->class->type) { - case synctex_node_type_vbox: - case synctex_node_type_void_vbox: - case synctex_node_type_void_hbox: - return SYNCTEX_WIDTH(node)*node->class->scanner->unit; - case synctex_node_type_hbox: -result: - return SYNCTEX_WIDTH_V(node)*node->class->scanner->unit; - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -float synctex_node_box_visible_height(synctex_node_t node){ - if (!node) { - return 0; - } - switch(node->class->type) { - case synctex_node_type_vbox: - case synctex_node_type_void_vbox: - case synctex_node_type_void_hbox: - return SYNCTEX_HEIGHT(node)*node->class->scanner->unit; - case synctex_node_type_hbox: -result: - return SYNCTEX_HEIGHT_V(node)*node->class->scanner->unit; - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -float synctex_node_box_visible_depth(synctex_node_t node){ - if (!node) { - return 0; - } - switch(node->class->type) { - case synctex_node_type_vbox: - case synctex_node_type_void_vbox: - case synctex_node_type_void_hbox: - return SYNCTEX_DEPTH(node)*node->class->scanner->unit; - case synctex_node_type_hbox: -result: - return SYNCTEX_DEPTH_V(node)*node->class->scanner->unit; - } - if ((node = SYNCTEX_PARENT(node)) && (node->class->type != synctex_node_type_sheet)) { - goto result; - } - return 0; -} -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Other public node attributes -# endif - -int synctex_node_page(synctex_node_t node){ - synctex_node_t parent = NULL; - if (!node) { - return -1; - } - parent = SYNCTEX_PARENT(node); - while(parent) { - node = parent; - parent = SYNCTEX_PARENT(node); - } - if (node->class->type == synctex_node_type_sheet) { - return SYNCTEX_PAGE(node); - } - return -1; -} -synctex_charindex_t synctex_node_charindex(synctex_node_t node) { - return node?SYNCTEX_CHARINDEX(node):0; -} -int synctex_node_tag(synctex_node_t node) { - return node?SYNCTEX_TAG(node):-1; -} -int synctex_node_line(synctex_node_t node) { - return node?SYNCTEX_LINE(node):-1; -} -int synctex_node_mean_line(synctex_node_t node) { - return node?(node->class->type==synctex_node_type_hbox?SYNCTEX_MEAN_LINE(node):SYNCTEX_LINE(node)):-1; -} -int synctex_node_child_count(synctex_node_t node) { - return node?(node->class->type==synctex_node_type_hbox?SYNCTEX_NODE_WEIGHT(node):0):-1; -} -int synctex_node_column(synctex_node_t node) { -# ifdef __DARWIN_UNIX03 -# pragma unused(node) -# endif - return -1; -} -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Sheet -# endif - -synctex_node_t synctex_sheet(synctex_scanner_t scanner,int page) { - if (scanner) { - synctex_node_t sheet = scanner->sheet; - while(sheet) { - if (page == SYNCTEX_PAGE(sheet)) { - return sheet; - } - sheet = SYNCTEX_SIBLING(sheet); - } - } - return NULL; -} - -synctex_node_t synctex_sheet_content(synctex_scanner_t scanner,int page) { - if (scanner) { - return SYNCTEX_CHILD(synctex_sheet(scanner,page)); - } - return NULL; -} - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Query -# endif - -int synctex_display_query(synctex_scanner_t scanner,const char * name,int line,int column) { -# ifdef __DARWIN_UNIX03 -# pragma unused(column) -# endif - int tag = synctex_scanner_get_tag(scanner,name); - size_t size = 0; - int friend_index = 0; - int max_line = 0; - synctex_node_t node = NULL; - if (tag == 0) { - printf("SyncTeX Warning: No tag for %s\n",name); - return -1; - } - free(SYNCTEX_START); - SYNCTEX_CUR = SYNCTEX_END = SYNCTEX_START = NULL; - max_line = line < INT_MAX-scanner->number_of_lists ? line+scanner->number_of_lists:INT_MAX; - while(linenumber_of_lists); - if ((node = (scanner->lists_of_friends)[friend_index])) { - do { - if ((synctex_node_type(node)>=synctex_node_type_boundary) - && (tag == SYNCTEX_TAG(node)) - && (line == SYNCTEX_LINE(node))) { - if (SYNCTEX_CUR == SYNCTEX_END) { - size += 16; - SYNCTEX_END = realloc(SYNCTEX_START,size*sizeof(synctex_node_t *)); - SYNCTEX_CUR += SYNCTEX_END - SYNCTEX_START; - SYNCTEX_START = SYNCTEX_END; - SYNCTEX_END = SYNCTEX_START + size*sizeof(synctex_node_t *); - } - *(synctex_node_t *)SYNCTEX_CUR = node; - SYNCTEX_CUR += sizeof(synctex_node_t); - } - } while ((node = SYNCTEX_FRIEND(node))); - if (SYNCTEX_START == NULL) { - /* We did not find any matching boundary, retry with glue or kern */ - node = (scanner->lists_of_friends)[friend_index];/* no need to test it again, already done */ - do { - if ((synctex_node_type(node)>=synctex_node_type_kern) - && (tag == SYNCTEX_TAG(node)) - && (line == SYNCTEX_LINE(node))) { - if (SYNCTEX_CUR == SYNCTEX_END) { - size += 16; - SYNCTEX_END = realloc(SYNCTEX_START,size*sizeof(synctex_node_t *)); - SYNCTEX_CUR += SYNCTEX_END - SYNCTEX_START; - SYNCTEX_START = SYNCTEX_END; - SYNCTEX_END = SYNCTEX_START + size*sizeof(synctex_node_t *); - } - *(synctex_node_t *)SYNCTEX_CUR = node; - SYNCTEX_CUR += sizeof(synctex_node_t); - } - } while ((node = SYNCTEX_FRIEND(node))); - if (SYNCTEX_START == NULL) { - /* We did not find any matching glue or kern, retry with boxes */ - node = (scanner->lists_of_friends)[friend_index];/* no need to test it again, already done */ - do { - if ((tag == SYNCTEX_TAG(node)) - && (line == SYNCTEX_LINE(node))) { - if (SYNCTEX_CUR == SYNCTEX_END) { - size += 16; - SYNCTEX_END = realloc(SYNCTEX_START,size*sizeof(synctex_node_t *)); - SYNCTEX_CUR += SYNCTEX_END - SYNCTEX_START; - SYNCTEX_START = SYNCTEX_END; - SYNCTEX_END = SYNCTEX_START + size*sizeof(synctex_node_t *); - } - *(synctex_node_t *)SYNCTEX_CUR = node; - SYNCTEX_CUR += sizeof(synctex_node_t); - } - } while((node = SYNCTEX_FRIEND(node))); - } - } - SYNCTEX_END = SYNCTEX_CUR; - /* Now reverse the order to have nodes in display order, and then keep just a few nodes. - * Order first the best node. */ - if ((SYNCTEX_START) && (SYNCTEX_END)) { - unsigned int best_match = -1; - unsigned int next_match = -1; - unsigned int best_weight = 0; - synctex_node_t * best_ref = NULL; - synctex_node_t * start_ref = (synctex_node_t *)SYNCTEX_START; - synctex_node_t * end_ref = (synctex_node_t *)SYNCTEX_END; - --end_ref; - while (start_ref < end_ref) { - node = *start_ref; - *start_ref = *end_ref; - *end_ref = node; - ++start_ref; - --end_ref; - } - /* Now reorder the nodes to put first the one which fits best. - * The idea is to walk along the list of nodes and pick up the first one - * which line info is exactly the mean line of its parent, or at least very close. - * Then we choose among all such node the one with the maximum number of child nodes. - * Then we switch with the first node. - */ - best_ref = start_ref = (synctex_node_t *)SYNCTEX_START; - node = *start_ref; - best_match = abs(SYNCTEX_LINE(node)-SYNCTEX_MEAN_LINE(SYNCTEX_PARENT(node))); - end_ref = (synctex_node_t *)SYNCTEX_END; - while (++start_refbest_weight)) { - best_match = next_match; - best_ref = start_ref; - best_weight = SYNCTEX_NODE_WEIGHT(parent); - } - } - node = *best_ref; - *best_ref = *(synctex_node_t *)SYNCTEX_START; - *(synctex_node_t *)SYNCTEX_START = node; - /* Basically, we keep the first node for each parent. - * More precisely, we keep only nodes that are not children of - * their predecessor's parent. */ - start_ref = (synctex_node_t *)SYNCTEX_START; - end_ref = (synctex_node_t *)SYNCTEX_START; -next_end: - end_ref += 1; /* we allways have start_ref<= end_ref*/ - if (end_ref < (synctex_node_t *)SYNCTEX_END) { - node = *end_ref; - while ((node = SYNCTEX_PARENT(node))) { - if (SYNCTEX_PARENT(*start_ref) == node) { - goto next_end; - } - } - start_ref += 1; - *start_ref = *end_ref; - goto next_end; - } - start_ref += 1; - SYNCTEX_END = (char *)start_ref; - SYNCTEX_CUR = NULL;// added on behalf of Jose Alliste - return (SYNCTEX_END-SYNCTEX_START)/sizeof(synctex_node_t);// added on behalf Jan Sundermeyer - } - SYNCTEX_CUR = NULL; - // return (SYNCTEX_END-SYNCTEX_START)/sizeof(synctex_node_t); removed on behalf Jan Sundermeyer - } -# if defined(__SYNCTEX_STRONG_DISPLAY_QUERY__) - break; -# else - ++line; -# endif - } - return 0; -} - -synctex_node_t synctex_next_result(synctex_scanner_t scanner) { - if (NULL == SYNCTEX_CUR) { - SYNCTEX_CUR = SYNCTEX_START; - } else { - SYNCTEX_CUR+=sizeof(synctex_node_t); - } - if (SYNCTEX_CUR= scanner->unit) {/* scanner->unit must be >0 */ - return 0; - } - /* Convert the given point to scanner integer coordinates */ - hitPoint.h = (h-scanner->x_offset)/scanner->unit; - hitPoint.v = (v-scanner->y_offset)/scanner->unit; - /* We will store in the scanner's buffer the result of the query. */ - free(SYNCTEX_START); - SYNCTEX_START = SYNCTEX_END = SYNCTEX_CUR = NULL; - /* Find the proper sheet */ - sheet = scanner->sheet; - while((sheet) && SYNCTEX_PAGE(sheet) != page) { - sheet = SYNCTEX_SIBLING(sheet); - } - if (NULL == sheet) { - return -1; - } - /* Now sheet points to the sheet node with proper page number */ - /* Here is how we work: - * At first we do not consider the visible box dimensions. This will cover the most frequent cases. - * Then we try with the visible box dimensions. - * We try to find a non void box containing the hit point. - * We browse all the horizontal boxes until we find one containing the hit point. */ - if ((node = SYNCTEX_NEXT_hbox(sheet))) { - do { - if (_synctex_point_in_box(hitPoint,node,synctex_YES)) { - /* Maybe the hitPoint belongs to a contained vertical box. */ -end: - /* This trick is for catching overlapping boxes */ - if ((other_node = SYNCTEX_NEXT_hbox(node))) { - do { - if (_synctex_point_in_box(hitPoint,other_node,synctex_YES)) { - node = _synctex_smallest_container(other_node,node); - } - } while((other_node = SYNCTEX_NEXT_hbox(other_node))); - } - /* node is the smallest horizontal box that contains hitPoint. */ - if ((bestContainer = _synctex_eq_deepest_container(hitPoint,node,synctex_YES))) { - node = bestContainer; - } - _synctex_eq_get_closest_children_in_box(hitPoint,node,&bestNodes,&bestDistances,synctex_YES); - if (bestNodes.right && bestNodes.left) { - if ((SYNCTEX_TAG(bestNodes.right)!=SYNCTEX_TAG(bestNodes.left)) - || (SYNCTEX_LINE(bestNodes.right)!=SYNCTEX_LINE(bestNodes.left)) - || (SYNCTEX_COLUMN(bestNodes.right)!=SYNCTEX_COLUMN(bestNodes.left))) { - if ((SYNCTEX_START = malloc(2*sizeof(synctex_node_t)))) { - if (bestDistances.left>bestDistances.right) { - ((synctex_node_t *)SYNCTEX_START)[0] = bestNodes.right; - ((synctex_node_t *)SYNCTEX_START)[1] = bestNodes.left; - } else { - ((synctex_node_t *)SYNCTEX_START)[0] = bestNodes.left; - ((synctex_node_t *)SYNCTEX_START)[1] = bestNodes.right; - } - SYNCTEX_END = SYNCTEX_START + 2*sizeof(synctex_node_t); - SYNCTEX_CUR = NULL; - return (SYNCTEX_END-SYNCTEX_START)/sizeof(synctex_node_t); - } - return SYNCTEX_STATUS_ERROR; - } - /* both nodes have the same input coordinates - * We choose the one closest to the hit point */ - if (bestDistances.left>bestDistances.right) { - bestNodes.left = bestNodes.right; - } - bestNodes.right = NULL; - } else if (bestNodes.right) { - bestNodes.left = bestNodes.right; - } else if (!bestNodes.left){ - bestNodes.left = node; - } - if ((SYNCTEX_START = malloc(sizeof(synctex_node_t)))) { - * (synctex_node_t *)SYNCTEX_START = bestNodes.left; - SYNCTEX_END = SYNCTEX_START + sizeof(synctex_node_t); - SYNCTEX_CUR = NULL; - return (SYNCTEX_END-SYNCTEX_START)/sizeof(synctex_node_t); - } - return SYNCTEX_STATUS_ERROR; - } - } while ((node = SYNCTEX_NEXT_hbox(node))); - /* All the horizontal boxes have been tested, - * None of them contains the hit point. - */ - } - /* We are not lucky */ - if ((node = SYNCTEX_CHILD(sheet))) { - goto end; - } - return 0; -} - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Utilities -# endif - -int _synctex_bail(void) { - _synctex_error("SyncTeX ERROR\n"); - return -1; -} -/* Rougly speaking, this is: - * node's h coordinate - hitPoint's h coordinate. - * If node is to the right of the hit point, then this distance is positive, - * if node is to the left of the hit point, this distance is negative.*/ -int _synctex_point_h_distance(synctex_point_t hitPoint, synctex_node_t node, synctex_bool_t visible); -int _synctex_point_h_distance(synctex_point_t hitPoint, synctex_node_t node, synctex_bool_t visible) { - if (node) { - int min,med,max; - switch(node->class->type) { - /* The distance between a point and a box is special. - * It is not the euclidian distance, nor something similar. - * We have to take into account the particular layout, - * and the box hierarchy. - * Given a box, there are 9 regions delimited by the lines of the edges of the box. - * The origin being at the top left corner of the page, - * we also give names to the vertices of the box. - * - * 1 | 2 | 3 - * ---A---B---> - * 4 | 5 | 6 - * ---C---D---> - * 7 | 8 | 9 - * v v - */ - case synctex_node_type_hbox: - /* getting the box bounds, taking into account negative width, height and depth. */ - min = visible?SYNCTEX_HORIZ_V(node):SYNCTEX_HORIZ(node); - max = min + (visible?SYNCTEX_ABS_WIDTH_V(node):SYNCTEX_ABS_WIDTH(node)); - /* We allways have min <= max */ - if (hitPoint.h 0 */ - } else if (hitPoint.h>max) { - return max - hitPoint.h; /* regions 3+6+9, result is < 0 */ - } else { - return 0; /* regions 2+5+8, inside the box, except for vertical coordinates */ - } - break; - case synctex_node_type_vbox: - case synctex_node_type_void_vbox: - case synctex_node_type_void_hbox: - /* getting the box bounds, taking into account negative width, height and depth. - * For these boxes, no visible dimension available */ - min = SYNCTEX_HORIZ(node); - max = min + SYNCTEX_ABS_WIDTH(node); - /* We allways have min <= max */ - if (hitPoint.h 0 */ - } else if (hitPoint.h>max) { - return max - hitPoint.h; /* regions 3+6+9, result is < 0 */ - } else { - return 0; /* regions 2+5+8, inside the box, except for vertical coordinates */ - } - break; - case synctex_node_type_kern: - /* IMPORTANT NOTICE: the location of the kern is recorded AFTER the move. - * The distance to the kern is very special, - * in general, there is no text material in the kern, - * this is why we compute the offset relative to the closest edge of the kern.*/ - max = SYNCTEX_WIDTH(node); - if (max<0) { - min = SYNCTEX_HORIZ(node); - max = min - max; - } else { - min = -max; - max = SYNCTEX_HORIZ(node); - min += max; - } - med = (min+max)/2; - /* positive kern: '.' means text, '>' means kern offset - * ............. - * min>>>>med>>>>max - * ............... - * negative kern: '.' means text, '<' means kern offset - * ............................ - * min<<<max) { - return max - hitPoint.h - 1; /* same kind of penalty */ - } else if (hitPoint.h>med) { - /* do things like if the node had 0 width and was placed at the max edge + 1*/ - return max - hitPoint.h + 1; /* positive, the kern is to the right of the hitPoint */ - } else { - return min - hitPoint.h - 1; /* negative, the kern is to the left of the hitPoint */ - } - case synctex_node_type_glue: - case synctex_node_type_math: - return SYNCTEX_HORIZ(node) - hitPoint.h; - } - } - return INT_MAX;/* We always assume that the node is faraway to the right*/ -} -/* Rougly speaking, this is: - * node's v coordinate - hitPoint's v coordinate. - * If node is at the top of the hit point, then this distance is positive, - * if node is at the bottom of the hit point, this distance is negative.*/ -int _synctex_point_v_distance(synctex_point_t hitPoint, synctex_node_t node,synctex_bool_t visible); -int _synctex_point_v_distance(synctex_point_t hitPoint, synctex_node_t node,synctex_bool_t visible) { -# ifdef __DARWIN_UNIX03 -# pragma unused(visible) -# endif - if (node) { - int min,max; - switch(node->class->type) { - /* The distance between a point and a box is special. - * It is not the euclidian distance, nor something similar. - * We have to take into account the particular layout, - * and the box hierarchy. - * Given a box, there are 9 regions delimited by the lines of the edges of the box. - * The origin being at the top left corner of the page, - * we also give names to the vertices of the box. - * - * 1 | 2 | 3 - * ---A---B---> - * 4 | 5 | 6 - * ---C---D---> - * 7 | 8 | 9 - * v v - */ - case synctex_node_type_hbox: - /* getting the box bounds, taking into account negative width, height and depth. */ - min = SYNCTEX_VERT_V(node); - max = min + SYNCTEX_ABS_DEPTH_V(node); - min -= SYNCTEX_ABS_HEIGHT_V(node); - /* We allways have min <= max */ - if (hitPoint.v 0 */ - } else if (hitPoint.v>max) { - return max - hitPoint.v; /* regions 7+8+9, result is < 0 */ - } else { - return 0; /* regions 4.5.6, inside the box, except for horizontal coordinates */ - } - break; - case synctex_node_type_vbox: - case synctex_node_type_void_vbox: - case synctex_node_type_void_hbox: - /* getting the box bounds, taking into account negative width, height and depth. */ - min = SYNCTEX_VERT(node); - max = min + SYNCTEX_ABS_DEPTH(node); - min -= SYNCTEX_ABS_HEIGHT(node); - /* We allways have min <= max */ - if (hitPoint.v 0 */ - } else if (hitPoint.v>max) { - return max - hitPoint.v; /* regions 7+8+9, result is < 0 */ - } else { - return 0; /* regions 4.5.6, inside the box, except for horizontal coordinates */ - } - break; - case synctex_node_type_kern: - case synctex_node_type_glue: - case synctex_node_type_math: - return SYNCTEX_VERT(node) - hitPoint.v; - } - } - return INT_MAX;/* We always assume that the node is faraway to the top*/ -} - -SYNCTEX_INLINE static synctex_node_t _synctex_smallest_container(synctex_node_t node, synctex_node_t other_node) { - float height, other_height; - if (SYNCTEX_ABS_WIDTH(node)SYNCTEX_ABS_WIDTH(other_node)) { - return other_node; - } - height = SYNCTEX_ABS_DEPTH(node) + SYNCTEX_ABS_HEIGHT(node); - other_height = SYNCTEX_ABS_DEPTH(other_node) + SYNCTEX_ABS_HEIGHT(other_node); - if (heightother_height) { - return other_node; - } - return node; -} - -synctex_bool_t _synctex_point_in_box(synctex_point_t hitPoint, synctex_node_t node, synctex_bool_t visible) { - if (node) { - if (0 == _synctex_point_h_distance(hitPoint,node,visible) - && 0 == _synctex_point_v_distance(hitPoint,node,visible)) { - return synctex_YES; - } - } - return synctex_NO; -} - -int _synctex_node_distance_to_point(synctex_point_t hitPoint, synctex_node_t node, synctex_bool_t visible) { -# ifdef __DARWIN_UNIX03 -# pragma unused(visible) -# endif - int result = INT_MAX; /* when the distance is meaning less (sheet, input...) */ - if (node) { - int minH,maxH,minV,maxV; - switch(node->class->type) { - /* The distance between a point and a box is special. - * It is not the euclidian distance, nor something similar. - * We have to take into account the particular layout, - * and the box hierarchy. - * Given a box, there are 9 regions delimited by the lines of the edges of the box. - * The origin being at the top left corner of the page, - * we also give names to the vertices of the box. - * - * 1 | 2 | 3 - * ---A---B---> - * 4 | 5 | 6 - * ---C---D---> - * 7 | 8 | 9 - * v v - * In each region, there is a different formula. - * In the end we have a continuous distance which may not be a mathematical distance but who cares. */ - case synctex_node_type_vbox: - case synctex_node_type_void_vbox: - case synctex_node_type_hbox: - case synctex_node_type_void_hbox: - /* getting the box bounds, taking into account negative widths. */ - minH = SYNCTEX_HORIZ(node); - maxH = minH + SYNCTEX_ABS_WIDTH(node); - minV = SYNCTEX_VERT(node); - maxV = minV + SYNCTEX_ABS_DEPTH(node); - minV -= SYNCTEX_ABS_HEIGHT(node); - /* In what region is the point hitPoint=(H,V) ? */ - if (hitPoint.vminV) { - result = hitPoint.v - minV + minH - hitPoint.h; - } else { - result = minV - hitPoint.v + minH - hitPoint.h; - } - } else if (hitPoint.h>maxH) { - if (hitPoint.v>minV) { - result = hitPoint.v - minV + hitPoint.h - maxH; - } else { - result = minV - hitPoint.v + hitPoint.h - maxH; - } - } else if (hitPoint.v>minV) { - result = hitPoint.v - minV; - } else { - result = minV - hitPoint.v; - } - break; - case synctex_node_type_glue: - case synctex_node_type_math: - minH = SYNCTEX_HORIZ(node); - minV = SYNCTEX_VERT(node); - if (hitPoint.hminV) { - result = hitPoint.v - minV + minH - hitPoint.h; - } else { - result = minV - hitPoint.v + minH - hitPoint.h; - } - } else if (hitPoint.v>minV) { - result = hitPoint.v - minV + hitPoint.h - minH; - } else { - result = minV - hitPoint.v + hitPoint.h - minH; - } - break; - } - } - return result; -} - -static synctex_node_t _synctex_eq_deepest_container(synctex_point_t hitPoint,synctex_node_t node, synctex_bool_t visible) { - if (node) { - synctex_node_t result = NULL; - synctex_node_t child = NULL; - switch(node->class->type) { - case synctex_node_type_vbox: - case synctex_node_type_hbox: - /* test the deep nodes first */ - if ((child = SYNCTEX_CHILD(node))) { - do { - if ((result = _synctex_eq_deepest_container(hitPoint,child,visible))) { - return result; - } - } while((child = SYNCTEX_SIBLING(child))); - } - /* is the hit point inside the box? */ - if (_synctex_point_in_box(hitPoint,node,visible)) { - /* for vboxes we try to use some node inside. - * Walk through the list of siblings until we find the closest one. - * Only consider siblings with children. */ - if ((node->class->type == synctex_node_type_vbox) && (child = SYNCTEX_CHILD(node))) { - int bestDistance = INT_MAX; - do { - if (SYNCTEX_CHILD(child)) { - int distance = _synctex_node_distance_to_point(hitPoint,child,visible); - if (distance < bestDistance) { - bestDistance = distance; - node = child; - } - } - } while((child = SYNCTEX_SIBLING(child))); - } - return node; - } - } - } - return NULL; -} - -/* Compares the locations of the hitPoint with the locations of the various nodes contained in the box. - * As it is an horizontal box, we only compare horizontal coordinates. */ -SYNCTEX_INLINE static int __synctex_eq_get_closest_children_in_hbox(synctex_point_t hitPoint, synctex_node_t node, synctex_node_set_t* bestNodesRef,synctex_distances_t* bestDistancesRef, synctex_bool_t visible); -SYNCTEX_INLINE static int __synctex_eq_get_closest_children_in_hbox(synctex_point_t hitPoint, synctex_node_t node, synctex_node_set_t* bestNodesRef,synctex_distances_t* bestDistancesRef, synctex_bool_t visible) { - int result = 0; - if ((node = SYNCTEX_CHILD(node))) { - do { - int off7 = _synctex_point_h_distance(hitPoint,node,visible); - if (off7 > 0) { - /* node is to the right of the hit point. - * We compare node and the previously recorded one, through the recorded distance. - * If the nodes have the same tag, prefer the one with the smallest line number, - * if the nodes also have the same line number, prefer the one with the smallest column. */ - if (bestDistancesRef->right > off7) { - bestDistancesRef->right = off7; - bestNodesRef->right = node; - result |= SYNCTEX_MASK_RIGHT; - } else if (bestDistancesRef->right == off7 && bestNodesRef->right) { - if (SYNCTEX_TAG(bestNodesRef->right) == SYNCTEX_TAG(node) - && (SYNCTEX_LINE(bestNodesRef->right) > SYNCTEX_LINE(node) - || (SYNCTEX_LINE(bestNodesRef->right) == SYNCTEX_LINE(node) - && SYNCTEX_COLUMN(bestNodesRef->right) > SYNCTEX_COLUMN(node)))) { - bestNodesRef->right = node; - result |= SYNCTEX_MASK_RIGHT; - } - } - } else if (off7 == 0) { - /* hitPoint is inside node. */ - bestDistancesRef->left = bestDistancesRef->right = 0; - bestNodesRef->left = node; - bestNodesRef->right = NULL; - result |= SYNCTEX_MASK_LEFT; - } else { /* here off7 < 0, hitPoint is to the right of node */ - off7 = -off7; - if (bestDistancesRef->left > off7) { - bestDistancesRef->left = off7; - bestNodesRef->left = node; - result |= SYNCTEX_MASK_LEFT; - } else if (bestDistancesRef->left == off7 && bestNodesRef->left) { - if (SYNCTEX_TAG(bestNodesRef->left) == SYNCTEX_TAG(node) - && (SYNCTEX_LINE(bestNodesRef->left) > SYNCTEX_LINE(node) - || (SYNCTEX_LINE(bestNodesRef->left) == SYNCTEX_LINE(node) - && SYNCTEX_COLUMN(bestNodesRef->left) > SYNCTEX_COLUMN(node)))) { - bestNodesRef->left = node; - result |= SYNCTEX_MASK_LEFT; - } - } - } - } while((node = SYNCTEX_SIBLING(node))); - if (result & SYNCTEX_MASK_LEFT) { - /* the left node is new, try to narrow the result */ - if ((node = _synctex_eq_deepest_container(hitPoint,bestNodesRef->left,visible))) { - bestNodesRef->left = node; - } - if ((node = _synctex_eq_closest_child(hitPoint,bestNodesRef->left,visible))) { - bestNodesRef->left = node; - } - } - if (result & SYNCTEX_MASK_RIGHT) { - /* the right node is new, try to narrow the result */ - if ((node = _synctex_eq_deepest_container(hitPoint,bestNodesRef->right,visible))) { - bestNodesRef->right = node; - } - if ((node = _synctex_eq_closest_child(hitPoint,bestNodesRef->right,visible))) { - bestNodesRef->right = node; - } - } - } - return result; -} -SYNCTEX_INLINE static int __synctex_eq_get_closest_children_in_vbox(synctex_point_t hitPoint, synctex_node_t node, synctex_node_set_t* bestNodesRef,synctex_distances_t* bestDistancesRef,synctex_bool_t visible); -SYNCTEX_INLINE static int __synctex_eq_get_closest_children_in_vbox(synctex_point_t hitPoint, synctex_node_t node, synctex_node_set_t* bestNodesRef,synctex_distances_t* bestDistancesRef,synctex_bool_t visible) { - int result = 0; - if ((node = SYNCTEX_CHILD(node))) { - do { - int off7 = _synctex_point_v_distance(hitPoint,node,visible);/* this is what makes the difference with the h version above */ - if (off7 > 0) { - /* node is to the top of the hit point (below because TeX is oriented from top to bottom. - * We compare node and the previously recorded one, through the recorded distance. - * If the nodes have the same tag, prefer the one with the smallest line number, - * if the nodes also have the same line number, prefer the one with the smallest column. */ - if (bestDistancesRef->right > off7) { - bestDistancesRef->right = off7; - bestNodesRef->right = node; - result |= SYNCTEX_MASK_RIGHT; - } else if (bestDistancesRef->right == off7 && bestNodesRef->right) { - if (SYNCTEX_TAG(bestNodesRef->right) == SYNCTEX_TAG(node) - && (SYNCTEX_LINE(bestNodesRef->right) > SYNCTEX_LINE(node) - || (SYNCTEX_LINE(bestNodesRef->right) == SYNCTEX_LINE(node) - && SYNCTEX_COLUMN(bestNodesRef->right) > SYNCTEX_COLUMN(node)))) { - bestNodesRef->right = node; - result |= SYNCTEX_MASK_RIGHT; - } - } - } else if (off7 == 0) { - bestDistancesRef->left = bestDistancesRef->right = 0; - bestNodesRef->left = node; - bestNodesRef->right = NULL; - result |= SYNCTEX_MASK_LEFT; - } else { /* here off7 < 0 */ - off7 = -off7; - if (bestDistancesRef->left > off7) { - bestDistancesRef->left = off7; - bestNodesRef->left = node; - result |= SYNCTEX_MASK_LEFT; - } else if (bestDistancesRef->left == off7 && bestNodesRef->left) { - if (SYNCTEX_TAG(bestNodesRef->left) == SYNCTEX_TAG(node) - && (SYNCTEX_LINE(bestNodesRef->left) > SYNCTEX_LINE(node) - || (SYNCTEX_LINE(bestNodesRef->left) == SYNCTEX_LINE(node) - && SYNCTEX_COLUMN(bestNodesRef->left) > SYNCTEX_COLUMN(node)))) { - bestNodesRef->left = node; - result |= SYNCTEX_MASK_LEFT; - } - } - } - } while((node = SYNCTEX_SIBLING(node))); - if (result & SYNCTEX_MASK_LEFT) { - /* the left node is new, try to narrow the result */ - if ((node = _synctex_eq_deepest_container(hitPoint,bestNodesRef->left,visible))) { - bestNodesRef->left = node; - } - if ((node = _synctex_eq_closest_child(hitPoint,bestNodesRef->left,visible))) { - bestNodesRef->left = node; - } - } - if (result & SYNCTEX_MASK_RIGHT) { - /* the right node is new, try to narrow the result */ - if ((node = _synctex_eq_deepest_container(hitPoint,bestNodesRef->right,visible))) { - bestNodesRef->right = node; - } - if ((node = _synctex_eq_closest_child(hitPoint,bestNodesRef->right,visible))) { - bestNodesRef->right = node; - } - } - } - return result; -} -SYNCTEX_INLINE static int _synctex_eq_get_closest_children_in_box(synctex_point_t hitPoint, synctex_node_t node, synctex_node_set_t* bestNodesRef,synctex_distances_t* bestDistancesRef,synctex_bool_t visible) { - if (node) { - switch(node->class->type) { - case synctex_node_type_hbox: - return __synctex_eq_get_closest_children_in_hbox(hitPoint, node, bestNodesRef, bestDistancesRef,visible); - case synctex_node_type_vbox: - return __synctex_eq_get_closest_children_in_vbox(hitPoint, node, bestNodesRef, bestDistancesRef,visible); - } - } - return 0; -} - -SYNCTEX_INLINE static synctex_node_t __synctex_eq_closest_child(synctex_point_t hitPoint, synctex_node_t node,int* distanceRef, synctex_bool_t visible); -SYNCTEX_INLINE static synctex_node_t __synctex_eq_closest_child(synctex_point_t hitPoint, synctex_node_t node,int* distanceRef, synctex_bool_t visible) { - synctex_node_t best_node = NULL; - if ((node = SYNCTEX_CHILD(node))) { - do { - int distance = _synctex_node_distance_to_point(hitPoint,node,visible); - synctex_node_t candidate = NULL; - if (distance<=*distanceRef) { - *distanceRef = distance; - best_node = node; - } - switch(node->class->type) { - case synctex_node_type_vbox: - case synctex_node_type_hbox: - if ((candidate = __synctex_eq_closest_child(hitPoint,node,distanceRef,visible))) { - best_node = candidate; - } - } - } while((node = SYNCTEX_SIBLING(node))); - } - return best_node; -} -SYNCTEX_INLINE static synctex_node_t _synctex_eq_closest_child(synctex_point_t hitPoint,synctex_node_t node, synctex_bool_t visible) { - if (node) { - switch(node->class->type) { - case synctex_node_type_hbox: - case synctex_node_type_vbox: - { - int best_distance = INT_MAX; - synctex_node_t best_node = __synctex_eq_closest_child(hitPoint,node,&best_distance,visible); - if ((best_node)) { - synctex_node_t child = NULL; - switch(best_node->class->type) { - case synctex_node_type_vbox: - case synctex_node_type_hbox: - if ((child = SYNCTEX_CHILD(best_node))) { - best_distance = _synctex_node_distance_to_point(hitPoint,child,visible); - while((child = SYNCTEX_SIBLING(child))) { - int distance = _synctex_node_distance_to_point(hitPoint,child,visible); - if (distance<=best_distance) { - best_distance = distance; - best_node = child; - } - } - } - } - } - return best_node; - } - } - } - return NULL; -} - -# ifdef SYNCTEX_NOTHING -# pragma mark - -# pragma mark Updater -# endif - -typedef int (*synctex_fprintf_t)(void *, const char * , ...); /* print formatted to either FILE * or gzFile */ - -# define SYNCTEX_BITS_PER_BYTE 8 - -struct __synctex_updater_t { - gzFile file; /* the foo.synctex or foo.synctex.gz I/O identifier */ - synctex_fprintf_t fprintf; /* either fprintf or gzprintf */ - int length; /* the number of chars appended */ - struct _flags { - unsigned int no_gz:1; /* Whether zlib is used or not */ - unsigned int reserved:SYNCTEX_BITS_PER_BYTE*sizeof(int)-1; /* Align */ - } flags; -}; -# define SYNCTEX_FILE updater->file -# define SYNCTEX_NO_GZ ((updater->flags).no_gz) -# define SYNCTEX_fprintf (*(updater->fprintf)) - -synctex_updater_t synctex_updater_new_with_output_file(const char * output, const char * build_directory) { - synctex_updater_t updater = NULL; - char * synctex = NULL; - synctex_io_mode_t io_mode = 0; - const char * mode = NULL; - /* prepare the updater, the memory is the only one dynamically allocated */ - updater = (synctex_updater_t)_synctex_malloc(sizeof(synctex_updater_t)); - if (NULL == updater) { - _synctex_error("! synctex_updater_new_with_file: malloc problem"); - return NULL; - } - if (_synctex_open(output,build_directory,&synctex,&SYNCTEX_FILE,synctex_ADD_QUOTES,&io_mode) - && _synctex_open(output,build_directory,&synctex,&SYNCTEX_FILE,synctex_DONT_ADD_QUOTES,&io_mode)) { -return_on_error: - free(updater); - updater = NULL; - return NULL; - } - /* OK, the file exists, we close it and reopen it with the correct mode. - * The receiver is now the owner of the "synctex" variable. */ - gzclose(SYNCTEX_FILE); - SYNCTEX_FILE = NULL; - SYNCTEX_NO_GZ = (io_mode&synctex_io_gz_mask)?synctex_NO:synctex_YES; - mode = _synctex_get_io_mode_name(io_mode|synctex_io_append_mask);/* either "a" or "ab", depending on the file extension */ - if (SYNCTEX_NO_GZ) { - if (NULL == (SYNCTEX_FILE = (void *)fopen(synctex,mode))) { -no_write_error: - _synctex_error("! synctex_updater_new_with_file: Can't append to %s",synctex); - free(synctex); - goto return_on_error; - } - updater->fprintf = (synctex_fprintf_t)(&fprintf); - } else { - if (NULL == (SYNCTEX_FILE = (void *)gzopen(synctex,mode))) { - goto no_write_error; - } - updater->fprintf = (synctex_fprintf_t)(&gzprintf); - } - printf("SyncTeX: updating %s...",synctex); - free(synctex); - return updater; -} - - -void synctex_updater_append_magnification(synctex_updater_t updater, char * magnification){ - if (NULL==updater) { - return; - } - if (magnification && strlen(magnification)) { - updater->length += SYNCTEX_fprintf(SYNCTEX_FILE,"Magnification:%s\n",magnification); - } -} - -void synctex_updater_append_x_offset(synctex_updater_t updater, char * x_offset){ - if (NULL==updater) { - return; - } - if (x_offset && strlen(x_offset)) { - updater->length += SYNCTEX_fprintf(SYNCTEX_FILE,"X Offset:%s\n",x_offset); - } -} - -void synctex_updater_append_y_offset(synctex_updater_t updater, char * y_offset){ - if (NULL==updater) { - return; - } - if (y_offset && strlen(y_offset)) { - updater->length += SYNCTEX_fprintf(SYNCTEX_FILE,"Y Offset:%s\n",y_offset); - } -} - -void synctex_updater_free(synctex_updater_t updater){ - if (NULL==updater) { - return; - } - if (updater->length>0) { - SYNCTEX_fprintf(SYNCTEX_FILE,"!%i\n",updater->length); - } - if (SYNCTEX_NO_GZ) { - fclose((FILE *)SYNCTEX_FILE); - } else { - gzclose((gzFile)SYNCTEX_FILE); - } - free(updater); - printf("... done.\n"); - return; -} diff --git a/zathura/synctex/synctex_parser.h b/zathura/synctex/synctex_parser.h deleted file mode 100644 index 3151707..0000000 --- a/zathura/synctex/synctex_parser.h +++ /dev/null @@ -1,360 +0,0 @@ -/* -Copyright (c) 2008, 2009, 2010 , 2011 jerome DOT laurens AT u-bourgogne DOT fr - -This file is part of the SyncTeX package. - -Latest Revision: Tue Jun 14 08:23:30 UTC 2011 - -Version: 1.17 - -See synctex_parser_readme.txt for more details - -License: --------- -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE - -Except as contained in this notice, the name of the copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in this Software without prior written -authorization from the copyright holder. - -Acknowledgments: ----------------- -The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh, -and significant help from XeTeX developer Jonathan Kew - -Nota Bene: ----------- -If you include or use a significant part of the synctex package into a software, -I would appreciate to be listed as contributor and see "SyncTeX" highlighted. - -Version 1 -Thu Jun 19 09:39:21 UTC 2008 - -*/ - -#ifndef __SYNCTEX_PARSER__ -# define __SYNCTEX_PARSER__ - -#ifdef __cplusplus -extern "C" { -#endif - -/* synctex_node_t is the type for all synctex nodes. - * The synctex file is parsed into a tree of nodes, either sheet, boxes, math nodes... */ -typedef struct _synctex_node * synctex_node_t; - -/* The main synctex object is a scanner - * Its implementation is considered private. - * The basic workflow is - * - create a "synctex scanner" with the contents of a file - * - perform actions on that scanner like display or edit queries - * - free the scanner when the work is done - */ -typedef struct __synctex_scanner_t _synctex_scanner_t; -typedef _synctex_scanner_t * synctex_scanner_t; - -/* This is the designated method to create a new synctex scanner object. - * output is the pdf/dvi/xdv file associated to the synctex file. - * If necessary, it can be the tex file that originated the synctex file - * but this might cause problems if the \jobname has a custom value. - * Despite this method can accept a relative path in practice, - * you should only pass a full path name. - * The path should be encoded by the underlying file system, - * assuming that it is based on 8 bits characters, including UTF8, - * not 16 bits nor 32 bits. - * The last file extension is removed and replaced by the proper extension. - * Then the private method _synctex_scanner_new_with_contents_of_file is called. - * NULL is returned in case of an error or non existent file. - * Once you have a scanner, use the synctex_display_query and synctex_edit_query below. - * The new "build_directory" argument is available since version 1.5. - * It is the directory where all the auxiliary stuff is created. - * Sometimes, the synctex output file and the pdf, dvi or xdv files are not created in the same directory. - * This is the case in MikTeX (I will include this into TeX Live). - * This directory path can be nil, it will be ignored then. - * It can be either absolute or relative to the directory of the output pdf (dvi or xdv) file. - * If no synctex file is found in the same directory as the output file, then we try to find one in the build directory. - * Please note that this new "build_directory" is provided as a convenient argument but should not be used. - * In fact, this is implempented as a work around of a bug in MikTeX where the synctex file does not follow the pdf file. - * The new "parse" argument is available since version 1.5. In general, use 1. - * Use 0 only if you do not want to parse the content but just check the existence. - */ -synctex_scanner_t synctex_scanner_new_with_output_file(const char * output, const char * build_directory, int parse); - -/* This is the designated method to delete a synctex scanner object. - * Frees all the memory, you must call it when you are finished with the scanner. - */ -void synctex_scanner_free(synctex_scanner_t scanner); - -/* Send this message to force the scanner to parse the contents of the synctex output file. - * Nothing is performed if the file was already parsed. - * In each query below, this message is sent, but if you need to access information more directly, - * you must be sure that the parsing did occur. - * Usage: - * if((my_scanner = synctex_scanner_parse(my_scanner))) { - * continue with my_scanner... - * } else { - * there was a problem - * } - */ -synctex_scanner_t synctex_scanner_parse(synctex_scanner_t scanner); - -/* The main entry points. - * Given the file name, a line and a column number, synctex_display_query returns the number of nodes - * satisfying the contrain. Use code like - * - * if(synctex_display_query(scanner,name,line,column)>0) { - * synctex_node_t node; - * while((node = synctex_next_result(scanner))) { - * // do something with node - * ... - * } - * } - * - * For example, one can - * - highlight each resulting node in the output, using synctex_node_h and synctex_node_v - * - highlight all the rectangles enclosing those nodes, using synctex_box_... functions - * - highlight just the character using that information - * - * Given the page and the position in the page, synctex_edit_query returns the number of nodes - * satisfying the contrain. Use code like - * - * if(synctex_edit_query(scanner,page,h,v)>0) { - * synctex_node_t node; - * while(node = synctex_next_result(scanner)) { - * // do something with node - * ... - * } - * } - * - * For example, one can - * - highlight each resulting line in the input, - * - highlight just the character using that information - * - * page is 1 based - * h and v are coordinates in 72 dpi unit, relative to the top left corner of the page. - * If you make a new query, the result of the previous one is discarded. - * If one of this function returns a non positive integer, - * it means that an error occurred. - * - * Both methods are conservative, in the sense that matching is weak. - * If the exact column number is not found, there will be an answer with the whole line. - * - * Sumatra-PDF, Skim, iTeXMac2 and Texworks are examples of open source software that use this library. - * You can browse their code for a concrete implementation. - */ -int synctex_display_query(synctex_scanner_t scanner,const char * name,int line,int column); -int synctex_edit_query(synctex_scanner_t scanner,int page,float h,float v); -synctex_node_t synctex_next_result(synctex_scanner_t scanner); - -/* Display all the information contained in the scanner object. - * If the records are too numerous, only the first ones are displayed. - * This is mainly for informatinal purpose to help developers. - */ -void synctex_scanner_display(synctex_scanner_t scanner); - -/* The x and y offset of the origin in TeX coordinates. The magnification - These are used by pdf viewers that want to display the real box size. - For example, getting the horizontal coordinates of a node would require - synctex_node_box_h(node)*synctex_scanner_magnification(scanner)+synctex_scanner_x_offset(scanner) - Getting its TeX width would simply require - synctex_node_box_width(node)*synctex_scanner_magnification(scanner) - but direct methods are available for that below. - */ -int synctex_scanner_x_offset(synctex_scanner_t scanner); -int synctex_scanner_y_offset(synctex_scanner_t scanner); -float synctex_scanner_magnification(synctex_scanner_t scanner); - -/* Managing the input file names. - * Given a tag, synctex_scanner_get_name will return the corresponding file name. - * Conversely, given a file name, synctex_scanner_get_tag will retur, the corresponding tag. - * The file name must be the very same as understood by TeX. - * For example, if you \input myDir/foo.tex, the file name is myDir/foo.tex. - * No automatic path expansion is performed. - * Finally, synctex_scanner_input is the first input node of the scanner. - * To browse all the input node, use a loop like - * - * if((input_node = synctex_scanner_input(scanner))){ - * do { - * blah - * } while((input_node=synctex_node_sibling(input_node))); - * } - * - * The output is the name that was used to create the scanner. - * The synctex is the real name of the synctex file, - * it was obtained from output by setting the proper file extension. - */ -const char * synctex_scanner_get_name(synctex_scanner_t scanner,int tag); -int synctex_scanner_get_tag(synctex_scanner_t scanner,const char * name); -synctex_node_t synctex_scanner_input(synctex_scanner_t scanner); -const char * synctex_scanner_get_output(synctex_scanner_t scanner); -const char * synctex_scanner_get_synctex(synctex_scanner_t scanner); - -/* Browsing the nodes - * parent, child and sibling are standard names for tree nodes. - * The parent is one level higher, the child is one level deeper, - * and the sibling is at the same level. - * The sheet of a node is the first ancestor, it is of type sheet. - * A node and its sibling have the same parent. - * A node is the parent of its child. - * A node is either the child of its parent, - * or belongs to the sibling chain of its parent's child. - * The next node is either the child, the sibling or the parent's sibling, - * unless the parent is a sheet. - * This allows to navigate through all the nodes of a given sheet node: - * - * synctex_node_t node = sheet; - * while((node = synctex_node_next(node))) { - * // do something with node - * } - * - * With synctex_sheet_content, you can retrieve the sheet node given the page. - * The page is 1 based, according to TeX standards. - * Conversely synctex_node_sheet allows to retrieve the sheet containing a given node. - */ -synctex_node_t synctex_node_parent(synctex_node_t node); -synctex_node_t synctex_node_sheet(synctex_node_t node); -synctex_node_t synctex_node_child(synctex_node_t node); -synctex_node_t synctex_node_sibling(synctex_node_t node); -synctex_node_t synctex_node_next(synctex_node_t node); -synctex_node_t synctex_sheet(synctex_scanner_t scanner,int page); -synctex_node_t synctex_sheet_content(synctex_scanner_t scanner,int page); - -/* These are the types of the synctex nodes */ -typedef enum { - synctex_node_type_error = 0, - synctex_node_type_input, - synctex_node_type_sheet, - synctex_node_type_vbox, - synctex_node_type_void_vbox, - synctex_node_type_hbox, - synctex_node_type_void_hbox, - synctex_node_type_kern, - synctex_node_type_glue, - synctex_node_type_math, - synctex_node_type_boundary, - synctex_node_number_of_types -} synctex_node_type_t; - -/* synctex_node_type gives the type of a given node, - * synctex_node_isa gives the same information as a human readable text. */ -synctex_node_type_t synctex_node_type(synctex_node_t node); -const char * synctex_node_isa(synctex_node_t node); - -/* This is primarily used for debugging purpose. - * The second one logs information for the node and recursively displays information for its next node */ -void synctex_node_log(synctex_node_t node); -void synctex_node_display(synctex_node_t node); - -/* Given a node, access to the location in the synctex file where it is defined. - */ -typedef unsigned int synctex_charindex_t; -synctex_charindex_t synctex_node_charindex(synctex_node_t node); - -/* Given a node, access to its tag, line and column. - * The line and column numbers are 1 based. - * The latter is not yet fully supported in TeX, the default implementation returns 0 which means the whole line. - * When the tag is known, the scanner of the node will give the corresponding file name. - * When the tag is known, the scanner of the node will give the name. - */ -int synctex_node_tag(synctex_node_t node); -int synctex_node_line(synctex_node_t node); -int synctex_node_column(synctex_node_t node); - -/* In order to enhance forward synchronization, - * non void horizontal boxes have supplemental cached information. - * The mean line is the average of the line numbers of the included nodes. - * The child count is the number of chidren. - */ -int synctex_node_mean_line(synctex_node_t node); -int synctex_node_child_count(synctex_node_t node); - -/* This is the page where the node appears. - * This is a 1 based index as given by TeX. - */ -int synctex_node_page(synctex_node_t node); - -/* For quite all nodes, horizontal, vertical coordinates, and width. - * These are expressed in TeX small points coordinates, with origin at the top left corner. - */ -int synctex_node_h(synctex_node_t node); -int synctex_node_v(synctex_node_t node); -int synctex_node_width(synctex_node_t node); - -/* For all nodes, dimensions of the enclosing box. - * These are expressed in TeX small points coordinates, with origin at the top left corner. - * A box is enclosing itself. - */ -int synctex_node_box_h(synctex_node_t node); -int synctex_node_box_v(synctex_node_t node); -int synctex_node_box_width(synctex_node_t node); -int synctex_node_box_height(synctex_node_t node); -int synctex_node_box_depth(synctex_node_t node); - -/* For quite all nodes, horizontal, vertical coordinates, and width. - * The visible dimensions are bigger than real ones to compensate 0 width boxes - * that do contain nodes. - * These are expressed in page coordinates, with origin at the top left corner. - * A box is enclosing itself. - */ -float synctex_node_visible_h(synctex_node_t node); -float synctex_node_visible_v(synctex_node_t node); -float synctex_node_visible_width(synctex_node_t node); -/* For all nodes, visible dimensions of the enclosing box. - * A box is enclosing itself. - * The visible dimensions are bigger than real ones to compensate 0 width boxes - * that do contain nodes. - */ -float synctex_node_box_visible_h(synctex_node_t node); -float synctex_node_box_visible_v(synctex_node_t node); -float synctex_node_box_visible_width(synctex_node_t node); -float synctex_node_box_visible_height(synctex_node_t node); -float synctex_node_box_visible_depth(synctex_node_t node); - -/* The main synctex updater object. - * This object is used to append information to the synctex file. - * Its implementation is considered private. - * It is used by the synctex command line tool to take into account modifications - * that could occur while postprocessing files by dvipdf like filters. - */ -typedef struct __synctex_updater_t _synctex_updater_t; -typedef _synctex_updater_t * synctex_updater_t; - -/* Designated initializer. - * Once you are done with your whole job, - * free the updater */ -synctex_updater_t synctex_updater_new_with_output_file(const char * output, const char * directory); - -/* Use the next functions to append records to the synctex file, - * no consistency tests made on the arguments */ -void synctex_updater_append_magnification(synctex_updater_t updater, char * magnification); -void synctex_updater_append_x_offset(synctex_updater_t updater, char * x_offset); -void synctex_updater_append_y_offset(synctex_updater_t updater, char * y_offset); - -/* You MUST free the updater, once everything is properly appended */ -void synctex_updater_free(synctex_updater_t updater); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/zathura/synctex/synctex_parser_utils.c b/zathura/synctex/synctex_parser_utils.c deleted file mode 100644 index 9061a2c..0000000 --- a/zathura/synctex/synctex_parser_utils.c +++ /dev/null @@ -1,502 +0,0 @@ -/* -Copyright (c) 2008, 2009, 2010 , 2011 jerome DOT laurens AT u-bourgogne DOT fr - -This file is part of the SyncTeX package. - -Latest Revision: Tue Jun 14 08:23:30 UTC 2011 - -Version: 1.17 - -See synctex_parser_readme.txt for more details - -License: --------- -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE - -Except as contained in this notice, the name of the copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in this Software without prior written -authorization from the copyright holder. - -*/ - -/* In this file, we find all the functions that may depend on the operating system. */ - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#if defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__) || defined(__WINDOWS__) -#define SYNCTEX_WINDOWS 1 -#endif - -#if defined(__OS2__) -#define SYNCTEX_OS2 1 -#endif - -#ifdef _WIN32_WINNT_WINXP -#define SYNCTEX_RECENT_WINDOWS 1 -#endif - -#ifdef SYNCTEX_WINDOWS -#include -#endif - -void *_synctex_malloc(size_t size) { - void * ptr = malloc(size); - if(ptr) { -/* There used to be a switch to use bzero because it is more secure. JL */ - memset(ptr,0, size); - } - return (void *)ptr; -} - -int _synctex_error(const char * reason,...) { - va_list arg; - int result; - va_start (arg, reason); -# ifdef SYNCTEX_RECENT_WINDOWS - {/* This code is contributed by William Blum. - As it does not work on some older computers, - the _WIN32 conditional here is replaced with a SYNCTEX_RECENT_WINDOWS one. - According to http://msdn.microsoft.com/en-us/library/aa363362(VS.85).aspx - Minimum supported client Windows 2000 Professional - Minimum supported server Windows 2000 Server - People running Windows 2K standard edition will not have OutputDebugStringA. - JL.*/ - char *buff; - size_t len; - OutputDebugStringA("SyncTeX ERROR: "); - len = _vscprintf(reason, arg) + 1; - buff = (char*)malloc( len * sizeof(char) ); - result = vsprintf(buff, reason, arg) +strlen("SyncTeX ERROR: "); - OutputDebugStringA(buff); - OutputDebugStringA("\n"); - free(buff); - } -# else - result = fprintf(stderr,"SyncTeX ERROR: "); - result += vfprintf(stderr, reason, arg); - result += fprintf(stderr,"\n"); -# endif - va_end (arg); - return result; -} - -/* strip the last extension of the given string, this string is modified! */ -void _synctex_strip_last_path_extension(char * string) { - if(NULL != string){ - char * last_component = NULL; - char * last_extension = NULL; - char * next = NULL; - /* first we find the last path component */ - if(NULL == (last_component = strstr(string,"/"))){ - last_component = string; - } else { - ++last_component; - while((next = strstr(last_component,"/"))){ - last_component = next+1; - } - } -# if defined(SYNCTEX_WINDOWS) || defined(SYNCTEX_OS2) - /* On Windows, the '\' is also a path separator. */ - while((next = strstr(last_component,"\\"))){ - last_component = next+1; - } -# endif - /* then we find the last path extension */ - if((last_extension = strstr(last_component,"."))){ - ++last_extension; - while((next = strstr(last_extension,"."))){ - last_extension = next+1; - } - --last_extension;/* back to the "." */ - if(last_extension>last_component){/* filter out paths like ....my/dir/.hidden"*/ - last_extension[0] = '\0'; - } - } - } -} - -synctex_bool_t synctex_ignore_leading_dot_slash_in_path(const char ** name_ref) -{ - if (SYNCTEX_IS_DOT((*name_ref)[0]) && SYNCTEX_IS_PATH_SEPARATOR((*name_ref)[1])) { - do { - (*name_ref) += 2; - while (SYNCTEX_IS_PATH_SEPARATOR((*name_ref)[1])) { - ++(*name_ref); - } - } while(SYNCTEX_IS_DOT((*name_ref)[0]) && SYNCTEX_IS_PATH_SEPARATOR((*name_ref)[1])); - return synctex_YES; - } - return synctex_NO; -} - -/* The base name is necessary to deal with the 2011 file naming convention... - * path is a '\0' terminated string - * The return value is the trailing part of the argument, - * just following the first occurrence of the regexp pattern "[^|/|\].[\|/]+".*/ -const char * _synctex_base_name(const char *path) { - const char * ptr = path; - do { - if (synctex_ignore_leading_dot_slash_in_path(&ptr)) { - return ptr; - } - do { - if (!*(++ptr)) { - return path; - } - } while (!SYNCTEX_IS_PATH_SEPARATOR(*ptr)); - } while (*(++ptr)); - return path; -} - -/* Compare two file names, windows is sometimes case insensitive... */ -synctex_bool_t _synctex_is_equivalent_file_name(const char *lhs, const char *rhs) { - /* Remove the leading regex '(\./+)*' in both rhs and lhs */ - synctex_ignore_leading_dot_slash_in_path(&lhs); - synctex_ignore_leading_dot_slash_in_path(&rhs); -next_character: - if (SYNCTEX_IS_PATH_SEPARATOR(*lhs)) {/* lhs points to a path separator */ - if (!SYNCTEX_IS_PATH_SEPARATOR(*rhs)) {/* but not rhs */ - return synctex_NO; - } - ++lhs; - ++rhs; - synctex_ignore_leading_dot_slash_in_path(&lhs); - synctex_ignore_leading_dot_slash_in_path(&rhs); - goto next_character; - } else if (SYNCTEX_IS_PATH_SEPARATOR(*rhs)) {/* rhs points to a path separator but not lhs */ - return synctex_NO; - } else if (SYNCTEX_ARE_PATH_CHARACTERS_EQUAL(*lhs,*rhs)){/* uppercase do not match */ - return synctex_NO; - } else if (!*lhs) {/* lhs is at the end of the string */ - return *rhs ? synctex_NO : synctex_YES; - } else if(!*rhs) {/* rhs is at the end of the string but not lhs */ - return synctex_NO; - } - ++lhs; - ++rhs; - goto next_character; -} - -synctex_bool_t _synctex_path_is_absolute(const char * name) { - if(!strlen(name)) { - return synctex_NO; - } -# if defined(SYNCTEX_WINDOWS) || defined(SYNCTEX_OS2) - if(strlen(name)>2) { - return (name[1]==':' && SYNCTEX_IS_PATH_SEPARATOR(name[2]))?synctex_YES:synctex_NO; - } - return synctex_NO; -# else - return SYNCTEX_IS_PATH_SEPARATOR(name[0])?synctex_YES:synctex_NO; -# endif -} - -/* We do not take care of UTF-8 */ -const char * _synctex_last_path_component(const char * name) { - const char * c = name+strlen(name); - if(c>name) { - if(!SYNCTEX_IS_PATH_SEPARATOR(*c)) { - do { - --c; - if(SYNCTEX_IS_PATH_SEPARATOR(*c)) { - return c+1; - } - } while(c>name); - } - return c;/* the last path component is the void string*/ - } - return c; -} - -int _synctex_copy_with_quoting_last_path_component(const char * src, char ** dest_ref, size_t size) { - const char * lpc; - if(src && dest_ref) { -# define dest (*dest_ref) - dest = NULL; /* Default behavior: no change and sucess. */ - lpc = _synctex_last_path_component(src); - if(strlen(lpc)) { - if(strchr(lpc,' ') && lpc[0]!='"' && lpc[strlen(lpc)-1]!='"') { - /* We are in the situation where adding the quotes is allowed. */ - /* Time to add the quotes. */ - /* Consistency test: we must have dest+size>dest+strlen(dest)+2 - * or equivalently: strlen(dest)+20) { - char * result = NULL; - ++size; - /* Create the memory storage */ - if(NULL!=(result = (char *)malloc(size))) { - char * dest = result; - va_start (arg, first); - temp = first; - do { - if((size = strlen(temp))>0) { - /* There is something to merge */ - if(dest != strncpy(dest,temp,size)) { - _synctex_error("! _synctex_merge_strings: Copy problem"); - free(result); - result = NULL; - return NULL; - } - dest += size; - } - } while( (temp = va_arg(arg, const char *)) != NULL); - va_end(arg); - dest[0]='\0';/* Terminate the merged string */ - return result; - } - _synctex_error("! _synctex_merge_strings: Memory problem"); - return NULL; - } - return NULL; -} - -/* The purpose of _synctex_get_name is to find the name of the synctex file. - * There is a list of possible filenames from which we return the most recent one and try to remove all the others. - * With two runs of pdftex or xetex we are sure the the synctex file is really the most appropriate. - */ -int _synctex_get_name(const char * output, const char * build_directory, char ** synctex_name_ref, synctex_io_mode_t * io_mode_ref) -{ - if(output && synctex_name_ref && io_mode_ref) { - /* If output is already absolute, we just have to manage the quotes and the compress mode */ - size_t size = 0; - char * synctex_name = NULL; - synctex_io_mode_t io_mode = *io_mode_ref; - const char * base_name = _synctex_last_path_component(output); /* do not free, output is the owner. base name of output*/ - /* Do we have a real base name ? */ - if(strlen(base_name)>0) { - /* Yes, we do. */ - const char * temp = NULL; - char * core_name = NULL; /* base name of output without path extension. */ - char * dir_name = NULL; /* dir name of output */ - char * quoted_core_name = NULL; - char * basic_name = NULL; - char * gz_name = NULL; - char * quoted_name = NULL; - char * quoted_gz_name = NULL; - char * build_name = NULL; - char * build_gz_name = NULL; - char * build_quoted_name = NULL; - char * build_quoted_gz_name = NULL; - struct stat buf; - time_t the_time = 0; - /* Create core_name: let temp point to the dot before the path extension of base_name; - * We start form the \0 terminating character and scan the string upward until we find a dot. - * The leading dot is not accepted. */ - if((temp = strrchr(base_name,'.')) && (size = temp - base_name)>0) { - /* There is a dot and it is not at the leading position */ - if(NULL == (core_name = (char *)malloc(size+1))) { - _synctex_error("! _synctex_get_name: Memory problem 1"); - return -1; - } - if(core_name != strncpy(core_name,base_name,size)) { - _synctex_error("! _synctex_get_name: Copy problem 1"); - free(core_name); - dir_name = NULL; - return -2; - } - core_name[size] = '\0'; - } else { - /* There is no path extension, - * Just make a copy of base_name */ - core_name = _synctex_merge_strings(base_name); - } - /* core_name is properly set up, owned by "self". */ - /* creating dir_name. */ - size = strlen(output)-strlen(base_name); - if(size>0) { - /* output contains more than one path component */ - if(NULL == (dir_name = (char *)malloc(size+1))) { - _synctex_error("! _synctex_get_name: Memory problem"); - free(core_name); - dir_name = NULL; - return -1; - } - if(dir_name != strncpy(dir_name,output,size)) { - _synctex_error("! _synctex_get_name: Copy problem"); - free(dir_name); - dir_name = NULL; - free(core_name); - dir_name = NULL; - return -2; - } - dir_name[size] = '\0'; - } - /* dir_name is properly set up. It ends with a path separator, if non void. */ - /* creating quoted_core_name. */ - if(strchr(core_name,' ')) { - quoted_core_name = _synctex_merge_strings("\"",core_name,"\""); - } - /* quoted_core_name is properly set up. */ - if(dir_name &&strlen(dir_name)>0) { - basic_name = _synctex_merge_strings(dir_name,core_name,synctex_suffix,NULL); - if(quoted_core_name && strlen(quoted_core_name)>0) { - quoted_name = _synctex_merge_strings(dir_name,quoted_core_name,synctex_suffix,NULL); - } - } else { - basic_name = _synctex_merge_strings(core_name,synctex_suffix,NULL); - if(quoted_core_name && strlen(quoted_core_name)>0) { - quoted_name = _synctex_merge_strings(quoted_core_name,synctex_suffix,NULL); - } - } - if(!_synctex_path_is_absolute(output) && build_directory && (size = strlen(build_directory))) { - temp = build_directory + size - 1; - if(_synctex_path_is_absolute(temp)) { - build_name = _synctex_merge_strings(build_directory,basic_name,NULL); - if(quoted_core_name && strlen(quoted_core_name)>0) { - build_quoted_name = _synctex_merge_strings(build_directory,quoted_name,NULL); - } - } else { - build_name = _synctex_merge_strings(build_directory,"/",basic_name,NULL); - if(quoted_core_name && strlen(quoted_core_name)>0) { - build_quoted_name = _synctex_merge_strings(build_directory,"/",quoted_name,NULL); - } - } - } - if(basic_name) { - gz_name = _synctex_merge_strings(basic_name,synctex_suffix_gz,NULL); - } - if(quoted_name) { - quoted_gz_name = _synctex_merge_strings(quoted_name,synctex_suffix_gz,NULL); - } - if(build_name) { - build_gz_name = _synctex_merge_strings(build_name,synctex_suffix_gz,NULL); - } - if(build_quoted_name) { - build_quoted_gz_name = _synctex_merge_strings(build_quoted_name,synctex_suffix_gz,NULL); - } - /* All the others names are properly set up... */ - /* retain the most recently modified file */ -# define TEST(FILENAME,COMPRESS_MODE) \ - if(FILENAME) {\ - if (stat(FILENAME, &buf)) { \ - free(FILENAME);\ - FILENAME = NULL;\ - } else if (buf.st_mtime>the_time) { \ - the_time=buf.st_mtime; \ - synctex_name = FILENAME; \ - if (COMPRESS_MODE) { \ - io_mode |= synctex_io_gz_mask; \ - } else { \ - io_mode &= ~synctex_io_gz_mask; \ - } \ - } \ - } - TEST(basic_name,synctex_DONT_COMPRESS); - TEST(gz_name,synctex_COMPRESS); - TEST(quoted_name,synctex_DONT_COMPRESS); - TEST(quoted_gz_name,synctex_COMPRESS); - TEST(build_name,synctex_DONT_COMPRESS); - TEST(build_gz_name,synctex_COMPRESS); - TEST(build_quoted_name,synctex_DONT_COMPRESS); - TEST(build_quoted_gz_name,synctex_COMPRESS); -# undef TEST - /* Free all the intermediate filenames, except the one that will be used as returned value. */ -# define CLEAN_AND_REMOVE(FILENAME) \ - if(FILENAME && (FILENAME!=synctex_name)) {\ - remove(FILENAME);\ - printf("synctex tool info: %s removed\n",FILENAME);\ - free(FILENAME);\ - FILENAME = NULL;\ - } - CLEAN_AND_REMOVE(basic_name); - CLEAN_AND_REMOVE(gz_name); - CLEAN_AND_REMOVE(quoted_name); - CLEAN_AND_REMOVE(quoted_gz_name); - CLEAN_AND_REMOVE(build_name); - CLEAN_AND_REMOVE(build_gz_name); - CLEAN_AND_REMOVE(build_quoted_name); - CLEAN_AND_REMOVE(build_quoted_gz_name); -# undef CLEAN_AND_REMOVE - /* set up the returned values */ - * synctex_name_ref = synctex_name; - * io_mode_ref = io_mode; - return 0; - } - return -1;/* bad argument */ - } - return -2; -} - -const char * _synctex_get_io_mode_name(synctex_io_mode_t io_mode) { - static const char * synctex_io_modes[4] = {"r","rb","a","ab"}; - unsigned index = ((io_mode & synctex_io_gz_mask)?1:0) + ((io_mode & synctex_io_append_mask)?2:0);// bug pointed out by Jose Alliste - return synctex_io_modes[index]; -} diff --git a/zathura/synctex/synctex_parser_utils.h b/zathura/synctex/synctex_parser_utils.h deleted file mode 100644 index db19b2d..0000000 --- a/zathura/synctex/synctex_parser_utils.h +++ /dev/null @@ -1,152 +0,0 @@ -/* -Copyright (c) 2008, 2009, 2010, 2011 jerome DOT laurens AT u-bourgogne DOT fr - -This file is part of the SyncTeX package. - -Latest Revision: Tue Jun 14 08:23:30 UTC 2011 - -Version: 1.17 - -See synctex_parser_readme.txt for more details - -License: --------- -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE - -Except as contained in this notice, the name of the copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in this Software without prior written -authorization from the copyright holder. - -*/ - -/* The utilities declared here are subject to conditional implementation. - * All the operating system special stuff goes here. - * The problem mainly comes from file name management: path separator, encoding... - */ - -# define synctex_bool_t int -# define synctex_YES -1 -# define synctex_ADD_QUOTES -1 -# define synctex_COMPRESS -1 -# define synctex_NO 0 -# define synctex_DONT_ADD_QUOTES 0 -# define synctex_DONT_COMPRESS 0 - -#ifndef __SYNCTEX_PARSER_UTILS__ -# define __SYNCTEX_PARSER_UTILS__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -# if defined(_WIN32) || defined(__OS2__) -# define SYNCTEX_CASE_SENSITIVE_PATH 0 -# define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c || '\\' == c) -# else -# define SYNCTEX_CASE_SENSITIVE_PATH 1 -# define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c) -# endif - -# if defined(_WIN32) || defined(__OS2__) -# define SYNCTEX_IS_DOT(c) ('.' == c) -# else -# define SYNCTEX_IS_DOT(c) ('.' == c) -# endif - -# if SYNCTEX_CASE_SENSITIVE_PATH -# define SYNCTEX_ARE_PATH_CHARACTERS_EQUAL(left,right) (left != right) -# else -# define SYNCTEX_ARE_PATH_CHARACTERS_EQUAL(left,right) (toupper(left) != toupper(right)) -# endif - -/* This custom malloc functions initializes to 0 the newly allocated memory. - * There is no bzero function on windows. */ -void *_synctex_malloc(size_t size); - -/* This is used to log some informational message to the standard error stream. - * On Windows, the stderr stream is not exposed and another method is used. - * The return value is the number of characters printed. */ -int _synctex_error(const char * reason,...); - -/* strip the last extension of the given string, this string is modified! - * This function depends on the OS because the path separator may differ. - * This should be discussed more precisely. */ -void _synctex_strip_last_path_extension(char * string); - -/* Compare two file names, windows is sometimes case insensitive... - * The given strings may differ stricto sensu, but represent the same file name. - * It might not be the real way of doing things. - * The return value is an undefined non 0 value when the two file names are equivalent. - * It is 0 otherwise. */ -synctex_bool_t _synctex_is_equivalent_file_name(const char *lhs, const char *rhs); - -/* Description forthcoming.*/ -synctex_bool_t _synctex_path_is_absolute(const char * name); - -/* Description forthcoming...*/ -const char * _synctex_last_path_component(const char * name); - -/* Description forthcoming...*/ -const char * _synctex_base_name(const char *path); - -/* If the core of the last path component of src is not already enclosed with double quotes ('"') - * and contains a space character (' '), then a new buffer is created, the src is copied and quotes are added. - * In all other cases, no destination buffer is created and the src is not copied. - * 0 on success, which means no error, something non 0 means error, mainly due to memory allocation failure, or bad parameter. - * This is used to fix a bug in the first version of pdftex with synctex (1.40.9) for which names with spaces - * were not managed in a standard way. - * On success, the caller owns the buffer pointed to by dest_ref (is any) and - * is responsible of freeing the memory when done. - * The size argument is the size of the src buffer. On return the dest_ref points to a buffer sized size+2.*/ -int _synctex_copy_with_quoting_last_path_component(const char * src, char ** dest_ref, size_t size); - -/* These are the possible extensions of the synctex file */ -extern const char * synctex_suffix; -extern const char * synctex_suffix_gz; - -typedef unsigned int synctex_io_mode_t; - -typedef enum { - synctex_io_append_mask = 1, - synctex_io_gz_mask = synctex_io_append_mask<<1 -} synctex_io_mode_masks_t; - -typedef enum { - synctex_compress_mode_none = 0, - synctex_compress_mode_gz = 1 -} synctex_compress_mode_t; - -int _synctex_get_name(const char * output, const char * build_directory, char ** synctex_name_ref, synctex_io_mode_t * io_mode_ref); - -/* returns the correct mode required by fopen and gzopen from the given io_mode */ -const char * _synctex_get_io_mode_name(synctex_io_mode_t io_mode); - -synctex_bool_t synctex_ignore_leading_dot_slash_in_path(const char ** name); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/zathura/synctex/synctex_parser_version.txt b/zathura/synctex/synctex_parser_version.txt deleted file mode 100644 index 68209c0..0000000 --- a/zathura/synctex/synctex_parser_version.txt +++ /dev/null @@ -1 +0,0 @@ -1.17 \ No newline at end of file From 321e27eaaa66425218070d611f91cdc8ee5f5afb Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 8 Oct 2015 21:28:41 +0200 Subject: [PATCH 39/94] Update README Signed-off-by: Sebastian Ramacher --- README | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README b/README index f758820..2f4cb0f 100644 --- a/README +++ b/README @@ -12,6 +12,7 @@ sqlite3 (optional, >= 3.5.9) check (for tests) intltool libmagic from file(1) (optional, for mime-type detection) +libsynctex from TeXLive (option, for SyncTeX support) Sphinx (optional, for manpages and HTML documentation) doxygen (optional, for HTML documentation) breathe (optional, for HTML documentation) @@ -24,7 +25,7 @@ SQLITE_INC and SQLITE_LIB variables accordingly. Also note that Sphinx is needed to build the manpages. If it is not installed, the man pages won't be built. For the HTML documentation, doxygen, -breathe and sphinx_rtd_theme are needed in additioan to Sphinx. +breathe and sphinx_rtd_theme are needed in addition to Sphinx. 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. @@ -35,7 +36,7 @@ WITH_MAGIC=0. If you pass these flags as a command line argument to make, you have to ensure to pass the same flags when executing the install target. -If you want to build zathuras documentation, please install all python +If you want to build zathura's documentation, please install all python dependencies from the ./doc/requirements.txt file. Installation From 359fc9a6f2039c0f69a3d1191843ed3b7657e0e5 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 8 Oct 2015 21:36:48 +0200 Subject: [PATCH 40/94] Update comment Signed-off-by: Sebastian Ramacher --- config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk index 620c25c..92b3016 100644 --- a/config.mk +++ b/config.mk @@ -37,7 +37,7 @@ PKG_CONFIG ?= pkg-config WITH_SQLITE ?= $(shell (${PKG_CONFIG} --atleast-version=3.5.9 sqlite3 && echo 1) || echo 0) # synctex -# To use the embedded copy of the syntex parser set WITH_SYSTEM_SYNCTEX to 0. +# To disable support for synctex with libsynctex set WITH_SYNCTEX to 0. WITH_SYNCTEX ?= $(shell (${PKG_CONFIG} synctex && echo 1) || echo 0) # mimetype detection From 083520cea68aaff0e17346e7f7dace06063abf8b Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 8 Oct 2015 21:41:24 +0200 Subject: [PATCH 41/94] Remove compat code for pre-2.32 glib Signed-off-by: Sebastian Ramacher --- README | 2 +- config.mk | 2 +- zathura/glib-compat.h | 24 ------------------------ zathura/main.c | 3 --- zathura/render.c | 29 ++++++++++++++--------------- 5 files changed, 16 insertions(+), 44 deletions(-) delete mode 100644 zathura/glib-compat.h diff --git a/README b/README index 2f4cb0f..f061d03 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ girara user interface library and several document libraries. Requirements ------------ gtk3 -glib (>= 2.28) +glib (>= 2.32) girara (>= 0.2.4) sqlite3 (optional, >= 3.5.9) check (for tests) diff --git a/config.mk b/config.mk index 92b3016..45d1b47 100644 --- a/config.mk +++ b/config.mk @@ -22,7 +22,7 @@ GIRARA_MIN_VERSION = 0.2.4 GIRARA_PKG_CONFIG_NAME = girara-gtk3 # glib GLIB_VERSION_CHECK ?= 1 -GLIB_MIN_VERSION = 2.28 +GLIB_MIN_VERSION = 2.32 GLIB_PKG_CONFIG_NAME = glib-2.0 # GTK GTK_VERSION_CHECK ?= 1 diff --git a/zathura/glib-compat.h b/zathura/glib-compat.h deleted file mode 100644 index 3e98dae..0000000 --- a/zathura/glib-compat.h +++ /dev/null @@ -1,24 +0,0 @@ -/* See LICENSE file for license and copyright information */ - -#ifndef GLIB_COMPAT_H -#define GLIB_COMPAT_H - -#include - -/* GStaticMutex is deprecated starting with glib 2.32 and got replaced with - * GMutex */ -#if GLIB_CHECK_VERSION(2, 32, 0) -#define mutex GMutex -#define mutex_init(m) g_mutex_init((m)) -#define mutex_lock(m) g_mutex_lock((m)) -#define mutex_unlock(m) g_mutex_unlock((m)) -#define mutex_free(m) g_mutex_clear((m)) -#else -#define mutex GStaticMutex -#define mutex_init(m) g_static_mutex_init((m)) -#define mutex_lock(m) g_static_mutex_lock((m)) -#define mutex_unlock(m) g_static_mutex_unlock((m)) -#define mutex_free(m) g_static_mutex_free((m)) -#endif - -#endif diff --git a/zathura/main.c b/zathura/main.c index c94f535..ade5f07 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -28,9 +28,6 @@ main(int argc, char* argv[]) textdomain(GETTEXT_PACKAGE); /* init gtk */ -#if !GLIB_CHECK_VERSION(2, 31, 0) - g_thread_init(NULL); -#endif #if !GTK_CHECK_VERSION(3, 6, 0) gdk_threads_init(); #endif diff --git a/zathura/render.c b/zathura/render.c index e291289..5bab6c9 100644 --- a/zathura/render.c +++ b/zathura/render.c @@ -4,7 +4,6 @@ #include #include #include -#include "glib-compat.h" #include "render.h" #include "adjustment.h" @@ -34,7 +33,7 @@ static bool page_cache_is_full(ZathuraRenderer* renderer, bool* result); /* private data for ZathuraRenderer */ typedef struct private_s { GThreadPool* pool; /**< Pool of threads */ - mutex mutex; /**< Render lock */ + GMutex mutex; /**< Render lock */ volatile bool about_to_close; /**< Render thread is to be freed */ /** @@ -68,7 +67,7 @@ typedef struct request_private_s { zathura_page_t* page; gint64 last_view_time; girara_list_t* active_jobs; - mutex jobs_mutex; + GMutex jobs_mutex; } request_private_t; #define GET_PRIVATE(obj) \ @@ -103,7 +102,7 @@ zathura_renderer_init(ZathuraRenderer* renderer) priv->pool = g_thread_pool_new(render_job, renderer, 1, TRUE, NULL); priv->about_to_close = false; g_thread_pool_set_sort_function(priv->pool, render_thread_sort, NULL); - mutex_init(&priv->mutex); + g_mutex_init(&priv->mutex); /* recolor */ priv->recolor.enabled = false; @@ -161,7 +160,7 @@ renderer_finalize(GObject* object) if (priv->pool != NULL) { g_thread_pool_free(priv->pool, TRUE, TRUE); } - mutex_free(&(priv->mutex)); + g_mutex_free(&(priv->mutex)); free(priv->page_cache.cache); girara_list_free(priv->requests); @@ -265,7 +264,7 @@ zathura_render_request_new(ZathuraRenderer* renderer, zathura_page_t* page) priv->renderer = g_object_ref(renderer); priv->page = page; priv->active_jobs = girara_list_new(); - mutex_init(&priv->jobs_mutex); + g_mutex_init(&priv->jobs_mutex); /* register the request with the renderer */ renderer_register_request(renderer, request); @@ -299,7 +298,7 @@ render_request_finalize(GObject* object) girara_error("This should not happen!"); } girara_list_free(priv->active_jobs); - mutex_free(&priv->jobs_mutex); + g_mutex_free(&priv->jobs_mutex); G_OBJECT_CLASS(zathura_render_request_parent_class)->finalize(object); } @@ -407,7 +406,7 @@ zathura_renderer_lock(ZathuraRenderer* renderer) g_return_if_fail(ZATHURA_IS_RENDERER(renderer)); private_t* priv = GET_PRIVATE(renderer); - mutex_lock(&priv->mutex); + g_mutex_lock(&priv->mutex); } void @@ -416,7 +415,7 @@ zathura_renderer_unlock(ZathuraRenderer* renderer) g_return_if_fail(ZATHURA_IS_RENDERER(renderer)); private_t* priv = GET_PRIVATE(renderer); - mutex_unlock(&priv->mutex); + g_mutex_unlock(&priv->mutex); } void @@ -435,7 +434,7 @@ zathura_render_request(ZathuraRenderRequest* request, gint64 last_view_time) g_return_if_fail(ZATHURA_IS_RENDER_REQUEST(request)); request_private_t* request_priv = REQUEST_GET_PRIVATE(request); - mutex_lock(&request_priv->jobs_mutex); + g_mutex_lock(&request_priv->jobs_mutex); bool unfinished_jobs = false; /* check if there are any active jobs left */ @@ -462,7 +461,7 @@ zathura_render_request(ZathuraRenderRequest* request, gint64 last_view_time) g_thread_pool_push(priv->pool, job, NULL); } - mutex_unlock(&request_priv->jobs_mutex); + g_mutex_unlock(&request_priv->jobs_mutex); } void @@ -471,11 +470,11 @@ zathura_render_request_abort(ZathuraRenderRequest* request) g_return_if_fail(ZATHURA_IS_RENDER_REQUEST(request)); request_private_t* request_priv = REQUEST_GET_PRIVATE(request); - mutex_lock(&request_priv->jobs_mutex); + g_mutex_lock(&request_priv->jobs_mutex); GIRARA_LIST_FOREACH(request_priv->active_jobs, render_job_t*, iter, job) job->aborted = true; GIRARA_LIST_FOREACH_END(request_priv->active_jobs, render_job_t*, iter, job); - mutex_unlock(&request_priv->jobs_mutex); + g_mutex_unlock(&request_priv->jobs_mutex); } void @@ -494,9 +493,9 @@ remove_job_and_free(render_job_t* job) { request_private_t* request_priv = REQUEST_GET_PRIVATE(job->request); - mutex_lock(&request_priv->jobs_mutex); + g_mutex_lock(&request_priv->jobs_mutex); girara_list_remove(request_priv->active_jobs, job); - mutex_unlock(&request_priv->jobs_mutex); + g_mutex_unlock(&request_priv->jobs_mutex); g_object_unref(job->request); g_free(job); From 63e477fd41682bff724a692d9ce9d2ca3dd225ff Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 11 Oct 2015 22:28:09 +0200 Subject: [PATCH 42/94] Fix mutex clean up Signed-off-by: Sebastian Ramacher --- zathura/render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zathura/render.c b/zathura/render.c index 5bab6c9..61b22af 100644 --- a/zathura/render.c +++ b/zathura/render.c @@ -160,7 +160,7 @@ renderer_finalize(GObject* object) if (priv->pool != NULL) { g_thread_pool_free(priv->pool, TRUE, TRUE); } - g_mutex_free(&(priv->mutex)); + g_mutex_clear(&(priv->mutex)); free(priv->page_cache.cache); girara_list_free(priv->requests); @@ -298,7 +298,7 @@ render_request_finalize(GObject* object) girara_error("This should not happen!"); } girara_list_free(priv->active_jobs); - g_mutex_free(&priv->jobs_mutex); + g_mutex_clear(&priv->jobs_mutex); G_OBJECT_CLASS(zathura_render_request_parent_class)->finalize(object); } From f41fc252bdfcdd9c2913075ab42fe9f2cb00f3cf Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 15 Oct 2015 22:47:08 +0200 Subject: [PATCH 43/94] Open password dialog after handling current input (fixes #468) Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index f2edbb4..26fc95d 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -596,6 +596,16 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar } } +static gboolean +document_open_password_dialog(gpointer data) +{ + zathura_password_dialog_info_t* password_dialog_info = data; + + girara_dialog(password_dialog_info->zathura->ui.session, _("Enter password:"), true, NULL, + (girara_callback_inputbar_activate_t) cb_password_dialog, password_dialog_info); + return FALSE; +} + bool document_open(zathura_t* zathura, const char* path, const char* password, int page_number) @@ -610,14 +620,14 @@ document_open(zathura_t* zathura, const char* path, const char* password, if (document == NULL) { if (error == ZATHURA_ERROR_INVALID_PASSWORD) { + girara_debug("Invalid or no password."); zathura_password_dialog_info_t* password_dialog_info = malloc(sizeof(zathura_password_dialog_info_t)); if (password_dialog_info != NULL) { password_dialog_info->zathura = zathura; if (path != NULL) { password_dialog_info->path = g_strdup(path); - girara_dialog(zathura->ui.session, "Enter password:", true, NULL, - (girara_callback_inputbar_activate_t) cb_password_dialog, password_dialog_info); + gdk_threads_add_idle(document_open_password_dialog, password_dialog_info); goto error_out; } else { free(password_dialog_info); From 1b3ff76dfdaa5be013911bdbf9a5f9c1db87d13a Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 15 Oct 2015 23:10:09 +0200 Subject: [PATCH 44/94] Update translations Signed-off-by: Sebastian Ramacher --- po/ca.po | 294 ++++++++++++++++++++++++++------------------------ po/cs.po | 292 ++++++++++++++++++++++++++------------------------ po/de.po | 292 ++++++++++++++++++++++++++------------------------ po/el.po | 294 ++++++++++++++++++++++++++------------------------ po/eo.po | 292 ++++++++++++++++++++++++++------------------------ po/es.po | 294 ++++++++++++++++++++++++++------------------------ po/es_CL.po | 288 +++++++++++++++++++++++++------------------------ po/et.po | 287 ++++++++++++++++++++++++++----------------------- po/fr.po | 292 ++++++++++++++++++++++++++------------------------ po/he.po | 274 +++++++++++++++++++++++++---------------------- po/hr.po | 274 +++++++++++++++++++++++++---------------------- po/id_ID.po | 298 +++++++++++++++++++++++++++------------------------ po/it.po | 299 +++++++++++++++++++++++++++------------------------ po/lt.po | 298 +++++++++++++++++++++++++++------------------------ po/no.po | 300 +++++++++++++++++++++++++++------------------------- po/pl.po | 292 ++++++++++++++++++++++++++------------------------ po/pt_BR.po | 292 ++++++++++++++++++++++++++------------------------ po/ru.po | 292 ++++++++++++++++++++++++++------------------------ po/ta_IN.po | 280 +++++++++++++++++++++++++----------------------- po/tr.po | 292 ++++++++++++++++++++++++++------------------------ po/uk_UA.po | 284 ++++++++++++++++++++++++++----------------------- 21 files changed, 3219 insertions(+), 2881 deletions(-) diff --git a/po/ca.po b/po/ca.po index 9fa1ea1..c7b85c3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:45+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:09+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/zathura/language/" "ca/)\n" @@ -18,26 +18,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Entrada invàlida '%s'." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Índex invàlid '%s'." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -194,131 +179,163 @@ msgid "Show directories" msgstr "Mostra els directoris" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Obrir sempre la primera pàgina" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Realça els resultats de recerca" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Habilita la cerca incremental" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Esborra els resultats de recerca a l'interrompre" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Utilitza el nom base del fitxer en el títol de la finestra" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" -msgstr "Habilitar la compatibilitat amb synctex" +msgid "Display the page number in the window title" +msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 +msgid "Enable synctex support" +msgstr "Habilitar la compatibilitat amb synctex" + +#: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Afegir un marcador" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Esborrar un marcador" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Llista tots els marcadors" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Tancar el fitxer actual" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Mostra informació sobre el fitxer" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Executar una comanda" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Mostrar l'ajuda" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Obrir document" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Tancar Zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Imprimir document" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Desar document" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Desar document (i forçar la sobreescritura)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Desa els fitxers adjunts" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Assigna el desplaçament de pàgina" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Marca la posició actual dins el document" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Esborrar les marques especificades" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "No realcis els resultats de la recerca actual" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Realça els resultats de recerca actual" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Mostra informació sobre la versió" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Entrada invàlida '%s'." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Índex invàlid '%s'." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -458,28 +475,73 @@ msgstr "Imatge o fitxer adjunt desconegut '%s'." msgid "Argument must be a number." msgstr "L'argument ha de ser un nombre." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Pàgina %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Carregant..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Fitxers adjunts" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copia la imatge" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Imatges" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Desa imatge com a" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Reassigna a la finestra especificada per xid" + +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Ruta al directori de configuració" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Camí al directori de dades" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Aquest document no conté cap índex" +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Camí al directori que conté els plugins" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Bifurca en segon pla" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Contrasenya del document" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Nivell de registre (depuració, informació, advertiments, errors)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Imprimeix informació sobre la versió" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Editor synctex (reenviat a l'ordre synctex)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -499,86 +561,40 @@ msgstr "Enllaç: %s" msgid "Link: Invalid" msgstr "Enllaç: Invàlid" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Carregant..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Aquest document no conté cap índex" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copia la imatge" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Pàgina %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Desa imatge com a" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Fitxers adjunts" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Imatges" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Sense nom]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Reassigna a la finestra especificada per xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Ruta al directori de configuració" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Camí al directori de dades" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Camí al directori que conté els plugins" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Bifurca en segon pla" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Contrasenya del document" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Nivell de registre (depuració, informació, advertiments, errors)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Imprimeix informació sobre la versió" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Editor synctex (reenviat a l'ordre synctex)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/cs.po b/po/cs.po index c2c36d9..2d2a832 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,34 +5,19 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:45+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:09+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: pwmt.org \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Neplatný vstup: %s" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Neplatný index: %s" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -189,131 +174,163 @@ msgid "Show directories" msgstr "Zobrazovat adresáře" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Vždy otevírat na první straně" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Zvýrazňovat výsledky hledání" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Při abortu smazat výsledky hledání" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Přidat záložku" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Smazat záložku" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Vypsat záložky" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Zavřít tenhle soubor" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Zobrazit informace o souboru" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Zobrazit nápovědu" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Otevřít dokument" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Zavřít zathuru" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Tisknout dokument" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Uložit dokument" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Uložit a přepsat dokument" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Uložit přílohy" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Označit současnou pozici v dokumentu" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Smazat vybrané značky" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Nezvýrazňovat výsledky tohoto hledání" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Zvýrazňovat výsledky tohoto hledání" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Neplatný vstup: %s" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Neplatný index: %s" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -453,28 +470,73 @@ msgstr "Neznámá příloha nebo obrázek '%s'." msgid "Argument must be a number." msgstr "Argumentem musí být číslo." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Strana %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Načítám ..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Přílohy" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Zkopíruj obrázek" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Obrázky" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Ulož obrázek jako" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Tenhle dokument neobsahuje žádné indexy" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Cesta k souboru s nastavením" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Cesta k adresáři s daty" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Cesta k adresářům s pluginy" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Forknout se na pozadí" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Heslo" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Úroveň logování (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Zobrazit informace o souboru" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -494,86 +556,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Načítám ..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Tenhle dokument neobsahuje žádné indexy" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Zkopíruj obrázek" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Strana %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Ulož obrázek jako" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Přílohy" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Obrázky" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Nepojmenovaný]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Cesta k souboru s nastavením" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Cesta k adresáři s daty" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Cesta k adresářům s pluginy" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Forknout se na pozadí" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Heslo" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Úroveň logování (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Zobrazit informace o souboru" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/de.po b/po/de.po index 5437716..ab613ea 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:46+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:08+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: German (http://www.transifex.com/projects/p/zathura/language/" "de/)\n" @@ -18,27 +18,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "'%s' darf nicht 0 sein. Auf 1 gesetzt." - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Ungültige Eingabe '%s' angegeben." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Ungültiger Index '%s' angegeben." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "Der gewählte Text wurde in die Zwischenablage %s kopiert: %s" +msgid "Printing failed: %s" +msgstr "Drucken fehlgeschlagen: %s" #. zathura settings #: ../zathura/config.c:144 @@ -197,131 +182,163 @@ msgid "Show directories" msgstr "Zeige Ordner an" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "Zeige zuletzt geöffnete Dateien an" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Öffne Dokument immer auf der ersten Seite" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Hebe Suchergebnisse hervor" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Aktiviere inkrementelle Suche" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Lösche Suchergebnisse bei Abbruch" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Verwende den Dateinamen der Datei im Fenstertitel" -#: ../zathura/config.c:227 +#: ../zathura/config.c:229 +msgid "Use ~ instead of $HOME in the filename in the window title" +msgstr "Verwende ~ statt $HOME im Dateinamen im Fenstertitel" + +#: ../zathura/config.c:231 msgid "Display the page number in the window title" msgstr "Verwende die Seitenzal im Fenstertitel" -#: ../zathura/config.c:229 +#: ../zathura/config.c:233 msgid "Use basename of the file in the statusbar" msgstr "Verwende den Dateinamen der Datei in der Statusleiste" -#: ../zathura/config.c:231 +#: ../zathura/config.c:235 +msgid "Use ~ instead of $HOME in the filename in the statusbar" +msgstr "Verwende ~ statt $HOME im Dateinamen in der Statusleiste" + +#: ../zathura/config.c:237 msgid "Enable synctex support" msgstr "Aktiviere SyncTeX-Unterstützung" -#: ../zathura/config.c:233 +#: ../zathura/config.c:239 msgid "Synctex editor command" msgstr "Synctex Editor Befehl" -#: ../zathura/config.c:235 +#: ../zathura/config.c:241 msgid "Enable D-Bus service" msgstr "D-Bus-Dienst aktivieren" -#: ../zathura/config.c:237 +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "Zwischenablage, in die mit der Maus gewählte Text kopiert wird" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "Benachrichtigung nach Text-Selektion" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Füge Lesezeichen hinzu" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Lösche ein Lesezeichen" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Liste all Lesezeichen auf" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Schließe das aktuelle Dokument" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Zeige Dokumentinformationen an" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Führe einen Befehl aus" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Zeige Hilfe an" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Öffne Dokument" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Beende zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Drucke Dokument" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Speichere Dokument" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Speichere Dokument (und überschreibe bestehende)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Speichere Anhänge" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Setze den Seitenabstand" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Markiere aktuelle Position im Doukument" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Lösche angegebene Markierung" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Hebe aktuelle Suchergebnisse nicht hervor" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Hebe aktuelle Suchergebnisse hervor" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Zeige Versionsinformationen an" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "'%s' darf nicht 0 sein. Auf 1 gesetzt." + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Ungültige Eingabe '%s' angegeben." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Ungültiger Index '%s' angegeben." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "Der gewählte Text wurde in die Zwischenablage %s kopiert: %s" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -461,28 +478,73 @@ msgstr "Unbekannter Anhanng oder Bild '%s'." msgid "Argument must be a number." msgstr "Das Argument ist keine Zahl." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Seite %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Lädt..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Speichere Anhänge" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Bild kopieren" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Bilder" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Bild speichern als" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" -msgstr "Drucken fehlgeschlagen: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Reparentiert zathura an das Fenster mit der xid" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Dieses Dokument beinhaltet kein Inhaltsverzeichnis." +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Pfad zum Konfigurationsverzeichnis" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Pfad zum Datenverzeichnis" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "Pfad zum Cacheverzeichnis" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Pfad zum Pluginverzeichnis" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Forkt den Prozess in den Hintergrund" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Dokument Passwort" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "Zur Seite springen" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Log-Stufe (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Zeige Versionsinformationen an" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Synctex Editor (wird an synctex weitergeleitet)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "Zur gewählten SyncTeX-Position springen" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "Gewählte Position im Prozess hervorheben" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "In einem Nicht-Standardmodus starten" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -502,86 +564,40 @@ msgstr "Verknüpfung: %s" msgid "Link: Invalid" msgstr "Verknüpfung: ungültig" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Lädt..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Dieses Dokument beinhaltet kein Inhaltsverzeichnis." -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Bild kopieren" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Seite %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Bild speichern als" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Speichere Anhänge" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Bilder" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Kein Name]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "Konnte Datei nicht von stdin lesen und in temporäre Datei schreiben." -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "Passwort:" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Dateityp ist nicht unterstützt. Installiere das benötigete Plugin." -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "Dieses Dokument beinhaltet keine Seiten" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Reparentiert zathura an das Fenster mit der xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Pfad zum Konfigurationsverzeichnis" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Pfad zum Datenverzeichnis" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "Pfad zum Cacheverzeichnis" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Pfad zum Pluginverzeichnis" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Forkt den Prozess in den Hintergrund" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Dokument Passwort" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "Zur Seite springen" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Log-Stufe (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Zeige Versionsinformationen an" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Synctex Editor (wird an synctex weitergeleitet)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "Zur gewählten SyncTeX-Position springen" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "Gewählte Position im Prozess hervorheben" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "In einem Nicht-Standardmodus starten" diff --git a/po/el.po b/po/el.po index b5848bb..b722c37 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: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:46+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Greek (http://www.transifex.com/projects/p/zathura/language/" "el/)\n" @@ -18,26 +18,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Η είσοδος '%s' είναι άκυρη." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Ο δείκτης '%s' είναι άκυρος." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -196,131 +181,163 @@ msgid "Show directories" msgstr "Εμφάνιση καταλόγων" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Άνοιγμα πάντα στην πρώτη σελίδα" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Τονισμός αποτελεσμάτων αναζήτησης" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Εκκαθάριση των απολεσμάτων αναζήτησης κατά την διακοπή" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Χρήση του ονόματος του αρχείο στο τίτλο του παραθύρου" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" -msgstr "Ενεργοποίηση υποστήριξης synctex" +msgid "Display the page number in the window title" +msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 +msgid "Enable synctex support" +msgstr "Ενεργοποίηση υποστήριξης synctex" + +#: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Προσθήκη σελιδοδείκτη" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Διαγραφή σελιδοδείκτη" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Εμφάνιση όλων των σελιδοδεικτών" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Κλείσιμο αρχείου" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Προβολή πληροφοριών αρχείου" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Εκτέλεση εντολής" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Εμφάνιση βοήθειας" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Άνοιγμα αρχείου" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Κλείσιμο" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Εκτύπωση αρχείου" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Αποθήκευση αρχείου" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Αποθήκευση αρχείου (και αντικατάσταση)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Αποθήκευση προσαρτήσεων. " -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Ρύθμιση αντιστάθμισης σελίδας" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Επισήμανση τρέχουσας θέσης στο κείμενο" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Διαγραφή επιλεγμένων σημείων" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Χωρίς τονισμό τα τρέχοντα αποτελέσματα της αναζήτησης" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Τονισμός στα τρέχοντα αποτελέσματα της αναζήτησης" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Εμφάνιση πληροφοριών έκδοσης" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Η είσοδος '%s' είναι άκυρη." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Ο δείκτης '%s' είναι άκυρος." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -460,28 +477,73 @@ msgstr "Άγνωστο προσάρτημα είτε εικόνα '%s'. " msgid "Argument must be a number." msgstr "Η παράμετρος πρέπει να είναι αριθμός." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Σελίδα %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Φορτώνει ..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Προσαρτήσεις" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Αντιγραφή εικόνας" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Εικόνες" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Αποθήκευση εικόνας ως..." -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Reparents to window specified by xid" + +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Διαδρομή του αρχείου ρυθμίσεων" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Διαδρομή του φακέλου δεδομένων" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Το αρχείο δεν περιέχει κανένα δείκτη" +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Διαδρομή φακέλου που περιέχει τα πρόσθετα" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Διακλάδωση στο παρασκήνιο" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Κωδικός αρχείου" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Επίπεδο καταγραφής (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Εκτύπωση πληροφοριών έκδοσης" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Synctex editor (Προώθηση στην εντολή synctex)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -501,86 +563,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Φορτώνει ..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Το αρχείο δεν περιέχει κανένα δείκτη" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Αντιγραφή εικόνας" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Σελίδα %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Αποθήκευση εικόνας ως..." +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Προσαρτήσεις" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Εικόνες" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Χωρίς όνομα]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Reparents to window specified by xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Διαδρομή του αρχείου ρυθμίσεων" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Διαδρομή του φακέλου δεδομένων" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Διαδρομή φακέλου που περιέχει τα πρόσθετα" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Διακλάδωση στο παρασκήνιο" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Κωδικός αρχείου" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Επίπεδο καταγραφής (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Εκτύπωση πληροφοριών έκδοσης" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Synctex editor (Προώθηση στην εντολή synctex)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/eo.po b/po/eo.po index 208a3b2..94e7b0e 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: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:46+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/zathura/" "language/eo/)\n" @@ -17,26 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Nevalida enigo '%s' uzata." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Nevalida indekso '%s' uzata." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -193,131 +178,163 @@ msgid "Show directories" msgstr "Montru dosierujojn" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Ĉiam malfermu ĉe unua paĝo" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Aldonu paĝosignon" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Forigu paĝosignon" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Listigu ĉiujn paĝosignojn" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Fermu nunan dosieron" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Montru dosiera informacio" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Montru helpon" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Malfermu dokumenton" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Fermu zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Presu dokumenton" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Konservu dokumenton" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Konservu dokumenton (deviga anstataŭo)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Konservu kunsendaĵojn" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Agordu paĝdelokado" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Nevalida enigo '%s' uzata." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Nevalida indekso '%s' uzata." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -457,28 +474,73 @@ msgstr "" msgid "Argument must be a number." msgstr "Argumento devas esti nombro." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Paĝo %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Ŝargado ..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Konservu kunsendaĵojn" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Kopiu bildon" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Bildoj" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Savi bildojn kiel" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Ĉi-tiu dokumento enhavas neniam indekson." +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Vojo al la agorda dosierujo" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Vojo al la datuma dosierujo" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Vojoj al dosierujoj enhavantaj kromaĵojn" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Nivelo de ĵurnalo (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Montru dosiera informacio" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -498,86 +560,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Ŝargado ..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Ĉi-tiu dokumento enhavas neniam indekson." -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Kopiu bildon" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Paĝo %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Savi bildojn kiel" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Konservu kunsendaĵojn" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Bildoj" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Neniu nomo]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Vojo al la agorda dosierujo" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Vojo al la datuma dosierujo" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Vojoj al dosierujoj enhavantaj kromaĵojn" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Nivelo de ĵurnalo (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Montru dosiera informacio" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/es.po b/po/es.po index 6af5fed..137d309 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: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:46+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" "zathura/language/es/)\n" @@ -16,26 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Entrada inválida: '%s'." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Índice invalido: '%s'." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -194,131 +179,163 @@ msgid "Show directories" msgstr "Mostrar directorios" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Abrir siempre la primera página" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Destacar los resultados de búsqueda" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Habilitar la búsqueda incremental" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Borrar resultados de búsqueda al abortar" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Usar el nombre del archivo en el título de la ventana" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" -msgstr "Habilitar soporte synctex" +msgid "Display the page number in the window title" +msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 +msgid "Enable synctex support" +msgstr "Habilitar soporte synctex" + +#: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Añadir Favorito" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Eliminar Favorito" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Listar favoritos" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Cerrar fichero actual" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Mostrar información del fichero" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Ejecutar un comando" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Mostrar ayuda" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Abrir documento" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Salir de zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Imprimir documento" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Guardar documento" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Guardar documento (y sobreescribir)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Guardar ficheros adjuntos" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Asignar el desplazamiento de página" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Marcar la posición actual en el documento" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Borrar las marcas especificadas" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "No destacar los resultados de la búsqueda actual" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Destacar los resultados de la búsqueda actual" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Mostrar versión" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Entrada inválida: '%s'." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Índice invalido: '%s'." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -458,28 +475,73 @@ msgstr "Adjunto o imagen desconocidos '%s'." msgid "Argument must be a number." msgstr "El argumento ha de ser un número." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Página %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Cargando ..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Guardar ficheros adjuntos" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copiar imagen" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Imágenes" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Salvar imagen como" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Reasignar a la ventana especificada por xid" + +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Ruta al directorio de configuración" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Ruta para el directorio de datos" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Este documento no contiene ningún índice" +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Ruta a los directorios que contienen los plugins" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Fork, ejecutándose en background" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Contraseña del documento" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Nivel de log (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Mostrar información del fichero" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Editor de Synctex (reenvíado al commando synctex)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -499,86 +561,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Cargando ..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Este documento no contiene ningún índice" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copiar imagen" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Página %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Salvar imagen como" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Guardar ficheros adjuntos" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Imágenes" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Sin nombre]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Reasignar a la ventana especificada por xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Ruta al directorio de configuración" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Ruta para el directorio de datos" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Ruta a los directorios que contienen los plugins" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Fork, ejecutándose en background" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Contraseña del documento" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Nivel de log (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Mostrar información del fichero" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Editor de Synctex (reenvíado al commando synctex)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/es_CL.po b/po/es_CL.po index 97fbd7d..666b423 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: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:47+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Spanish (Chile) (http://www.transifex.net/projects/p/zathura/" "language/es_CL/)\n" @@ -17,26 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Entrada inválida: '%s'." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Índice invalido: '%s'." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -193,131 +178,163 @@ msgid "Show directories" msgstr "Mostrar directorios" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Siempre abrir en primera página" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Agregar un marcador" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Eliminar un marcador" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Listar todos los marcadores" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Cerrar archivo actual" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Mostrar información del archivo" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Mostrar ayuda" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Abrir documento" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Cerrar zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Imprimir documento" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Guardar documento" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Guardar documento (y forzar sobreescritura)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Guardar archivos adjuntos" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Asignar desplazamiento de la página" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Entrada inválida: '%s'." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Índice invalido: '%s'." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -457,28 +474,73 @@ msgstr "" msgid "Argument must be a number." msgstr "El argumento debe ser un número." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Cargando..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copiar imagen" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" msgstr "" -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Guardar archivos adjuntos" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Reasignar a la ventana especificada por xid" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Ruta al directorio de configuración" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Ruta al directorio de datos" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" msgstr "" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Ruta al directorio que contiene plugins" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Ejecución en background" + +#: ../zathura/main.c:67 +msgid "Document password" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Este document no contiene índice" +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Nivel de log (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Mostrar información del archivo" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -498,86 +560,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Cargando..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Este document no contiene índice" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copiar imagen" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" msgstr "" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Guardar archivos adjuntos" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Sin nombre]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Reasignar a la ventana especificada por xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Ruta al directorio de configuración" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Ruta al directorio de datos" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Ruta al directorio que contiene plugins" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Ejecución en background" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Nivel de log (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Mostrar información del archivo" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/et.po b/po/et.po index 39fb47b..7510962 100644 --- a/po/et.po +++ b/po/et.po @@ -7,35 +7,21 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2014-01-31 09:37+0000\n" -"Last-Translator: Rivo Zängov \n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:07+0200\n" +"Last-Translator: Sebastian Ramacher \n" "Language-Team: Estonian (http://www.transifex.net/projects/p/zathura/" "language/et/)\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -192,131 +178,163 @@ msgid "Show directories" msgstr "Näita kaustasid" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Ava alati esimene leht" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Lisa järjehoidja" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Kustuta järjehoidja" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Näita kõiki järjehoidjaid" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Sulge praegune fail" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Näita faili infot" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Näita abiinfot" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Ava dokument" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Sule zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Prindi dokument" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Salvesta dokument" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Salvesta manused" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -456,27 +474,72 @@ msgstr "" msgid "Argument must be a number." msgstr "" -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." msgstr "" -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Salvesta manused" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Kopeeri pilt" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" msgstr "" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Näita faili infot" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 @@ -497,86 +560,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" msgstr "" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Kopeeri pilt" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" msgstr "" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Salvesta manused" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Nime pole]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Näita faili infot" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/fr.po b/po/fr.po index 390a152..ff8206f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:47+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: French (http://www.transifex.com/projects/p/zathura/language/" "fr/)\n" @@ -21,27 +21,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Entrée invalide : '%s'" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Index invalide : '%s'" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" +msgid "Printing failed: %s" +msgstr "Echec d'impression : %s" #. zathura settings #: ../zathura/config.c:144 @@ -199,131 +184,163 @@ msgid "Show directories" msgstr "Montrer les dossiers" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Toujours ouvrir à la première page" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Surligner les résultats de la recherche" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Activer la recherche incrémentale" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Effacer les résultats de recherche en cas d'annulation" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 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" -#: ../zathura/config.c:227 +#: ../zathura/config.c:229 +msgid "Use ~ instead of $HOME in the filename in the window title" +msgstr "" + +#: ../zathura/config.c:231 msgid "Display the page number in the window title" msgstr "Afficher le numéro de page dans le titre de la fenêtre" -#: ../zathura/config.c:229 +#: ../zathura/config.c:233 msgid "Use basename of the file in the statusbar" msgstr "Utiliser le nom de base du fichier dans la barre d'état" -#: ../zathura/config.c:231 +#: ../zathura/config.c:235 +msgid "Use ~ instead of $HOME in the filename in the statusbar" +msgstr "" + +#: ../zathura/config.c:237 msgid "Enable synctex support" msgstr "Activer la prise en charge de synctex" -#: ../zathura/config.c:233 +#: ../zathura/config.c:239 msgid "Synctex editor command" msgstr "" -#: ../zathura/config.c:235 +#: ../zathura/config.c:241 msgid "Enable D-Bus service" msgstr "Activer le service D-Bus" -#: ../zathura/config.c:237 +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "Le presse-papiers qui recevra les données sélectionnées avec la souris" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Ajouter un marque-page" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Supprimer un marque-page" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Lister tous les marque-pages" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Fermer le fichier actuel" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Montrer les informations sur le fichier" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Exécuter une commande" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Afficher l'aide" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Ouvrir un document" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Quitter zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Imprimer le document" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Sauver le document" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Sauver le document (et forcer l'écrasement)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Enregistrer les pièces jointes" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Définir le décalage de page" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Marquer l'emplacement actuel dans le document" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Supprimer les marques indiquées" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Ne pas surligner les résultats de la recherche en cours" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Surligner les résultats de la recherche en cours" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Afficher les informations de version" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Entrée invalide : '%s'" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Index invalide : '%s'" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -463,28 +480,73 @@ msgstr "Pièce jointe ou image '%s' inconnue." msgid "Argument must be a number." msgstr "L'argument doit être un nombre." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Page %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Chargement..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Pièces jointes" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copier l'image" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Images" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Enregistrer l'image sous" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" -msgstr "Echec d'impression : %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Rattacher à la fenêtre spécifiée par xid" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Ce document ne contient pas d'index" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Chemin vers le dossier de configuration" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Chemin vers le dossier de données" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Chemin vers le dossier de plugins" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Détacher en arrière-plan" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Mot de passe du document" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "Numéro de page où aller" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Niveau de journalisation (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Afficher les informations de version" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Éditeur synctex (transféré à la commande synctex)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "Démarrer dans un mode non-défaut" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -504,89 +566,43 @@ msgstr "Lien : %s" msgid "Link: Invalid" msgstr "Lien : Invalide" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Chargement..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Ce document ne contient pas d'index" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copier l'image" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Page %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Enregistrer l'image sous" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Pièces jointes" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Images" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Sans nom]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Impossible de lire le fichier depuis stdin et de le sauvegarder dans un " "fichier temporaire." -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" "Type de fichier non supporté. Veuillez installer l'extension nécessaire." -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "Ce document ne contient aucune page" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Rattacher à la fenêtre spécifiée par xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Chemin vers le dossier de configuration" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Chemin vers le dossier de données" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Chemin vers le dossier de plugins" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Détacher en arrière-plan" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Mot de passe du document" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "Numéro de page où aller" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Niveau de journalisation (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Afficher les informations de version" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Éditeur synctex (transféré à la commande synctex)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "Démarrer dans un mode non-défaut" diff --git a/po/he.po b/po/he.po index 63ed72c..4fcd1f4 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: 2015-04-13 19:42+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" "PO-Revision-Date: 2014-01-31 09:37+0000\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/zathura/language/" @@ -17,24 +17,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -191,131 +176,163 @@ msgid "Show directories" msgstr "" #: ../zathura/config.c:216 -msgid "Always open on first page" +msgid "Show recent files" msgstr "" #: ../zathura/config.c:218 +msgid "Always open on first page" +msgstr "" + +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -455,27 +472,72 @@ msgstr "" msgid "Argument must be a number." msgstr "" -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." msgstr "" -#: ../zathura/completion.c:293 -msgid "Attachments" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" msgstr "" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" msgstr "" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 @@ -496,86 +558,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" msgstr "" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" msgstr "" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" +#: ../zathura/completion.c:328 +msgid "Attachments" msgstr "" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/hr.po b/po/hr.po index 7ff087f..445c124 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: 2015-04-13 19:42+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" "PO-Revision-Date: 2014-01-31 09:37+0000\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/zathura/" @@ -18,24 +18,9 @@ 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" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -192,131 +177,163 @@ msgid "Show directories" msgstr "" #: ../zathura/config.c:216 -msgid "Always open on first page" +msgid "Show recent files" msgstr "" #: ../zathura/config.c:218 +msgid "Always open on first page" +msgstr "" + +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -456,27 +473,72 @@ msgstr "" msgid "Argument must be a number." msgstr "" -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." msgstr "" -#: ../zathura/completion.c:293 -msgid "Attachments" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" msgstr "" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" msgstr "" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 @@ -497,86 +559,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" msgstr "" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" msgstr "" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" +#: ../zathura/completion.c:328 +msgid "Attachments" msgstr "" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/id_ID.po b/po/id_ID.po index 5f5bcf9..1284a9e 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: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:47+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/" "zathura/language/id_ID/)\n" @@ -17,26 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Masukan '%s' tidak valid" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Index '%s' tidak valid" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -193,131 +178,163 @@ msgid "Show directories" msgstr "Perlihatkan direktori" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Selalu buka halaman pertama" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Sorot hasil pencarian" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Fungsikan pencarian berkelanjutan" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Hapus hasil pencarian ketika batal mencari" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Gunakan nama dasar file pada judul jendela" -#: ../zathura/config.c:227 +#: ../zathura/config.c:229 +msgid "Use ~ instead of $HOME in the filename in the window title" +msgstr "" + +#: ../zathura/config.c:231 msgid "Display the page number in the window title" msgstr "Tampilkan nomor laman pada jendela judul" -#: ../zathura/config.c:229 +#: ../zathura/config.c:233 msgid "Use basename of the file in the statusbar" msgstr "Gunakan nama dasar berkas pada statusbar" -#: ../zathura/config.c:231 -msgid "Enable synctex support" -msgstr "Support synctex" - -#: ../zathura/config.c:233 -msgid "Synctex editor command" -msgstr "" - #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 +msgid "Enable synctex support" +msgstr "Support synctex" + +#: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "Data yang dipilih tetikus akan ditulis ke clipboard" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Tambahkan pada bookmark" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Hapus bookmark" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Perlihatkan semua bookmark" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Tutup file ini" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Informasi file" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Jalankan perintah" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Bantuan" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Buka dokumen" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Tutup zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Cetak dokumen" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Simpan dokumen" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Simpan dokumen (dan menimpa berkas)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Simpan lampiran" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Set offset halaman" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Tandai lokasi sekarang dalam dokumen" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Hapus tanda terpilih" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Jangan menyorot hasil cari sekarang" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Sorot hasil pencarian sekarang" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Tunjukan informasi versi" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Masukan '%s' tidak valid" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Index '%s' tidak valid" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -457,28 +474,73 @@ msgstr "Lampiran atau gambar tidak diketahui '%s'" msgid "Argument must be a number." msgstr "Argumen harus berupa angka." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Halaman %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Memuat....." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Lampiran" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Salin gambar" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Citra" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Simpan gambar sebagai" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Mengembalikan jendela sesuai dengan xid yang ditentukan" + +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Path ke direktori konfigurasi" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Path ke direktori data" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Dokumen ini tidak mempunyai indeks" +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Path ke direktori plugin" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Jalankan pada latar" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Kata sandi dokumen" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "Nomor halaman tujuan" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Tingkat log (debug, info, peringatan, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Cetak informasi versi" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Synctex editor (diteruskan ke perintah synctex)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -498,87 +560,41 @@ msgstr "Link: %s" msgid "Link: Invalid" msgstr "Link: Tidak valid" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Memuat....." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Dokumen ini tidak mempunyai indeks" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Salin gambar" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Halaman %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Simpan gambar sebagai" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Lampiran" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Citra" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Tidak berjudul]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Tidak dapat membaca berkas dari stdin dan menulisnya ke berkas sementar" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Tipe berkas tidak didukung. Silakan memasang plugin yang dibutuhkan." -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "Dokumen tidak mempunyai laman apapun" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Mengembalikan jendela sesuai dengan xid yang ditentukan" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Path ke direktori konfigurasi" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Path ke direktori data" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Path ke direktori plugin" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Jalankan pada latar" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Kata sandi dokumen" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "Nomor halaman tujuan" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Tingkat log (debug, info, peringatan, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Cetak informasi versi" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Synctex editor (diteruskan ke perintah synctex)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/it.po b/po/it.po index a471095..0aa745c 100644 --- a/po/it.po +++ b/po/it.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:48+0200\n" -"Last-Translator: Simone Guercio \n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:06+0200\n" +"Last-Translator: Sebastian Ramacher \n" "Language-Team: Italian (http://www.transifex.com/projects/p/zathura/language/" "it/)\n" "Language: it\n" @@ -20,26 +20,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "'%s' non può essere 0. Imposta ad 1." - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Input inserito '%s' non valido." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Indice inserito '%s' non valido." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" +msgid "Printing failed: %s" +msgstr "Impossibile stampare: %s" #. zathura settings #: ../zathura/config.c:144 @@ -195,131 +181,163 @@ msgid "Show directories" msgstr "Mostra cartelle" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Apri sempre alla prima pagina" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Evidenzia i risultati della ricerca" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Abilita la ricerca incrementale" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "Mostra il numero di pagina nel titolo della finestra" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" -msgstr "Abilita il supporto per synctex" +msgid "Display the page number in the window title" +msgstr "Mostra il numero di pagina nel titolo della finestra" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 +msgid "Use ~ instead of $HOME in the filename in the statusbar" +msgstr "" + +#: ../zathura/config.c:237 +msgid "Enable synctex support" +msgstr "Abilita il supporto per synctex" + +#: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 msgid "Enable D-Bus service" msgstr "Abilita il servizio D-Bus" -#: ../zathura/config.c:237 +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "Attiva la notifica dopo aver selezionato del testo" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Aggiungi un segnalibro" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Elimina un segnalibro" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Mostra i segnalibri" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Chiudi il file corrente" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Mostra le informazioni sul file" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Esegui un comando" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Mostra l' aiuto" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Apri un documento" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Chiudi zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Stampa il documento" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Salva il documento" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Salva il documento (e sovrascrivi)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Salva allegati" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Imposta l' offset della pagina" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Segna la posizione attuale all'interno del documento" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Non evidenziare i risultati della ricerca in corso" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Evidenzia i risultati della ricerca in corso" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Mostra informazioni sulla versione" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "'%s' non può essere 0. Imposta ad 1." + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Input inserito '%s' non valido." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Indice inserito '%s' non valido." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -459,28 +477,73 @@ msgstr "Immagine o allegato sconosciuti '%s" msgid "Argument must be a number." msgstr "L' argomento dev' essere un numero." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Pagina %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Caricamento..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Allegati" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copia immagine" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Immagini" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Salva immagine come" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" -msgstr "Impossibile stampare: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Questo documento non contiene l' indice" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Percorso della directory della configurazione" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Percorso della directory dei dati" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "Percorso della cartella di cache" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Percorso della directory contenente i plugin" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Crea un processo separato" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Password del documento" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Livello di log (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Mostra le informazioni sul file" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -500,88 +563,42 @@ msgstr "Link: %s" msgid "Link: Invalid" msgstr "Link: non valido" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Caricamento..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Questo documento non contiene l' indice" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copia immagine" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Pagina %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Salva immagine come" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Allegati" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Immagini" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Nessun nome]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Impossibile leggere il file dall' stdin e scriverlo in un file temporaneo." -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" "Tipo di file non supportato. Per favore, installa il plugin necessario." -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "Il documento non contiene alcuna pagina" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Percorso della directory della configurazione" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Percorso della directory dei dati" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "Percorso della cartella di cache" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Percorso della directory contenente i plugin" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Crea un processo separato" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Password del documento" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Livello di log (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Mostra le informazioni sul file" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/lt.po b/po/lt.po index 1999372..e18dce8 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:48+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/zathura/" "language/lt/)\n" @@ -18,26 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Netinkama įvestis: „%s“." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Duotas netinkamas indeksas: „%s“." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -194,131 +179,163 @@ msgid "Show directories" msgstr "Rodyti katalogų sąrašą" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Visada atverti pirmą puslapį" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Pažymėti paieškos rezultatus" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Įjungti prieauginę paiešką" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Išvalyti paieškos rezultatus nutraukiant" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 +#: ../zathura/config.c:229 +msgid "Use ~ instead of $HOME in the filename in the window title" +msgstr "" + +#: ../zathura/config.c:231 msgid "Display the page number in the window title" msgstr "Rodyti puslapio skaičių lango pavadinime" -#: ../zathura/config.c:229 +#: ../zathura/config.c:233 msgid "Use basename of the file in the statusbar" msgstr "Naudoti bylos vardą būsenos juostoje" -#: ../zathura/config.c:231 -msgid "Enable synctex support" -msgstr "Įjungti synctex palaikymą" - -#: ../zathura/config.c:233 -msgid "Synctex editor command" -msgstr "" - #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 +msgid "Enable synctex support" +msgstr "Įjungti synctex palaikymą" + +#: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Pridėti žymę" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Ištrinti žymę" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Žymių sąrašas" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Uždaryti dabartinę bylą" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Rodyti bylos informaciją" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Rodyti pagalbą" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Atidryti dokumentą" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Uždaryti zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Atspausdinti dokumentą" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Išsaugoti dokumentą" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Išsaugoti dokumentą (ir priverstinai perašyti)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Išsaugoti priedus" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Nustatyti puslapio poslinkį" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Pažymėti dabartinę dokumento vietą" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Ištrinti šias žymes" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Nežymėti dabartinės paieškos rezultatų" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Pažymėti dabartinės paieškos rezultatus" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Rodyti versijos informaciją" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Netinkama įvestis: „%s“." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Duotas netinkamas indeksas: „%s“." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -458,28 +475,73 @@ msgstr "Nežinomas priedas ar atvaizdas „%s“." msgid "Argument must be a number." msgstr "Parametras turi būti skaičius." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "%d puslapis" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Kraunama..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Priedai" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Kopijuoti atvaizdą" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Atvaizdai" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Irašyti atvaizdą kaip" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Šit dokumentas neturi turinio" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Konfigūracinių failų aplanko adresas" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Duomenų aplanko adresas" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Įskiepių aplanko adresas" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Dokumento slaptažodis" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "Pereiti į puslapį" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Registravimo lygis (derinimas, informacija, įspėjimai, klaidos)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Spausdinti versijos informaciją" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Synctex redaktorius (naudojama synctex komandoje)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -499,86 +561,40 @@ msgstr "Nuoroda: %s" msgid "Link: Invalid" msgstr "Neteisinga nuoroda" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Kraunama..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Šit dokumentas neturi turinio" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Kopijuoti atvaizdą" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "%d puslapis" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Irašyti atvaizdą kaip" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Priedai" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Atvaizdai" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Bevardis]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Bylos tipas nepalaikomas. Įdiekite tam skirtus įskiepius." -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "Dokumente puslapių nėra" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Konfigūracinių failų aplanko adresas" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Duomenų aplanko adresas" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Įskiepių aplanko adresas" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Dokumento slaptažodis" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "Pereiti į puslapį" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Registravimo lygis (derinimas, informacija, įspėjimai, klaidos)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Spausdinti versijos informaciją" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Synctex redaktorius (naudojama synctex komandoje)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/no.po b/po/no.po index 0c0b45d..1af3853 100644 --- a/po/no.po +++ b/po/no.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:48+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Norwegian (http://www.transifex.com/projects/p/zathura/" "language/no/)\n" @@ -17,27 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Ugyldig inndata '%s' gitt." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Ugyldig index '%s' gitt." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" +msgid "Printing failed: %s" +msgstr "Utskrift feilet: %s" #. zathura settings #: ../zathura/config.c:144 @@ -193,131 +178,163 @@ msgid "Show directories" msgstr "Vis mapper" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Alltid åpne på første side" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Uthev søkeresultater" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Stryk ut søkeresulteter ved avbrytelse" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "Vis nummer av sider i vinduestittelen" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" -msgstr "" +msgid "Display the page number in the window title" +msgstr "Vis nummer av sider i vinduestittelen" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" -msgstr "Aktiv D-Bus servicen" +msgid "Use ~ instead of $HOME in the filename in the statusbar" +msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "Aktiv D-Bus servicen" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Legg til bokmerke" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Slett bokmerke" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "List alle bokmerker" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Lukk den gjeldende filen" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Vis filinformasjon" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Kjør en kommando" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Vis hjelp" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Åpne dokument" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Lukk zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Skriv ut dokument" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Lagre dokument" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Lagre dokument (og tving til å skrive over)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Lagre vedlegg" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Marker nåværende lokalasjon i dokumentet" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Slett spesifiserte merker" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Ikke uthev gjeldende søkeresultater" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Uthev følgende søkeresultater" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Vis versjonsinformasjon" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Ugyldig inndata '%s' gitt." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Ugyldig index '%s' gitt." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -457,28 +474,73 @@ msgstr "Ukjent vedlegg eller bilde '%s'." msgid "Argument must be a number." msgstr "Argumentet må være et tall." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Side %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Laster..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Vedlegg" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Kopier bilde" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Bilder" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Lagre bilde som" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" -msgstr "Utskrift feilet: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Dette dokumenetet inneholder ikke noen index" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Sti til konfigureringsmappe" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Sti til data-mappe" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Sti til mapper som inneholder plugins" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Dokument passord" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "Sidetall å gå til" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Logg nivå (diagnostisering, info, advarsler, feil)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Skriv ut versjonsinformasjon" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "Start i ikke-standard modus" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -498,86 +560,40 @@ msgstr "" msgid "Link: Invalid" msgstr "Link: Ugyldig" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Laster..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Dette dokumenetet inneholder ikke noen index" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Kopier bilde" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Side %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Lagre bilde som" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Vedlegg" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Bilder" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Inget navn]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "Kunne ikke lese fil fra stdin og skrive til temporærfil." -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Usupportert filtype. Vennligst innstaller den nødvendige pluginen." -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "Dokumentet inneholder ingen sider" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Sti til konfigureringsmappe" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Sti til data-mappe" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Sti til mapper som inneholder plugins" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Dokument passord" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "Sidetall å gå til" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Logg nivå (diagnostisering, info, advarsler, feil)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Skriv ut versjonsinformasjon" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "Start i ikke-standard modus" diff --git a/po/pl.po b/po/pl.po index d445950..6ba5ab9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:48+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Polish (http://www.transifex.com/projects/p/zathura/language/" "pl/)\n" @@ -19,27 +19,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Nieprawidłowy argument: %s" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Nieprawidłowy indeks: %s" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" +msgid "Printing failed: %s" +msgstr "Nie można wydrukować: %s" #. zathura settings #: ../zathura/config.c:144 @@ -195,131 +180,163 @@ msgid "Show directories" msgstr "Wyświetl katalogi" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Zawsze otwieraj na pierwszej stronie" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Podświetl wyniki wyszukiwania" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Włącz wyszukiwanie przyrostowe" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Wyczyść wyniki wyszukiwania po przerwaniu" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Pokaż nazwę pliku w pasku tytułu" -#: ../zathura/config.c:227 +#: ../zathura/config.c:229 +msgid "Use ~ instead of $HOME in the filename in the window title" +msgstr "" + +#: ../zathura/config.c:231 msgid "Display the page number in the window title" msgstr "Wyświetl numer strony w pasku tytułu" -#: ../zathura/config.c:229 +#: ../zathura/config.c:233 msgid "Use basename of the file in the statusbar" msgstr "Nazwa pliku w pasku stanu" -#: ../zathura/config.c:231 +#: ../zathura/config.c:235 +msgid "Use ~ instead of $HOME in the filename in the statusbar" +msgstr "" + +#: ../zathura/config.c:237 msgid "Enable synctex support" msgstr "Włącz synctex" -#: ../zathura/config.c:233 +#: ../zathura/config.c:239 msgid "Synctex editor command" msgstr "" -#: ../zathura/config.c:235 +#: ../zathura/config.c:241 msgid "Enable D-Bus service" msgstr "Uruchom serwis D-Bus" -#: ../zathura/config.c:237 +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Dodaj zakładkę" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Usuń zakładkę" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Wyświetl zakładki" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Zamknij plik" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Wyświetl informacje o pliku" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Wykonaj polecenie" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Wyświetl pomoc" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Otwórz plik" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Zakończ" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Wydrukuj" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Zapisz" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Zapisz (nadpisując istniejący plik)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Zapisz załączniki" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Ustaw przesunięcie numerów stron" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Zaznacz aktualną pozycję w dokumencie" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Skasuj określone zakładki" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Nie podświetlaj aktualnych wyników wyszukiwania " -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Podświetl aktualne wyniki wyszukiwania" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Wyświetl informacje o wersji" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Nieprawidłowy argument: %s" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Nieprawidłowy indeks: %s" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -459,28 +476,73 @@ msgstr "Nieznany załącznik lub obrazek '%s'." msgid "Argument must be a number." msgstr "Parametr polecenia musi być liczbą" -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Strona %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Wczytywanie pliku..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Załączniki" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Skopiuj obrazek" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Obrazki" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Zapisz obrazek jako" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" -msgstr "Nie można wydrukować: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Przypisz proces do rodzica o danym xid" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Dokument nie zawiera indeksu" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Położenie katalogu konfiguracyjnego" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Położenie katalogu danych" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Położenie katalogu wtyczek" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Forkuj w tle" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Hasło dokumentu" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Szczegółowość komunikatów (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Wyświetl informacje o wersji" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Edytor synctex (przekierowanie do komendy synctex)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -500,86 +562,40 @@ msgstr "Link: %s" msgid "Link: Invalid" msgstr "Nieprawidłowy link" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Wczytywanie pliku..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Dokument nie zawiera indeksu" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Skopiuj obrazek" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Strona %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Zapisz obrazek jako" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Załączniki" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Obrazki" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[bez nazwy]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Niewspierany rodzaj pliku. Zainstaluj wymagane wtyczki" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "Dokument nie zawiera żadnej strony" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Przypisz proces do rodzica o danym xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Położenie katalogu konfiguracyjnego" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Położenie katalogu danych" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Położenie katalogu wtyczek" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Forkuj w tle" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Hasło dokumentu" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Szczegółowość komunikatów (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Wyświetl informacje o wersji" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Edytor synctex (przekierowanie do komendy synctex)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5eff268..28d9c75 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:49+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "zathura/language/pt_BR/)\n" @@ -17,27 +17,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Dados de entrada inválida '%s' ." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Dados de índice invalido '%s'." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" +msgid "Printing failed: %s" +msgstr "Impressão falhou: %s" #. zathura settings #: ../zathura/config.c:144 @@ -194,133 +179,165 @@ msgid "Show directories" msgstr "Mostrar diretórios" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Sempre abrir na primeira página" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Destaque resultados de busca" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Ativar pesquisa incremental" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Limpar resultados de busca ou abortar" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Usar nome do arquivo na barra de titulo" -#: ../zathura/config.c:227 +#: ../zathura/config.c:229 +msgid "Use ~ instead of $HOME in the filename in the window title" +msgstr "" + +#: ../zathura/config.c:231 msgid "Display the page number in the window title" msgstr "Exibir o número da página no título da janela." -#: ../zathura/config.c:229 +#: ../zathura/config.c:233 msgid "Use basename of the file in the statusbar" msgstr "Use o nome do arquivo na barra de status" -#: ../zathura/config.c:231 +#: ../zathura/config.c:235 +msgid "Use ~ instead of $HOME in the filename in the statusbar" +msgstr "" + +#: ../zathura/config.c:237 msgid "Enable synctex support" msgstr "Ativar suporte synctex" -#: ../zathura/config.c:233 +#: ../zathura/config.c:239 msgid "Synctex editor command" msgstr "" -#: ../zathura/config.c:235 +#: ../zathura/config.c:241 msgid "Enable D-Bus service" msgstr "Habilitar serviço D-Bus" -#: ../zathura/config.c:237 +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "" "A área de transferência em que o dados selecionados com o mouse vão ser " "escritos" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Adicionar um favorito" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Deletar um favorito" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Listar todos favoritos" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Fechar arquivo atual" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Mostrar informações do arquivo" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Executar um comando" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Mostrar ajuda" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Abrir documento" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Fechar zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Imprimir documento" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Salvar documento" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Salvar documento (e forçar sobrescrever)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Salvar anexos" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Definir deslocamento da página" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Marcar localização atual no documento" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Apagar as marcas especificadas" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Não destacar resultados de busca atual" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Destacar resultado de busca atual" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Mostrar informações sobre a versão" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Dados de entrada inválida '%s' ." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Dados de índice invalido '%s'." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -460,28 +477,73 @@ msgstr "Anexo desconhecido ou imagem '%s'." msgid "Argument must be a number." msgstr "O argumento deve ser um número." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Página %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Carregando..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Anexos" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copiar imagem" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Imagens" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Salvar imagem para" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" -msgstr "Impressão falhou: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Reparar a janela especificada por xid" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Este documento não contem qualquer índice" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Caminho de diretório para configuração" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Caminho para diretório de dados" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Caminho de diretório que contenham plugins" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Deslocar no fundo" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Senha do documento" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "Número da página para ir" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Nível de log (depurar, informação, aviso, erro)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Imprimir informações sobre a versão" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Editor synctex (encaminhado para o comando synctex)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "Mover para determinada posição synctex" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "Destacar determinada posição no determinado processo" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "Começar em um modo não padrão" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -501,89 +563,43 @@ msgstr "Link: %s" msgid "Link: Invalid" msgstr "Link: Inválido" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Carregando..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Este documento não contem qualquer índice" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copiar imagem" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Página %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Salvar imagem para" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Anexos" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Imagens" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Sem nome]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Não foi possível ler o arquivo a partir de stdin e gravá-lo em um arquivo " "temporário." -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" "Formato de arquivo não suportado. Por favor, instale o plugin necessário." -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "Documento não contém quaisquer páginas" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Reparar a janela especificada por xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Caminho de diretório para configuração" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Caminho para diretório de dados" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Caminho de diretório que contenham plugins" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Deslocar no fundo" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Senha do documento" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "Número da página para ir" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Nível de log (depurar, informação, aviso, erro)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Imprimir informações sobre a versão" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Editor synctex (encaminhado para o comando synctex)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "Mover para determinada posição synctex" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "Destacar determinada posição no determinado processo" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "Começar em um modo não padrão" diff --git a/po/ru.po b/po/ru.po index 10516bc..eaf90e3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:49+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Russian (http://www.transifex.com/projects/p/zathura/language/" "ru/)\n" @@ -21,27 +21,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "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" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Неправильный ввод: %s." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Получен неверный индекс: %s." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" +msgid "Printing failed: %s" +msgstr "Не удалось напечатать %s" #. zathura settings #: ../zathura/config.c:144 @@ -197,131 +182,163 @@ msgid "Show directories" msgstr "Показывать каталоги" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Всегда открывать на первой странице" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Подсветить результаты поиска" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Включить инкрементальный поиск" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Сбросить результаты при отмене поиска" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Использовать базовое имя файла в заголовке" -#: ../zathura/config.c:227 +#: ../zathura/config.c:229 +msgid "Use ~ instead of $HOME in the filename in the window title" +msgstr "" + +#: ../zathura/config.c:231 msgid "Display the page number in the window title" msgstr "Показывать номер страницы в заголовке" -#: ../zathura/config.c:229 +#: ../zathura/config.c:233 msgid "Use basename of the file in the statusbar" msgstr "Использовать базовое имя файла в строке состояния" -#: ../zathura/config.c:231 +#: ../zathura/config.c:235 +msgid "Use ~ instead of $HOME in the filename in the statusbar" +msgstr "" + +#: ../zathura/config.c:237 msgid "Enable synctex support" msgstr "Включить поддержку synctex" -#: ../zathura/config.c:233 +#: ../zathura/config.c:239 msgid "Synctex editor command" msgstr "" -#: ../zathura/config.c:235 +#: ../zathura/config.c:241 msgid "Enable D-Bus service" msgstr "Включить сервис D-Bus" -#: ../zathura/config.c:237 +#: ../zathura/config.c:243 msgid "The clipboard into which mouse-selected data will be written" msgstr "Буфер для записи данных из области выделенных мышкой" -#: ../zathura/config.c:239 +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Добавить закладку" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Удалить закладку" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Показать все закладки" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Закрыть текущий файл" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Показать информацию о файле" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Выполнить команду" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Помощь" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Открыть документ" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Выход" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Печать" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Сохранить документ" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Сохранить документ (с перезаписью)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Сохранить прикреплённые файлы" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Сохранить смещение страницы" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Пометить текущую позицию в документе" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Удалить указанные пометки" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Не подсвечивать результаты текущего поиска" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Подсветить результаты текущего поиска" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Показать информацию о версии файла" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Неправильный ввод: %s." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Получен неверный индекс: %s." + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -461,28 +478,73 @@ msgstr "Неизвестное вложение или изображение « msgid "Argument must be a number." msgstr "Аргумент должен быть числом." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Страница %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Загрузка..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Прикреплённые файлы" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Скопировать изображение" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Изображения" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Сохранить изображение как" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" -msgstr "Не удалось напечатать %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Сменить материнское окно на окно, указанное в xid" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "В документе нет индекса" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Путь к каталогу с настройкой" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Путь к каталогу с данными" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Путь к каталогу с плагинами" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Запустить в фоне" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Пароль документа" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "Перейти к странице номер" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Уровень журналирования (debug, info, warning, error)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Показать информацию о файле" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Редактор для synctex (передаётся далее программе synctex)" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "Перейти к указанному положению synctex" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "Подсветка заданного положения в заданном процессе" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "Запустить в специальном режиме" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -502,88 +564,42 @@ msgstr "Ссылка: %s" msgid "Link: Invalid" msgstr "Ссылка: неправильная" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Загрузка..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "В документе нет индекса" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Скопировать изображение" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Страница %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Сохранить изображение как" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Прикреплённые файлы" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Изображения" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Без названия]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Не удалось прочитать файл со стандартного входа и записать его во временный " "файл." -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Тип файла не поддерживается. Установите соответствующий плагин." -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "В документе нет страниц" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Сменить материнское окно на окно, указанное в xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Путь к каталогу с настройкой" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Путь к каталогу с данными" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Путь к каталогу с плагинами" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Запустить в фоне" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Пароль документа" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "Перейти к странице номер" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Уровень журналирования (debug, info, warning, error)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Показать информацию о файле" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Редактор для synctex (передаётся далее программе synctex)" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "Перейти к указанному положению synctex" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "Подсветка заданного положения в заданном процессе" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "Запустить в специальном режиме" diff --git a/po/ta_IN.po b/po/ta_IN.po index e3ff9ac..91fd152 100644 --- a/po/ta_IN.po +++ b/po/ta_IN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-04-13 19:42+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" "PO-Revision-Date: 2014-01-31 09:37+0000\n" "Last-Translator: mankand007 \n" "Language-Team: Tamil (India) (http://www.transifex.net/projects/p/zathura/" @@ -18,24 +18,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "கொடுக்கப்பட்ட உள்ளீடு(input) '%s' தவறு" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "கொடுக்கப்பட்ட index '%s' தவறு" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -192,131 +177,163 @@ msgid "Show directories" msgstr "" #: ../zathura/config.c:216 -msgid "Always open on first page" +msgid "Show recent files" msgstr "" #: ../zathura/config.c:218 +msgid "Always open on first page" +msgstr "" + +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "புதிய bookmark உருவாக்கு" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Bookmark-ஐ அழித்துவிடு" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "அனைத்து bookmark-களையும் பட்டியலிடு" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "ஆவணம் பற்றிய தகவல்களைக் காட்டு" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "உதவியைக் காட்டு" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "ஒரு ஆவணத்தைத் திற" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "zathura-வை விட்டு வெளியேறு" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "ஆவணத்தை அச்சிடு" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "ஆவணத்தை சேமிக்கவும்" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "இணைப்புகளைச் சேமிக்கவும்" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "கொடுக்கப்பட்ட உள்ளீடு(input) '%s' தவறு" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "கொடுக்கப்பட்ட index '%s' தவறு" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -456,28 +473,73 @@ msgstr "" msgid "Argument must be a number." msgstr "Argument ஒரு எண்ணாக இருக்க வேண்டும்" -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." msgstr "" -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "இணைப்புகளைச் சேமிக்கவும்" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "படத்தை ஒரு பிரதியெடு" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" msgstr "" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "இந்த ஆவணத்தில் எந்த index-ம் இல்லை" +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "ஆவணம் பற்றிய தகவல்களைக் காட்டு" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -497,86 +559,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "இந்த ஆவணத்தில் எந்த index-ம் இல்லை" + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" msgstr "" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "படத்தை ஒரு பிரதியெடு" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "இணைப்புகளைச் சேமிக்கவும்" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" +#. add images +#: ../zathura/completion.c:359 +msgid "Images" msgstr "" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "பெயரற்ற ஆவணம்" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "ஆவணம் பற்றிய தகவல்களைக் காட்டு" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/tr.po b/po/tr.po index d2edae2..68d2636 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: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:49+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:05+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Turkish (http://www.transifex.net/projects/p/zathura/language/" "tr/)\n" @@ -18,26 +18,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Hatalı girdi '%s'" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Hatalı dizin '%s'" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -194,131 +179,163 @@ msgid "Show directories" msgstr "Dizinleri göster" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Her zaman ilk sayfayı aç" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "Arama sonuçlarını vurgula" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "Artımlı aramayı etkinleştir" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "Kapatınca arama sonuçlarını temizle" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "Pencere başlığı olarak dosyanın adını kullan" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Yer imi ekle" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Yer imi sil" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Yer imlerini listele" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Geçerli dosyayı kapat" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Dosya bilgisi göster" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "Bir komut çalıştır" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Yardım bilgisi göster" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Belge aç" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Zathura'yı kapat" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Belge yazdır" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Belgeyi kaydet" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Belgeyi kaydet (ve sormadan üzerine yaz)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Ekleri kaydet" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Sayfa derinliğini ayarla" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "Bu belgede bu konumu işaretle" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "Seçilen işaretlemeleri sil" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "Şuanki arama sonuçlarını vurgulama" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "Şuanki arama sonuçlarını vurgula" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "Versiyon bilgisi göster" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Hatalı girdi '%s'" + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Hatalı dizin '%s'" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -458,28 +475,73 @@ msgstr "Tanınmayan eklenti veya resim dosyası '%s'" msgid "Argument must be a number." msgstr "Argüman bir sayı olmalı." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" -msgstr "Sayfa %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Yüklüyor ..." -#: ../zathura/completion.c:293 -msgid "Attachments" -msgstr "Ekleri kaydet" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Resim kopyala" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" -msgstr "Resimler" +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Resmi farklı kaydet" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Xid tarafından belirlendiği gibi bir üst seviye pencereye bağlı" + +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Ayar dizini adresi" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Veri dizini adresi" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Bu belge fihrist içermiyor" +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Eklentileri içeren dizinin adresi" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Arka planda işlemden çocuk oluştur" + +#: ../zathura/main.c:67 +msgid "Document password" +msgstr "Belge şifresi" + +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Kayıt seviyesi (hata ayıklama, bilgi, uyarı, hata)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Dosya bilgisi göster" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -499,86 +561,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Yüklüyor ..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Bu belge fihrist içermiyor" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Resim kopyala" +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Sayfa %d" -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Resmi farklı kaydet" +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Ekleri kaydet" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Resimler" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[İsimsiz]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Xid tarafından belirlendiği gibi bir üst seviye pencereye bağlı" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Ayar dizini adresi" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Veri dizini adresi" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Eklentileri içeren dizinin adresi" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Arka planda işlemden çocuk oluştur" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "Belge şifresi" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Kayıt seviyesi (hata ayıklama, bilgi, uyarı, hata)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Dosya bilgisi göster" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" diff --git a/po/uk_UA.po b/po/uk_UA.po index 950159c..de3e94f 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: 2015-04-13 19:42+0200\n" -"PO-Revision-Date: 2015-04-13 19:49+0200\n" +"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"PO-Revision-Date: 2015-10-15 23:05+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/" "zathura/language/uk_UA/)\n" @@ -18,26 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "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" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../zathura/callbacks.c:233 +#: ../zathura/print.c:64 ../zathura/print.c:211 #, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Вказано невірний аргумент: %s." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Вказано невірний індекс: %s" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" +msgid "Printing failed: %s" msgstr "" #. zathura settings @@ -194,131 +179,163 @@ msgid "Show directories" msgstr "Показати диреторії" #: ../zathura/config.c:216 +msgid "Show recent files" +msgstr "" + +#: ../zathura/config.c:218 msgid "Always open on first page" msgstr "Завжди відкривати на першій сторінці" -#: ../zathura/config.c:218 +#: ../zathura/config.c:220 msgid "Highlight search results" msgstr "" -#: ../zathura/config.c:221 +#: ../zathura/config.c:223 msgid "Enable incremental search" msgstr "" -#: ../zathura/config.c:223 +#: ../zathura/config.c:225 msgid "Clear search results on abort" msgstr "" -#: ../zathura/config.c:225 +#: ../zathura/config.c:227 msgid "Use basename of the file in the window title" msgstr "" -#: ../zathura/config.c:227 -msgid "Display the page number in the window title" -msgstr "" - #: ../zathura/config.c:229 -msgid "Use basename of the file in the statusbar" +msgid "Use ~ instead of $HOME in the filename in the window title" msgstr "" #: ../zathura/config.c:231 -msgid "Enable synctex support" +msgid "Display the page number in the window title" msgstr "" #: ../zathura/config.c:233 -msgid "Synctex editor command" +msgid "Use basename of the file in the statusbar" msgstr "" #: ../zathura/config.c:235 -msgid "Enable D-Bus service" +msgid "Use ~ instead of $HOME in the filename in the statusbar" msgstr "" #: ../zathura/config.c:237 -msgid "The clipboard into which mouse-selected data will be written" +msgid "Enable synctex support" msgstr "" #: ../zathura/config.c:239 +msgid "Synctex editor command" +msgstr "" + +#: ../zathura/config.c:241 +msgid "Enable D-Bus service" +msgstr "" + +#: ../zathura/config.c:243 +msgid "The clipboard into which mouse-selected data will be written" +msgstr "" + +#: ../zathura/config.c:245 msgid "Enable notification after selecting text" msgstr "" #. define default inputbar commands -#: ../zathura/config.c:425 +#: ../zathura/config.c:435 msgid "Add a bookmark" msgstr "Додати закладку" -#: ../zathura/config.c:426 +#: ../zathura/config.c:436 msgid "Delete a bookmark" msgstr "Вилучити закладку" -#: ../zathura/config.c:427 +#: ../zathura/config.c:437 msgid "List all bookmarks" msgstr "Дивитись усі закладки" -#: ../zathura/config.c:428 +#: ../zathura/config.c:438 msgid "Close current file" msgstr "Закрити документ" -#: ../zathura/config.c:429 +#: ../zathura/config.c:439 msgid "Show file information" msgstr "Показати інформацію файлу" -#: ../zathura/config.c:430 ../zathura/config.c:431 +#: ../zathura/config.c:440 ../zathura/config.c:441 msgid "Execute a command" msgstr "" #. like vim -#: ../zathura/config.c:432 +#: ../zathura/config.c:442 msgid "Show help" msgstr "Показати довідку" -#: ../zathura/config.c:433 +#: ../zathura/config.c:443 msgid "Open document" msgstr "Відкрити документ" -#: ../zathura/config.c:434 +#: ../zathura/config.c:444 msgid "Close zathura" msgstr "Вийти із zathura" -#: ../zathura/config.c:435 +#: ../zathura/config.c:445 msgid "Print document" msgstr "Друкувати документ" -#: ../zathura/config.c:436 +#: ../zathura/config.c:446 msgid "Save document" msgstr "Зберегти документ" -#: ../zathura/config.c:437 +#: ../zathura/config.c:447 msgid "Save document (and force overwriting)" msgstr "Зберегти документ (форсувати перезапис)" -#: ../zathura/config.c:438 +#: ../zathura/config.c:448 msgid "Save attachments" msgstr "Зберегти прикріплення" -#: ../zathura/config.c:439 +#: ../zathura/config.c:449 msgid "Set page offset" msgstr "Встановити зміщення сторінки" -#: ../zathura/config.c:440 +#: ../zathura/config.c:450 msgid "Mark current location within the document" msgstr "" -#: ../zathura/config.c:441 +#: ../zathura/config.c:451 msgid "Delete the specified marks" msgstr "" -#: ../zathura/config.c:442 +#: ../zathura/config.c:452 msgid "Don't highlight current search results" msgstr "" -#: ../zathura/config.c:443 +#: ../zathura/config.c:453 msgid "Highlight current search results" msgstr "" -#: ../zathura/config.c:444 +#: ../zathura/config.c:454 msgid "Show version information" msgstr "" +#: ../zathura/callbacks.c:233 +#, c-format +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:310 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Вказано невірний аргумент: %s." + +#: ../zathura/callbacks.c:346 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Вказано невірний індекс: %s" + +#: ../zathura/callbacks.c:588 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + #: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 #: ../zathura/commands.c:152 ../zathura/commands.c:268 #: ../zathura/commands.c:298 ../zathura/commands.c:324 @@ -458,28 +475,73 @@ msgstr "" msgid "Argument must be a number." msgstr "Аргумент повинен бути цифрою." -#: ../zathura/completion.c:250 -#, c-format -msgid "Page %d" +#: ../zathura/page-widget.c:561 +msgid "Loading..." msgstr "" -#: ../zathura/completion.c:293 -msgid "Attachments" +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Копіювати картинку" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" msgstr "" -#. add images -#: ../zathura/completion.c:324 -msgid "Images" +#: ../zathura/main.c:60 +msgid "Reparents to window specified by xid" +msgstr "Вертатися до вікна, вказаного xid" + +#: ../zathura/main.c:62 +msgid "Path to the config directory" +msgstr "Шлях до теки конфігурації" + +#: ../zathura/main.c:63 +msgid "Path to the data directory" +msgstr "Шлях до теки з даними" + +#: ../zathura/main.c:64 +msgid "Path to the cache directory" msgstr "" -#: ../zathura/print.c:64 ../zathura/print.c:211 -#, c-format -msgid "Printing failed: %s" +#: ../zathura/main.c:65 +msgid "Path to the directories containing plugins" +msgstr "Шлях до теки з плаґінами" + +#: ../zathura/main.c:66 +msgid "Fork into the background" +msgstr "Працювати у фоні" + +#: ../zathura/main.c:67 +msgid "Document password" msgstr "" -#: ../zathura/shortcuts.c:1137 -msgid "This document does not contain any index" -msgstr "Індекс відсутній в цьому документі" +#: ../zathura/main.c:68 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:69 +msgid "Log level (debug, info, warning, error)" +msgstr "Рівень логування (налагодження, інфо, застереження, помилка)" + +#: ../zathura/main.c:70 +msgid "Print version information" +msgstr "Показати інформацію файлу" + +#: ../zathura/main.c:72 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:73 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:74 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:76 +msgid "Start in a non-default mode" +msgstr "" #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." @@ -499,86 +561,40 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/page-widget.c:561 -msgid "Loading..." +#: ../zathura/shortcuts.c:1137 +msgid "This document does not contain any index" +msgstr "Індекс відсутній в цьому документі" + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" msgstr "" -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Копіювати картинку" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" +#: ../zathura/completion.c:328 +msgid "Attachments" msgstr "" -#: ../zathura/zathura.c:204 ../zathura/zathura.c:1051 +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "" + +#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 msgid "[No name]" msgstr "[Без назви]" -#: ../zathura/zathura.c:518 +#: ../zathura/zathura.c:520 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:579 +#: ../zathura/zathura.c:604 +msgid "Enter password:" +msgstr "" + +#: ../zathura/zathura.c:639 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:589 +#: ../zathura/zathura.c:649 msgid "Document does not contain any pages" msgstr "" - -#: ../zathura/main.c:56 -msgid "Reparents to window specified by xid" -msgstr "Вертатися до вікна, вказаного xid" - -#: ../zathura/main.c:58 -msgid "Path to the config directory" -msgstr "Шлях до теки конфігурації" - -#: ../zathura/main.c:59 -msgid "Path to the data directory" -msgstr "Шлях до теки з даними" - -#: ../zathura/main.c:60 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:61 -msgid "Path to the directories containing plugins" -msgstr "Шлях до теки з плаґінами" - -#: ../zathura/main.c:62 -msgid "Fork into the background" -msgstr "Працювати у фоні" - -#: ../zathura/main.c:63 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Log level (debug, info, warning, error)" -msgstr "Рівень логування (налагодження, інфо, застереження, помилка)" - -#: ../zathura/main.c:66 -msgid "Print version information" -msgstr "Показати інформацію файлу" - -#: ../zathura/main.c:67 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Start in a non-default mode" -msgstr "" From 6d1e916a4fc8550ca228e3a771045118ba5133bb Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 20 Oct 2015 22:01:51 +0200 Subject: [PATCH 45/94] Fix argument Signed-off-by: Sebastian Ramacher --- zathura/plugin.c | 2 +- zathura/plugin.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zathura/plugin.c b/zathura/plugin.c index cb51a21..14fdbae 100644 --- a/zathura/plugin.c +++ b/zathura/plugin.c @@ -52,7 +52,7 @@ static void zathura_plugin_free(zathura_plugin_t* plugin); static void zathura_type_plugin_mapping_free(zathura_type_plugin_mapping_t* mapping); zathura_plugin_manager_t* -zathura_plugin_manager_new() +zathura_plugin_manager_new(void) { zathura_plugin_manager_t* plugin_manager = g_try_malloc0(sizeof(zathura_plugin_manager_t)); if (plugin_manager == NULL) { diff --git a/zathura/plugin.h b/zathura/plugin.h index 9512a0a..799159f 100644 --- a/zathura/plugin.h +++ b/zathura/plugin.h @@ -29,7 +29,7 @@ typedef struct zathura_plugin_version_s { * * @return A plugin manager object or NULL if an error occured */ -zathura_plugin_manager_t* zathura_plugin_manager_new(); +zathura_plugin_manager_t* zathura_plugin_manager_new(void); /** * Frees the plugin manager From 40e50192765c39dd15a0fb272b1c59f8fd04573d Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 22 Oct 2015 19:30:35 +0200 Subject: [PATCH 46/94] Fix makefile dependencies Signed-off-by: Sebastian Ramacher --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 203d0fb..9fc1fcc 100644 --- a/Makefile +++ b/Makefile @@ -101,9 +101,9 @@ ${OBJECTS}: config.mk ${PROJECT}/version.h \ ${BUILDDIR_RELEASE}/%.o: %.c $(call colorecho,CC,$<) - @mkdir -p ${DEPENDDIR}/$(dir $(abspath $@)) + @mkdir -p ${DEPENDDIR}/$(dir $@) @mkdir -p $(dir $(abspath $@)) - $(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep + $(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}: ${OBJECTS} $(call colorecho,CC,$@) @@ -125,10 +125,10 @@ ${OBJECTS_DEBUG}: config.mk ${PROJECT}/version.h \ ${BUILDDIR_DEBUG}/%.o: %.c $(call colorecho,CC,$<) - @mkdir -p ${DEPENDDIR}/$(dir $(abspath $@)) + @mkdir -p ${DEPENDDIR}/$(dir $@) @mkdir -p $(dir $(abspath $@)) $(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} \ - -o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep + -o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}: ${OBJECTS_DEBUG} $(call colorecho,CC,$@) @@ -148,10 +148,10 @@ ${OBJECTS_GCOV}: config.mk ${PROJECT}/version.h \ ${BUILDDIR_GCOV}/%.o: %.c $(call colorecho,CC,$<) - @mkdir -p ${DEPENDDIR}/$(dir $(abspath $@)) + @mkdir -p ${DEPENDDIR}/$(dir $@) @mkdir -p $(dir $(abspath $@)) $(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${GCOV_CFLAGS} \ - -o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep + -o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}: ${OBJECTS_GCOV} $(call colorecho,CC,$@) @@ -288,7 +288,8 @@ uninstall: uninstall-headers $(QUIET)rm -f $(DESTDIR)$(APPDATAPREFIX)/$(PROJECT).appdata.xml $(MAKE) -C po uninstall --include $(wildcard ${DEPENDDIR}/*.dep) +DEPENDS = ${DEPENDDIRS:^=${DEPENDDIR}/}$(addprefix ${DEPENDDIR}/,${OBJECTS:.o=.o.dep}) +-include ${DEPENDS} .PHONY: all options clean doc debug valgrind gdb dist doc install uninstall \ test po install-headers uninstall-headers update-po install-manpages \ From 2695a53bfcdf2b882b419e2a37c8d513b99feb01 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 11 Nov 2015 21:08:53 +0100 Subject: [PATCH 47/94] CS Signed-off-by: Sebastian Ramacher --- zathura/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zathura/utils.c b/zathura/utils.c index dcacf99..f1bd422 100644 --- a/zathura/utils.c +++ b/zathura/utils.c @@ -225,7 +225,8 @@ zathura_get_version_string(zathura_t* zathura, bool markup) return version; } -GdkAtom* get_selection(zathura_t* zathura) +GdkAtom* +get_selection(zathura_t* zathura) { g_return_val_if_fail(zathura != NULL, NULL); From 229ff0ad9a31ffd35e0a01a5cc748d0dce277426 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 11 Nov 2015 21:26:56 +0100 Subject: [PATCH 48/94] Remove some extra allocations Signed-off-by: Sebastian Ramacher --- zathura/utils.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/zathura/utils.c b/zathura/utils.c index f1bd422..a995eb7 100644 --- a/zathura/utils.c +++ b/zathura/utils.c @@ -195,9 +195,7 @@ zathura_get_version_string(zathura_t* zathura, bool markup) GString* string = g_string_new(NULL); /* zathura version */ - char* zathura_version = g_strdup_printf("zathura %d.%d.%d", ZATHURA_VERSION_MAJOR, ZATHURA_VERSION_MINOR, ZATHURA_VERSION_REV); - g_string_append(string, zathura_version); - g_free(zathura_version); + g_string_append_printf(string, "zathura %d.%d.%d", ZATHURA_VERSION_MAJOR, ZATHURA_VERSION_MINOR, ZATHURA_VERSION_REV); const char* format = (markup == true) ? "\n(plugin) %s (%d.%d.%d) (%s)" : "\n(plugin) %s (%d.%d.%d) (%s)"; @@ -207,15 +205,12 @@ zathura_get_version_string(zathura_t* zathura, bool markup) GIRARA_LIST_FOREACH(plugins, zathura_plugin_t*, iter, plugin) { char* name = zathura_plugin_get_name(plugin); zathura_plugin_version_t version = zathura_plugin_get_version(plugin); - char* text = g_strdup_printf(format, - (name == NULL) ? "-" : name, - version.major, - version.minor, - version.rev, - zathura_plugin_get_path(plugin) - ); - g_string_append(string, text); - g_free(text); + g_string_append_printf(string, format, + (name == NULL) ? "-" : name, + version.major, + version.minor, + version.rev, + zathura_plugin_get_path(plugin)); } GIRARA_LIST_FOREACH_END(plugins, zathura_plugin_t*, iter, plugin); } From 28d186c8bd0bac0fc0136c45d988e3f2f04ba4ef Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 11 Nov 2015 21:31:34 +0100 Subject: [PATCH 49/94] Remove unused imports Signed-off-by: Sebastian Ramacher --- zathura/utils.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/zathura/utils.c b/zathura/utils.c index a995eb7..7b120e2 100644 --- a/zathura/utils.c +++ b/zathura/utils.c @@ -4,9 +4,6 @@ #include #include #include -#include -#include -#include #include #include #include From 924b7e0e60022ecfff4e94e9ecf473c84666c253 Mon Sep 17 00:00:00 2001 From: Sebastian Neuser Date: Sat, 7 Nov 2015 19:52:25 +0100 Subject: [PATCH 50/94] shortcuts.c: Fix code comments --- zathura/shortcuts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c index 1cb3d02..17b4414 100644 --- a/zathura/shortcuts.c +++ b/zathura/shortcuts.c @@ -1308,7 +1308,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* render_all(zathura); refresh_view(zathura); - /* setm ode */ + /* set mode */ girara_mode_set(session, zathura->modes.normal); } else if (old_mode == zathura->modes.normal) { /* backup pages per row */ @@ -1336,7 +1336,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* gtk_window_fullscreen(GTK_WINDOW(session->gtk.window)); refresh_view(zathura); - /* setm ode */ + /* set mode */ girara_mode_set(session, zathura->modes.presentation); } From 7e2a18f7a8d0f5e0b9e81886cf4f76387bee093e Mon Sep 17 00:00:00 2001 From: Sebastian Neuser Date: Sat, 7 Nov 2015 19:55:25 +0100 Subject: [PATCH 51/94] Change type of first-page-column to char* / TEXT --- zathura/config.c | 2 +- zathura/database-plain.c | 4 +- zathura/database-sqlite.c | 94 ++++++++++++++++++++++++++++++++++----- zathura/database.h | 2 +- zathura/shortcuts.c | 7 +-- zathura/zathura.c | 14 +++--- 6 files changed, 99 insertions(+), 24 deletions(-) diff --git a/zathura/config.c b/zathura/config.c index d807f6c..626f495 100644 --- a/zathura/config.c +++ b/zathura/config.c @@ -149,7 +149,7 @@ config_load_default(zathura_t* zathura) int_value = 1; girara_setting_add(gsession, "pages-per-row", &int_value, INT, false, _("Number of pages per row"), cb_page_layout_value_changed, NULL); int_value = 1; - girara_setting_add(gsession, "first-page-column", &int_value, INT, false, _("Column of the first page"), cb_page_layout_value_changed, NULL); + girara_setting_add(gsession, "first-page-column", "1:2", STRING, false, _("Column of the first page"), cb_page_layout_value_changed, NULL); float_value = 40; girara_setting_add(gsession, "scroll-step", &float_value, FLOAT, false, _("Scroll step"), NULL, NULL); float_value = 40; diff --git a/zathura/database-plain.c b/zathura/database-plain.c index 3f4133d..e64feda 100644 --- a/zathura/database-plain.c +++ b/zathura/database-plain.c @@ -559,7 +559,7 @@ plain_set_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* g_key_file_set_double (priv->history, name, KEY_SCALE, file_info->scale); g_key_file_set_integer(priv->history, name, KEY_ROTATE, file_info->rotation); 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); + g_key_file_set_string(priv->history, name, KEY_FIRST_PAGE_COLUMN, file_info->first_page_column_list); g_key_file_set_double (priv->history, name, KEY_POSITION_X, file_info->position_x); g_key_file_set_double (priv->history, name, KEY_POSITION_Y, file_info->position_y); g_key_file_set_integer(priv->history, name, KEY_TIME, time(NULL)); @@ -600,7 +600,7 @@ plain_get_fileinfo(zathura_database_t* db, const char* file, zathura_fileinfo_t* file_info->pages_per_row = g_key_file_get_integer(priv->history, name, KEY_PAGES_PER_ROW, NULL); } if (g_key_file_has_key(priv->history, name, KEY_FIRST_PAGE_COLUMN, NULL) == TRUE) { - file_info->first_page_column = g_key_file_get_integer(priv->history, name, KEY_FIRST_PAGE_COLUMN, NULL); + file_info->first_page_column_list = g_key_file_get_string(priv->history, name, KEY_FIRST_PAGE_COLUMN, NULL); } if (g_key_file_has_key(priv->history, name, KEY_POSITION_X, NULL) == TRUE) { file_info->position_x = g_key_file_get_double(priv->history, name, KEY_POSITION_X, NULL); diff --git a/zathura/database-sqlite.c b/zathura/database-sqlite.c index 176f3dc..c1808ee 100644 --- a/zathura/database-sqlite.c +++ b/zathura/database-sqlite.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "database-sqlite.h" #include "utils.h" @@ -17,6 +18,7 @@ G_DEFINE_TYPE_WITH_CODE(ZathuraSQLDatabase, zathura_sqldatabase, G_TYPE_OBJECT, 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 bool check_column_type(sqlite3* session, const char* table, const char* col, const char* type, 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); @@ -148,7 +150,7 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) "scale FLOAT," "rotation INTEGER," "pages_per_row INTEGER," - "first_page_column INTEGER," + "first_page_column TEXT," "position_x FLOAT," "position_y FLOAT," "time TIMESTAMP" @@ -176,9 +178,9 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) /* update fileinfo table (part 2) */ static const char SQL_FILEINFO_ALTER2[] = - "ALTER TABLE fileinfo ADD COLUMN first_page_column INTEGER;"; + "ALTER TABLE fileinfo ADD COLUMN first_page_column TEXT;"; - /* update fileinfo table (part 2) */ + /* update fileinfo table (part 3) */ static const char SQL_FILEINFO_ALTER3[] = "ALTER TABLE fileinfo ADD COLUMN time TIMESTAMP;"; @@ -242,6 +244,37 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) } } + /* check existing tables for correct column types */ + ret1 = check_column_type(session, "fileinfo", "first_page_column", "TEXT", &res1); + + if (ret1 == true && res1 == false) { + girara_debug("old database table layout detected; updating ..."); + + /* prepare transaction */ + char tx_begin[] = "BEGIN TRANSACTION;" + "ALTER TABLE fileinfo RENAME TO tmp;"; + char tx_end[] = "INSERT INTO fileinfo SELECT * FROM tmp;" + "DROP TABLE tmp;" + "COMMIT;"; + + /* calculate requred buffer size */ + size_t tx_buffer_size = strlen(tx_begin); + tx_buffer_size += strlen(SQL_FILEINFO_INIT); + tx_buffer_size += strlen(tx_end); + ++tx_buffer_size; + + /* assemble transaction */ + char transaction[tx_buffer_size]; + bzero(transaction, tx_buffer_size); + strcat(transaction, tx_begin); + strcat(transaction, SQL_FILEINFO_INIT); + strcat(transaction, tx_end); + + if (sqlite3_exec(session, transaction, NULL, 0, NULL) != SQLITE_OK) { + girara_warning("failed to update database table layout"); + } + } + priv->session = session; } @@ -318,6 +351,42 @@ check_column(sqlite3* session, const char* table, const char* col, bool* res) return true; } +static bool +check_column_type(sqlite3* session, const char* table, const char* col, const char* type, bool* res) +{ + /* 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; + } + + *res = false; + + while (sqlite3_step(stmt) == SQLITE_ROW) { + if (strcmp((const char*) sqlite3_column_text(stmt, 1), col) == 0) { + if (strcmp((const char*) sqlite3_column_text(stmt, 2), type) == 0) { + *res = true; + break; + } + } + } + + if (*res == false) { + girara_debug("column %s in table %s has wrong type", col, table); + } + + sqlite3_finalize(stmt); + sqlite3_free(query); + + return true; +} + static bool sqlite_add_bookmark(zathura_database_t* db, const char* file, zathura_bookmark_t* bookmark) @@ -587,7 +656,8 @@ sqlite_set_fileinfo(zathura_database_t* db, const char* file, sqlite3_bind_double(stmt, 4, file_info->scale) != SQLITE_OK || sqlite3_bind_int(stmt, 5, file_info->rotation) != SQLITE_OK || sqlite3_bind_int(stmt, 6, file_info->pages_per_row) != SQLITE_OK || - sqlite3_bind_int(stmt, 7, file_info->first_page_column) != SQLITE_OK || + sqlite3_bind_text(stmt, 7, file_info->first_page_column_list, -1, NULL) + != SQLITE_OK || sqlite3_bind_double(stmt, 8, file_info->position_x) != SQLITE_OK || sqlite3_bind_double(stmt, 9, file_info->position_y) != SQLITE_OK) { sqlite3_finalize(stmt); @@ -631,14 +701,14 @@ sqlite_get_fileinfo(zathura_database_t* db, const char* file, return false; } - file_info->current_page = sqlite3_column_int(stmt, 0); - file_info->page_offset = sqlite3_column_int(stmt, 1); - file_info->scale = sqlite3_column_double(stmt, 2); - file_info->rotation = sqlite3_column_int(stmt, 3); - file_info->pages_per_row = sqlite3_column_int(stmt, 4); - file_info->first_page_column = sqlite3_column_int(stmt, 5); - file_info->position_x = sqlite3_column_double(stmt, 6); - file_info->position_y = sqlite3_column_double(stmt, 7); + file_info->current_page = sqlite3_column_int(stmt, 0); + file_info->page_offset = sqlite3_column_int(stmt, 1); + file_info->scale = sqlite3_column_double(stmt, 2); + file_info->rotation = sqlite3_column_int(stmt, 3); + file_info->pages_per_row = sqlite3_column_int(stmt, 4); + file_info->first_page_column_list = g_strdup((const char*) sqlite3_column_text(stmt, 5)); + file_info->position_x = sqlite3_column_double(stmt, 6); + file_info->position_y = sqlite3_column_double(stmt, 7); sqlite3_finalize(stmt); diff --git a/zathura/database.h b/zathura/database.h index 3d46132..8a5140b 100644 --- a/zathura/database.h +++ b/zathura/database.h @@ -15,7 +15,7 @@ typedef struct zathura_fileinfo_s { double scale; unsigned int rotation; unsigned int pages_per_row; - unsigned int first_page_column; + char* first_page_column_list; double position_x; double position_y; } zathura_fileinfo_t; diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c index 17b4414..693235e 100644 --- a/zathura/shortcuts.c +++ b/zathura/shortcuts.c @@ -1286,7 +1286,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* } static int pages_per_row = 1; - static int first_page_column = 1; + static char* first_page_column_list = "1:2"; static double zoom = 1.0; const girara_mode_t old_mode = girara_mode_get(session); @@ -1295,7 +1295,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* girara_setting_set(session, "pages-per-row", &pages_per_row); /* reset first page column */ - girara_setting_set(session, "first-page-column", &first_page_column); + girara_setting_set(session, "first-page-column", first_page_column_list); /* show status bar */ gtk_widget_show(GTK_WIDGET(session->gtk.statusbar)); @@ -1315,7 +1315,8 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* girara_setting_get(session, "pages-per-row", &pages_per_row); /* backup first page column */ - girara_setting_get(session, "first-page-column", &first_page_column); + g_free(first_page_column_list); + girara_setting_get(session, "first-page-column", &first_page_column_list); /* set single view */ int int_value = 1; diff --git a/zathura/zathura.c b/zathura/zathura.c index 26fc95d..ce42f33 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -651,13 +652,14 @@ document_open(zathura_t* zathura, const char* path, const char* password, } /* read history file */ + char first_page_column_list_default[] = "1:2"; zathura_fileinfo_t file_info = { .current_page = 0, .page_offset = 0, .scale = 1, .rotation = 0, .pages_per_row = 0, - .first_page_column = 0, + .first_page_column_list = first_page_column_list_default, .position_x = 0, .position_y = 0 }; @@ -856,6 +858,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, /* view mode */ unsigned int pages_per_row = 1; unsigned int first_page_column = 1; + char* first_page_column_list = first_page_column_list_default; unsigned int page_padding = 1; girara_setting_get(zathura->ui.session, "page-padding", &page_padding); @@ -866,8 +869,9 @@ document_open(zathura_t* zathura, const char* path, const char* password, girara_setting_get(zathura->ui.session, "pages-per-row", &pages_per_row); } - if (file_info.first_page_column > 0) { - first_page_column = file_info.first_page_column; + /* read first_page_column list */ + if (strcmp(file_info.first_page_column_list, "")) { + first_page_column_list = file_info.first_page_column_list; } else { girara_setting_get(zathura->ui.session, "first-page-column", &first_page_column); } @@ -1072,14 +1076,14 @@ document_close(zathura_t* zathura, bool keep_monitor) /* store file information */ const char* path = zathura_document_get_path(zathura->document); - zathura_fileinfo_t file_info = { 0, 0, 1, 0, 1, 1, 0, 0 }; + zathura_fileinfo_t file_info = { 0, 0, 1, 0, 1, "1:2", 0, 0 }; file_info.current_page = zathura_document_get_current_page_number(zathura->document); file_info.page_offset = zathura_document_get_page_offset(zathura->document); file_info.scale = zathura_document_get_scale(zathura->document); file_info.rotation = zathura_document_get_rotation(zathura->document); girara_setting_get(zathura->ui.session, "pages-per-row", &(file_info.pages_per_row)); - girara_setting_get(zathura->ui.session, "first-page-column", &(file_info.first_page_column)); + girara_setting_get(zathura->ui.session, "first-page-column", &(file_info.first_page_column_list)); /* get position */ file_info.position_x = zathura_document_get_position_x(zathura->document); From a9aa7e4ad29b749bd5f140794f6193224101b726 Mon Sep 17 00:00:00 2001 From: Sebastian Neuser Date: Sat, 7 Nov 2015 20:12:01 +0100 Subject: [PATCH 52/94] Implement first page column list --- zathura/callbacks.c | 9 +++++++-- zathura/utils.c | 30 ++++++++++++++++++++++++++++++ zathura/utils.h | 13 +++++++++++++ zathura/zathura.c | 12 +++++++++--- 4 files changed, 59 insertions(+), 5 deletions(-) diff --git a/zathura/callbacks.c b/zathura/callbacks.c index dd6070c..0ee3b0b 100644 --- a/zathura/callbacks.c +++ b/zathura/callbacks.c @@ -243,8 +243,13 @@ cb_page_layout_value_changed(girara_session_t* session, const char* name, girara unsigned int pages_per_row = 1; girara_setting_get(session, "pages-per-row", &pages_per_row); - unsigned int first_page_column = 1; - girara_setting_get(session, "first-page-column", &first_page_column); + /* get list of first_page_column settings */ + char* first_page_column_list = NULL; + girara_setting_get(session, "first-page-column", &first_page_column_list); + + /* find value for first_page_column */ + unsigned int first_page_column = find_first_page_column(first_page_column_list, pages_per_row); + g_free(first_page_column_list); unsigned int page_padding = 1; girara_setting_get(zathura->ui.session, "page-padding", &page_padding); diff --git a/zathura/utils.c b/zathura/utils.c index a995eb7..370958e 100644 --- a/zathura/utils.c +++ b/zathura/utils.c @@ -253,3 +253,33 @@ get_selection(zathura_t* zathura) return selection; } + +unsigned int +find_first_page_column(const char* first_page_column_list, + const unsigned int pages_per_row) +{ + /* sanity checks */ + unsigned int first_page_column = 1; + g_return_val_if_fail(first_page_column_list != NULL, first_page_column); + g_return_val_if_fail(strcmp(first_page_column_list, ""), first_page_column); + g_return_val_if_fail(pages_per_row > 0, first_page_column); + + /* split settings list */ + char** settings = g_strsplit(first_page_column_list, ":", pages_per_row+1); + + size_t settings_size = 0; + while (settings[settings_size] != NULL) { + ++settings_size; + } + + /* read setting value corresponding to the specified pages per row */ + unsigned int index = pages_per_row - 1; + if (settings_size > index && strcmp(settings[index], "")) { + first_page_column = atoi(settings[index]); + } + + /* free buffers */ + g_strfreev(settings); + + return first_page_column; +} diff --git a/zathura/utils.h b/zathura/utils.h index 141468f..a1902f0 100644 --- a/zathura/utils.h +++ b/zathura/utils.h @@ -107,4 +107,17 @@ GdkAtom* get_selection(zathura_t* zathura); double zathura_correct_scale_value(girara_session_t* session, const double scale); + +/** + * Extracts the column the first page should be rendered in from the specified + * list of settings corresponding to the specified pages per row + * + * @param[in] first_page_column_list The settings list + * @param[in] pages_per_row The current pages per row + * + * @return The column the first page should be rendered in + */ +unsigned int find_first_page_column(const char* first_page_column_list, + const unsigned int pages_per_row); + #endif // UTILS_H diff --git a/zathura/zathura.c b/zathura/zathura.c index ce42f33..385c98b 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -857,7 +857,6 @@ document_open(zathura_t* zathura, const char* path, const char* password, /* view mode */ unsigned int pages_per_row = 1; - unsigned int first_page_column = 1; char* first_page_column_list = first_page_column_list_default; unsigned int page_padding = 1; @@ -873,11 +872,15 @@ document_open(zathura_t* zathura, const char* path, const char* password, if (strcmp(file_info.first_page_column_list, "")) { first_page_column_list = file_info.first_page_column_list; } else { - girara_setting_get(zathura->ui.session, "first-page-column", &first_page_column); + girara_setting_get(zathura->ui.session, "first-page-column", &first_page_column_list); } + /* find value for first_page_column */ + unsigned int first_page_column = find_first_page_column(first_page_column_list, pages_per_row); + girara_setting_set(zathura->ui.session, "pages-per-row", &pages_per_row); - girara_setting_set(zathura->ui.session, "first-page-column", &first_page_column); + girara_setting_set(zathura->ui.session, "first-page-column", first_page_column_list); + g_free(first_page_column_list); page_widget_set_mode(zathura, page_padding, pages_per_row, first_page_column); zathura_document_set_page_layout(zathura->document, page_padding, pages_per_row, first_page_column); @@ -1097,6 +1100,9 @@ document_close(zathura_t* zathura, bool keep_monitor) zathura_db_save_jumplist(zathura->database, path, zathura->jumplist.list); } + /* free buffers */ + g_free(file_info.first_page_column_list); + girara_list_iterator_free(zathura->jumplist.cur); zathura->jumplist.cur = NULL; girara_list_free(zathura->jumplist.list); From bab767fb2c79b8610c0e8c4b4b5ddc0ba1554b99 Mon Sep 17 00:00:00 2001 From: Sebastian Neuser Date: Sat, 7 Nov 2015 19:49:56 +0100 Subject: [PATCH 53/94] Update documentation on first-page-column --- doc/man/zathurarc.5.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst index 9bb3cc1..45a9bbb 100644 --- a/doc/man/zathurarc.5.rst +++ b/doc/man/zathurarc.5.rst @@ -731,9 +731,12 @@ Defines the number of pages that are rendered next to each other in a row. first-page-column ^^^^^^^^^^^^^^^^^ Defines the column in which the first page will be displayed. +This setting is stored separately for every value of pages-per-row according to +the following pattern <1 page per row>:[<2 pages per row>[: ...]]. Per default, +the first column is set to 2 for double-page layout. -* Value type: Integer -* Default value: 1 +* Value type: String +* Default value: 1:2 recolor ^^^^^^^ From 599e61ccf1c229ddf8bc03419ed8d20a72104824 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 12 Nov 2015 22:28:46 +0100 Subject: [PATCH 54/94] Use g_strlcat It has a sane API. Signed-off-by: Sebastian Ramacher --- zathura/database-sqlite.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/zathura/database-sqlite.c b/zathura/database-sqlite.c index c1808ee..bf1af4c 100644 --- a/zathura/database-sqlite.c +++ b/zathura/database-sqlite.c @@ -251,24 +251,19 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path) girara_debug("old database table layout detected; updating ..."); /* prepare transaction */ - char tx_begin[] = "BEGIN TRANSACTION;" - "ALTER TABLE fileinfo RENAME TO tmp;"; - char tx_end[] = "INSERT INTO fileinfo SELECT * FROM tmp;" - "DROP TABLE tmp;" - "COMMIT;"; - - /* calculate requred buffer size */ - size_t tx_buffer_size = strlen(tx_begin); - tx_buffer_size += strlen(SQL_FILEINFO_INIT); - tx_buffer_size += strlen(tx_end); - ++tx_buffer_size; + static const char tx_begin[] = + "BEGIN TRANSACTION;" + "ALTER TABLE fileinfo RENAME TO tmp;"; + static const char tx_end[] = + "INSERT INTO fileinfo SELECT * FROM tmp;" + "DROP TABLE tmp;" + "COMMIT;"; /* assemble transaction */ - char transaction[tx_buffer_size]; - bzero(transaction, tx_buffer_size); - strcat(transaction, tx_begin); - strcat(transaction, SQL_FILEINFO_INIT); - strcat(transaction, tx_end); + char transaction[sizeof(tx_begin) + sizeof(SQL_FILEINFO_INIT) + sizeof(tx_end) - 2] = { '\0' }; + g_strlcat(transaction, tx_begin, sizeof(transaction)); + g_strlcat(transaction, SQL_FILEINFO_INIT, sizeof(transaction)); + g_strlcat(transaction, tx_end, sizeof(transaction)); if (sqlite3_exec(session, transaction, NULL, 0, NULL) != SQLITE_OK) { girara_warning("failed to update database table layout"); From 876d35de943b16de7b8a218065a0a7409b383634 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 12 Nov 2015 22:32:36 +0100 Subject: [PATCH 55/94] Fix memory leak Signed-off-by: Sebastian Ramacher --- zathura/database-sqlite.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zathura/database-sqlite.c b/zathura/database-sqlite.c index bf1af4c..bf219d4 100644 --- a/zathura/database-sqlite.c +++ b/zathura/database-sqlite.c @@ -568,6 +568,8 @@ sqlite_save_jumplist(zathura_database_t* db, const char* file, girara_list_t* ju } } + girara_list_iterator_free(cur); + if (status == false) { sqlite3_exec(priv->session, "ROLLBACK;", NULL, 0, NULL); return false; From 596262bb4349fe0b8d9c91e4da07dc52d09ec9e4 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 12 Nov 2015 22:54:21 +0100 Subject: [PATCH 56/94] Fix invalid free Signed-off-by: Sebastian Ramacher --- zathura/shortcuts.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c index 693235e..5bf275f 100644 --- a/zathura/shortcuts.c +++ b/zathura/shortcuts.c @@ -1286,7 +1286,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* } static int pages_per_row = 1; - static char* first_page_column_list = "1:2"; + static char* first_page_column_list = NULL; static double zoom = 1.0; const girara_mode_t old_mode = girara_mode_get(session); @@ -1295,7 +1295,9 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* girara_setting_set(session, "pages-per-row", &pages_per_row); /* reset first page column */ - girara_setting_set(session, "first-page-column", first_page_column_list); + if (first_page_column_list != NULL) { + girara_setting_set(session, "first-page-column", first_page_column_list); + } /* show status bar */ gtk_widget_show(GTK_WIDGET(session->gtk.statusbar)); @@ -1316,6 +1318,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* /* backup first page column */ g_free(first_page_column_list); + /* this will leak. we need to move the values somewhere else */ girara_setting_get(session, "first-page-column", &first_page_column_list); /* set single view */ From 108533804b4ccda0b955d3108e84293bc97a1f9d Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 12 Nov 2015 23:14:25 +0100 Subject: [PATCH 57/94] Same consts Signed-off-by: Sebastian Ramacher --- zathura/shortcuts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c index 5bf275f..728b9c2 100644 --- a/zathura/shortcuts.c +++ b/zathura/shortcuts.c @@ -35,7 +35,7 @@ draw_links(zathura_t* zathura) /* set pages to draw links */ bool show_links = false; unsigned int page_offset = 0; - unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); + const unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); for (unsigned int page_id = 0; page_id < number_of_pages; page_id++) { zathura_page_t* page = zathura_document_get_page(zathura->document, page_id); if (page == NULL) { @@ -74,7 +74,7 @@ sc_abort(girara_session_t* session, girara_argument_t* UNUSED(argument), girara_setting_get(session, "abort-clear-search", &clear_search); if (zathura->document != NULL) { - unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); + const unsigned int number_of_pages = zathura_document_get_number_of_pages(zathura->document); for (unsigned int page_id = 0; page_id < number_of_pages; ++page_id) { zathura_page_t* page = zathura_document_get_page(zathura->document, page_id); if (page == NULL) { @@ -469,7 +469,7 @@ sc_rotate(girara_session_t* session, girara_argument_t* argument, zathura_t* zathura = session->global.data; g_return_val_if_fail(zathura->document != NULL, false); - unsigned int page_number = zathura_document_get_current_page_number(zathura->document); + const unsigned int page_number = zathura_document_get_current_page_number(zathura->document); int angle = 90; if (argument != NULL && argument->n == ROTATE_CCW) { From 4f6bd04f23fc1524a41b5a788411916a0240aa37 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 12 Nov 2015 23:15:45 +0100 Subject: [PATCH 58/94] Move MIN and MAX Signed-off-by: Sebastian Ramacher --- zathura/macros.h | 8 ++++++++ zathura/shortcuts.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zathura/macros.h b/zathura/macros.h index 86ced61..a1957dc 100644 --- a/zathura/macros.h +++ b/zathura/macros.h @@ -8,4 +8,12 @@ #define UNUSED(x) GIRARA_UNUSED(x) #define DEPRECATED(x) GIRARA_DEPRECATED(x) +#ifndef MIN +#define MIN(a,b) (((a)<(b))?(a):(b)) +#endif + +#ifndef MAX +#define MAX(a,b) (((a)>(b))?(a):(b)) +#endif + #endif diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c index 728b9c2..ae3820e 100644 --- a/zathura/shortcuts.c +++ b/zathura/shortcuts.c @@ -20,14 +20,6 @@ #include "adjustment.h" #include -#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) From 4a1852b02c5e33cd2d4894c5219da83d0d10ef86 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 12 Nov 2015 23:32:59 +0100 Subject: [PATCH 59/94] Move static variables to zathura instance Fixes another memory leak. Signed-off-by: Sebastian Ramacher --- zathura/shortcuts.c | 41 +++++++++++++++++------------------------ zathura/zathura.c | 13 +++++++++++++ zathura/zathura.h | 18 ++++++++++++++++++ 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c index ae3820e..a80231a 100644 --- a/zathura/shortcuts.c +++ b/zathura/shortcuts.c @@ -268,9 +268,6 @@ sc_mouse_scroll(girara_session_t* session, girara_argument_t* argument, girara_e return false; } - static int x = 0; - static int y = 0; - GtkAdjustment* x_adj = NULL; GtkAdjustment* y_adj = NULL; @@ -285,12 +282,12 @@ sc_mouse_scroll(girara_session_t* session, girara_argument_t* argument, girara_e /* drag */ case GIRARA_EVENT_BUTTON_PRESS: - x = event->x; - y = event->y; + zathura->shortcut.mouse.x = event->x; + zathura->shortcut.mouse.y = event->y; break; case GIRARA_EVENT_BUTTON_RELEASE: - x = 0; - y = 0; + zathura->shortcut.mouse.x = 0; + zathura->shortcut.mouse.y = 0; break; case GIRARA_EVENT_MOTION_NOTIFY: x_adj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(session->gtk.view)); @@ -301,9 +298,9 @@ sc_mouse_scroll(girara_session_t* session, girara_argument_t* argument, girara_e } zathura_adjustment_set_value(x_adj, - gtk_adjustment_get_value(x_adj) - (event->x - x)); + gtk_adjustment_get_value(x_adj) - (event->x - zathura->shortcut.mouse.x)); zathura_adjustment_set_value(y_adj, - gtk_adjustment_get_value(y_adj) - (event->y - y)); + gtk_adjustment_get_value(y_adj) - (event->y - zathura->shortcut.mouse.y)); break; /* unhandled events */ @@ -1223,12 +1220,11 @@ sc_toggle_page_mode(girara_session_t* session, girara_argument_t* int pages_per_row = 1; girara_setting_get(zathura->ui.session, "pages-per-row", &pages_per_row); - static int tmp = 2; int value = 1; if (pages_per_row == 1) { - value = tmp; + value = zathura->shortcut.toggle_page_mode.pages; } else { - tmp = pages_per_row; + zathura->shortcut.toggle_page_mode.pages = pages_per_row; } girara_setting_set(zathura->ui.session, "pages-per-row", &value); @@ -1277,18 +1273,14 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* return false; } - static int pages_per_row = 1; - static char* first_page_column_list = NULL; - static double zoom = 1.0; - const girara_mode_t old_mode = girara_mode_get(session); if (old_mode == zathura->modes.presentation) { /* reset pages per row */ - girara_setting_set(session, "pages-per-row", &pages_per_row); + girara_setting_set(session, "pages-per-row", &zathura->shortcut.toggle_presentation_mode.pages); /* reset first page column */ - if (first_page_column_list != NULL) { - girara_setting_set(session, "first-page-column", first_page_column_list); + if (zathura->shortcut.toggle_presentation_mode.first_page_column_list != NULL) { + girara_setting_set(session, "first-page-column", zathura->shortcut.toggle_presentation_mode.first_page_column_list); } /* show status bar */ @@ -1298,7 +1290,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* gtk_window_unfullscreen(GTK_WINDOW(session->gtk.window)); /* reset scale */ - zathura_document_set_scale(zathura->document, zoom); + zathura_document_set_scale(zathura->document, zathura->shortcut.toggle_presentation_mode.zoom); render_all(zathura); refresh_view(zathura); @@ -1306,19 +1298,20 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* girara_mode_set(session, zathura->modes.normal); } else if (old_mode == zathura->modes.normal) { /* backup pages per row */ - girara_setting_get(session, "pages-per-row", &pages_per_row); + girara_setting_get(session, "pages-per-row", &zathura->shortcut.toggle_presentation_mode.pages); /* backup first page column */ - g_free(first_page_column_list); + g_free(zathura->shortcut.toggle_presentation_mode.first_page_column_list); + zathura->shortcut.toggle_presentation_mode.first_page_column_list = NULL; /* this will leak. we need to move the values somewhere else */ - girara_setting_get(session, "first-page-column", &first_page_column_list); + girara_setting_get(session, "first-page-column", &zathura->shortcut.toggle_presentation_mode.first_page_column_list); /* set single view */ int int_value = 1; girara_setting_set(session, "pages-per-row", &int_value); /* back up zoom */ - zoom = zathura_document_get_scale(zathura->document); + zathura->shortcut.toggle_presentation_mode.zoom = zathura_document_get_scale(zathura->document); /* adjust window */ girara_argument_t argument = { ZATHURA_ADJUST_BESTFIT, NULL }; diff --git a/zathura/zathura.c b/zathura/zathura.c index 385c98b..db883a8 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -278,6 +278,16 @@ zathura_init(zathura_t* zathura) girara_template_set_base(csstemplate, css); g_free(css); + /* Shortcut helpers */ + zathura->shortcut.mouse.x = 0; + zathura->shortcut.mouse.y = 0; + + zathura->shortcut.toggle_page_mode.pages = 2; + + zathura->shortcut.toggle_presentation_mode.pages = 1; + zathura->shortcut.toggle_presentation_mode.first_page_column_list = NULL; + zathura->shortcut.toggle_presentation_mode.zoom = 1.0; + /* Start D-Bus service */ bool dbus = true; girara_setting_get(zathura->ui.session, "dbus-service", &dbus); @@ -315,6 +325,9 @@ zathura_free(zathura_t* zathura) girara_session_destroy(zathura->ui.session); } + /* shortcut */ + g_free(zathura->shortcut.toggle_presentation_mode.first_page_column_list); + /* stdin support */ if (zathura->stdin_support.file != NULL) { g_unlink(zathura->stdin_support.file); diff --git a/zathura/zathura.h b/zathura/zathura.h index 3806ce9..92a20bf 100644 --- a/zathura/zathura.h +++ b/zathura/zathura.h @@ -204,6 +204,24 @@ struct zathura_s unsigned int start; /**< Bisection range - start */ unsigned int end; /**< Bisection range - end */ } bisect; + + /** + * Storage for shortcuts. + */ + struct { + struct { + int x; + int y; + } mouse; + struct { + int pages; + } toggle_page_mode; + struct { + int pages; + char* first_page_column_list; + double zoom; + } toggle_presentation_mode; + } shortcut; }; /** From 7f38470a9e080d10e969bda4daa6d8e5dd3f26dd Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 13 Nov 2015 00:29:35 +0100 Subject: [PATCH 60/94] Fix another invalid free Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index db883a8..669dc5f 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -665,14 +665,13 @@ document_open(zathura_t* zathura, const char* path, const char* password, } /* read history file */ - char first_page_column_list_default[] = "1:2"; zathura_fileinfo_t file_info = { .current_page = 0, .page_offset = 0, .scale = 1, .rotation = 0, .pages_per_row = 0, - .first_page_column_list = first_page_column_list_default, + .first_page_column_list = NULL, .position_x = 0, .position_y = 0 }; @@ -870,7 +869,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, /* view mode */ unsigned int pages_per_row = 1; - char* first_page_column_list = first_page_column_list_default; + char* first_page_column_list = NULL; unsigned int page_padding = 1; girara_setting_get(zathura->ui.session, "page-padding", &page_padding); @@ -882,8 +881,9 @@ document_open(zathura_t* zathura, const char* path, const char* password, } /* read first_page_column list */ - if (strcmp(file_info.first_page_column_list, "")) { + if (file_info.first_page_column_list != NULL && strcmp(file_info.first_page_column_list, "")) { first_page_column_list = file_info.first_page_column_list; + file_info.first_page_column_list = NULL; } else { girara_setting_get(zathura->ui.session, "first-page-column", &first_page_column_list); } @@ -893,6 +893,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, girara_setting_set(zathura->ui.session, "pages-per-row", &pages_per_row); girara_setting_set(zathura->ui.session, "first-page-column", first_page_column_list); + g_free(file_info.first_page_column_list); g_free(first_page_column_list); page_widget_set_mode(zathura, page_padding, pages_per_row, first_page_column); From ff976d485443d56746277f6a974dd1ae747576a9 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 20 Nov 2015 14:57:47 +0100 Subject: [PATCH 61/94] Error handling --- zathura/database-plain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zathura/database-plain.c b/zathura/database-plain.c index e64feda..22e4636 100644 --- a/zathura/database-plain.c +++ b/zathura/database-plain.c @@ -672,7 +672,12 @@ zathura_db_read_key_file_from_file(const char* path) free(content); content = malloc(sizeof(char) * (dummy_len + 1)); - content = memcpy(content, dummy_content, dummy_len + 1); + if (content == NULL) + { + g_key_file_free(key_file); + return NULL; + } + g_strlcat(content, dummy_content, dummy_len + 1); contentlen = dummy_len; } From d7b06ca3fc6f1aaf1ed3d2a73a24d5ef37251552 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 20 Nov 2015 15:07:18 +0100 Subject: [PATCH 62/94] Require GTK+ 3.6 Signed-off-by: Sebastian Ramacher --- config.mk | 2 +- zathura/main.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config.mk b/config.mk index 45d1b47..70a9a2e 100644 --- a/config.mk +++ b/config.mk @@ -26,7 +26,7 @@ GLIB_MIN_VERSION = 2.32 GLIB_PKG_CONFIG_NAME = glib-2.0 # GTK GTK_VERSION_CHECK ?= 1 -GTK_MIN_VERSION = 3.0 +GTK_MIN_VERSION = 3.6 GTK_PKG_CONFIG_NAME = gtk+-3.0 # pkg-config binary diff --git a/zathura/main.c b/zathura/main.c index ade5f07..c6ba30c 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -28,9 +28,6 @@ main(int argc, char* argv[]) textdomain(GETTEXT_PACKAGE); /* init gtk */ -#if !GTK_CHECK_VERSION(3, 6, 0) - gdk_threads_init(); -#endif gtk_init(&argc, &argv); /* parse command line arguments */ @@ -282,13 +279,7 @@ main(int argc, char* argv[]) } /* run zathura */ -#if !GTK_CHECK_VERSION(3, 6, 0) - gdk_threads_enter(); -#endif gtk_main(); -#if !GTK_CHECK_VERSION(3, 6, 0) - gdk_threads_leave(); -#endif /* free zathura */ zathura_free(zathura); From b2189277bb98bdcb4555cb94c61cde01f39832ec Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Fri, 20 Nov 2015 15:21:21 +0100 Subject: [PATCH 63/94] Use g_strv_length Signed-off-by: Sebastian Ramacher --- zathura/utils.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/zathura/utils.c b/zathura/utils.c index 1ed8609..531196c 100644 --- a/zathura/utils.c +++ b/zathura/utils.c @@ -263,11 +263,7 @@ find_first_page_column(const char* first_page_column_list, /* split settings list */ char** settings = g_strsplit(first_page_column_list, ":", pages_per_row+1); - - size_t settings_size = 0; - while (settings[settings_size] != NULL) { - ++settings_size; - } + const size_t settings_size = g_strv_length(settings); /* read setting value corresponding to the specified pages per row */ unsigned int index = pages_per_row - 1; From a3d676b96b863354f92906ce8e6035a7c7afc08e Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 23 Nov 2015 22:22:10 +0100 Subject: [PATCH 64/94] Document GTK+ requirements Signed-off-by: Sebastian Ramacher --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index f061d03..c7bdc22 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ girara user interface library and several document libraries. Requirements ------------ -gtk3 +gtk3 (>= 3.6) glib (>= 2.32) girara (>= 0.2.4) sqlite3 (optional, >= 3.5.9) From 138230c3cc7e212d8a47ffbe664af863d65dd535 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 23 Nov 2015 23:16:14 +0100 Subject: [PATCH 65/94] Fix error checking Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index 669dc5f..30ba3a4 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -638,9 +638,9 @@ document_open(zathura_t* zathura, const char* path, const char* password, zathura_password_dialog_info_t* password_dialog_info = malloc(sizeof(zathura_password_dialog_info_t)); if (password_dialog_info != NULL) { password_dialog_info->zathura = zathura; + password_dialog_info->path = g_strdup(path); - if (path != NULL) { - password_dialog_info->path = g_strdup(path); + if (password_dialog_info->path != NULL) { gdk_threads_add_idle(document_open_password_dialog, password_dialog_info); goto error_out; } else { From 32ad46441cd51eb663e15457dfb6764555e7c411 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 23 Nov 2015 23:28:45 +0100 Subject: [PATCH 66/94] CS Signed-off-by: Sebastian Ramacher --- zathura/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zathura/main.c b/zathura/main.c index c6ba30c..eb419b0 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -203,8 +203,9 @@ main(int argc, char* argv[]) /* open document if passed */ if (argc > 1) { - if (page_number > 0) + if (page_number > 0) { --page_number; + } #ifdef WITH_SYNCTEX document_open_idle(zathura, argv[1], password, page_number, mode, synctex_fwd); #else From 96597253c845b100f839a22e073601a8dec18162 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 23 Nov 2015 23:55:45 +0100 Subject: [PATCH 67/94] Error messages if setsid or fork fail Signed-off-by: Sebastian Ramacher --- zathura/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zathura/main.c b/zathura/main.c index eb419b0..3c6f0dd 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -155,10 +156,14 @@ main(int argc, char* argv[]) if (pid > 0) { /* parent */ return 0; } else if (pid < 0) { /* error */ - girara_error("Couldn't fork."); + girara_error("Could not fork: %s", strerror(errno)); + return -1; } - setsid(); + if (setsid() == -1) { + girara_error("Could not start new process group: %s", strerror(errno)); + return -1; + } } /* create zathura session */ From ba72d40fbd7a8fafe60eac1c1584b5b605d3823b Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 24 Nov 2015 00:04:45 +0100 Subject: [PATCH 68/94] Initialize GTK+ as late as possible (fixes #471) Signed-off-by: Sebastian Ramacher --- zathura/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zathura/main.c b/zathura/main.c index 3c6f0dd..33c5d07 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -28,9 +28,6 @@ main(int argc, char* argv[]) bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain(GETTEXT_PACKAGE); - /* init gtk */ - gtk_init(&argc, &argv); - /* parse command line arguments */ gchar* config_dir = NULL; gchar* data_dir = NULL; @@ -166,6 +163,9 @@ main(int argc, char* argv[]) } } + /* init gtk */ + gtk_init(&argc, &argv); + /* create zathura session */ zathura_t* zathura = zathura_create(); if (zathura == NULL) { From 12f57fb76ad9d4d0355148959163e146d8342cc6 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 24 Nov 2015 00:47:18 +0100 Subject: [PATCH 69/94] Refactor Signed-off-by: Sebastian Ramacher --- zathura/main.c | 180 +++++++++++++++++++++++++++++++------------------ 1 file changed, 114 insertions(+), 66 deletions(-) diff --git a/zathura/main.c b/zathura/main.c index 33c5d07..f780581 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -18,15 +18,115 @@ #include "synctex.h" #endif -/* main function */ -int -main(int argc, char* argv[]) +/* Init locale */ +static void +init_locale(void) { - /* init locale */ setlocale(LC_ALL, ""); bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain(GETTEXT_PACKAGE); +} + +/* Set log level */ +static void +set_log_level(const char* loglevel) +{ + if (loglevel == NULL || g_strcmp0(loglevel, "info") == 0) { + girara_set_debug_level(GIRARA_INFO); + } else if (g_strcmp0(loglevel, "warning") == 0) { + girara_set_debug_level(GIRARA_WARNING); + } else if (g_strcmp0(loglevel, "error") == 0) { + girara_set_debug_level(GIRARA_ERROR); + } +} + +/* Handle synctex forward synchronization */ +#ifdef WITH_SYNCTEX +static int +run_synctex_forward(const char* synctex_fwd, const char* filename, + int synctex_pid) +{ + GFile* file = g_file_new_for_commandline_arg(filename); + if (file == NULL) { + girara_error("Unable to handle argument '%s'.", filename); + return -1; + } + + char* real_path = g_file_get_path(file); + g_object_unref(file); + if (real_path == NULL) { + girara_error("Failed to determine path for '%s'", filename); + return -1; + } + + int line = 0; + int column = 0; + char* input_file = NULL; + if (synctex_parse_input(synctex_fwd, &input_file, &line, &column) == false) { + girara_error("Failed to parse argument to --synctex-forward."); + g_free(real_path); + return -1; + } + + const int ret = zathura_dbus_synctex_position(real_path, input_file, line, column, synctex_pid); + g_free(input_file); + g_free(real_path); + + if (ret == -1) { + /* D-Bus or SyncTeX failed */ + girara_error("Got no usable data from SyncTeX or D-Bus failed in some way."); + } + + return ret; +} +#endif + +static zathura_t* +init_zathura(const char* config_dir, const char* data_dir, + const char* cache_dir, const char* plugin_path, char** argv, +#ifdef GDK_WINDOWING_X11 + char* synctex_editor, Window embed) +#else + char* synctex_editor) +#endif +{ + /* create zathura session */ + zathura_t* zathura = zathura_create(); + if (zathura == NULL) { + return NULL; + } + +#ifdef GDK_WINDOWING_X11 + zathura_set_xid(zathura, embed); +#endif + zathura_set_config_dir(zathura, config_dir); + zathura_set_data_dir(zathura, data_dir); + zathura_set_cache_dir(zathura, cache_dir); + zathura_set_plugin_dir(zathura, plugin_path); + zathura_set_argv(zathura, argv); + + /* Init zathura */ + if (zathura_init(zathura) == false) { + zathura_free(zathura); + return NULL; + } + +#ifdef WITH_SYNCTEX + if (synctex_editor != NULL) { + girara_setting_set(zathura->ui.session, "synctex-editor-command", synctex_editor); + } +#endif + + return zathura; +} + + +/* main function */ +int +main(int argc, char* argv[]) +{ + init_locale(); /* parse command line arguments */ gchar* config_dir = NULL; @@ -85,14 +185,7 @@ main(int argc, char* argv[]) } g_option_context_free(context); - /* Set log level. */ - if (loglevel == NULL || g_strcmp0(loglevel, "info") == 0) { - girara_set_debug_level(GIRARA_INFO); - } else if (g_strcmp0(loglevel, "warning") == 0) { - girara_set_debug_level(GIRARA_WARNING); - } else if (g_strcmp0(loglevel, "error") == 0) { - girara_set_debug_level(GIRARA_ERROR); - } + set_log_level(loglevel); #ifdef WITH_SYNCTEX /* handle synctex forward synchronization */ @@ -102,39 +195,10 @@ main(int argc, char* argv[]) return -1; } - GFile* file = g_file_new_for_commandline_arg(argv[1]); - if (file == NULL) { - girara_error("Unable to handle argument '%s'.", argv[1]); - return -1; - } - - char* real_path = g_file_get_path(file); - g_object_unref(file); - if (real_path == NULL) { - girara_error("Failed to determine path for '%s'", argv[1]); - return -1; - } - - int line = 0; - int column = 0; - char* input_file = NULL; - if (synctex_parse_input(synctex_fwd, &input_file, &line, &column) == false) { - girara_error("Failed to parse argument to --synctex-forward."); - g_free(real_path); - return -1; - } - - const int ret = zathura_dbus_synctex_position(real_path, input_file, line, column, synctex_pid); - g_free(input_file); - g_free(real_path); - - if (ret == -1) { - /* D-Bus or SyncTeX failed */ - girara_error("Got no usable data from SyncTeX or D-Bus failed in some way."); - return -1; - } else if (ret == 1) { - /* Found a instance */ - return 0; + const int ret = run_synctex_forward(synctex_fwd, argv[1], synctex_pid); + if (ret != 0) { + /* Error or instance found */ + return ret; } girara_debug("No instance found. Starting new one."); @@ -167,33 +231,17 @@ main(int argc, char* argv[]) gtk_init(&argc, &argv); /* create zathura session */ - zathura_t* zathura = zathura_create(); - if (zathura == NULL) { - return -1; - } - + zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir, #ifdef GDK_WINDOWING_X11 - zathura_set_xid(zathura, embed); + plugin_path, argv, synctex_editor, embed); +#else + plugin_path, argv, synctex_editor); #endif - zathura_set_config_dir(zathura, config_dir); - zathura_set_data_dir(zathura, data_dir); - zathura_set_cache_dir(zathura, cache_dir); - zathura_set_plugin_dir(zathura, plugin_path); - zathura_set_argv(zathura, argv); - - /* Init zathura */ - if (zathura_init(zathura) == false) { + if (zathura == NULL) { girara_error("Could not initialize zathura."); - zathura_free(zathura); return -1; } -#ifdef WITH_SYNCTEX - if (synctex_editor != NULL) { - girara_setting_set(zathura->ui.session, "synctex-editor-command", synctex_editor); - } -#endif - /* Print version */ if (print_version == true) { char* string = zathura_get_version_string(zathura, false); From b5df57c1e1f265e370bff961826819fb660e0caf Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 24 Nov 2015 01:03:18 +0100 Subject: [PATCH 70/94] Use fork to start other instances This should help with #472 when multiple files are opened. Signed-off-by: Sebastian Ramacher --- zathura/main.c | 96 +++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 72 deletions(-) diff --git a/zathura/main.c b/zathura/main.c index f780581..060382a 100644 --- a/zathura/main.c +++ b/zathura/main.c @@ -211,8 +211,26 @@ main(int argc, char* argv[]) return -1; } + size_t file_idx = argc > 1 ? 1 : 0; + /* Fork instances for other files. */ + if (print_version == false && argc > 2) { + for (int idx = 2; idx < argc; ++idx) { + const pid_t pid = fork(); + if (pid == 0) { /* child */ + file_idx = idx; + if (setsid() == -1) { + girara_error("Could not start new process group: %s", strerror(errno)); + return -1; + } + } else if (pid < 0) { /* error */ + girara_error("Could not fork: %s", strerror(errno)); + return -1; + } + } + } + /* Fork into the background if the user really wants to ... */ - if (forkback == true) { + if (print_version == false && forkback == true && file_idx < 2) { const pid_t pid = fork(); if (pid > 0) { /* parent */ return 0; @@ -227,10 +245,10 @@ main(int argc, char* argv[]) } } - /* init gtk */ + /* Initialize GTK+ */ gtk_init(&argc, &argv); - /* create zathura session */ + /* Create zathura session */ zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir, #ifdef GDK_WINDOWING_X11 plugin_path, argv, synctex_editor, embed); @@ -255,82 +273,16 @@ main(int argc, char* argv[]) } /* open document if passed */ - if (argc > 1) { + if (file_idx != 0) { if (page_number > 0) { --page_number; } #ifdef WITH_SYNCTEX - document_open_idle(zathura, argv[1], password, page_number, mode, synctex_fwd); + document_open_idle(zathura, argv[file_idx], password, page_number, mode, synctex_fwd); #else - document_open_idle(zathura, argv[1], password, page_number, mode, NULL); + document_open_idle(zathura, argv[file_idx], password, page_number, mode, NULL); #endif } - if (argc > 2) { - char* new_argv[2 * sizeof(entries) / sizeof(GOptionEntry) + 3] = { - NULL - }; - - size_t idx = 0; - new_argv[idx++] = g_strdup(zathura->global.arguments[0]); - - /* pass arguments to new process */ - if (config_dir != NULL) { - new_argv[idx++] = g_strdup("--config-dir"); - new_argv[idx++] = g_strdup(config_dir); - } - if (data_dir != NULL) { - new_argv[idx++] = g_strdup("--data-dir"); - new_argv[idx++] = g_strdup(data_dir); - } - if (cache_dir != NULL) { - new_argv[idx++] = g_strdup("--cache-dir"); - new_argv[idx++] = g_strdup(cache_dir); - } - if (plugin_path != NULL) { - new_argv[idx++] = g_strdup("--plugins-dir"); - new_argv[idx++] = g_strdup(plugin_path); - } - /* no need to pass fork */ - if (password != NULL) { - new_argv[idx++] = g_strdup("--password"); - new_argv[idx++] = g_strdup(password); - } - if (page_number != ZATHURA_PAGE_NUMBER_UNSPECIFIED) { - new_argv[idx++] = g_strdup("--page"); - new_argv[idx++] = g_strdup_printf("%d", page_number); - } - if (loglevel != NULL) { - new_argv[idx++] = g_strdup("--debug"); - new_argv[idx++] = g_strdup(loglevel); - } -#ifdef WITH_SYNCTEX - if (synctex_editor != NULL) { - new_argv[idx++] = g_strdup("--synctex-editor-command"); - new_argv[idx++] = g_strdup(synctex_editor); - } - if (synctex_fwd != NULL) { - new_argv[idx++] = g_strdup("--synctex-forward"); - new_argv[idx++] = g_strdup(synctex_fwd); - } -#endif - /* no need to pass synctex-pid */ - if (mode != NULL) { - new_argv[idx++] = g_strdup("--mode"); - new_argv[idx++] = g_strdup(mode); - } - - /* open additional files */ - for (int i = 2; i < argc; i++) { - g_free(new_argv[idx]); - new_argv[idx] = g_strdup(argv[i]); - - g_spawn_async(NULL, new_argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); - } - - for (size_t s = 0; s <= idx; ++s) { - g_free(new_argv[s]); - } - } /* run zathura */ gtk_main(); From 5f11103a48457044ca83c3e6501d504cc5de3787 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 24 Nov 2015 01:22:41 +0100 Subject: [PATCH 71/94] Use %F as opening multiple files is supported Signed-off-by: Sebastian Ramacher --- zathura.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zathura.desktop b/zathura.desktop index a9b29d9..1280f0d 100644 --- a/zathura.desktop +++ b/zathura.desktop @@ -19,7 +19,7 @@ Comment[pt_BR]=Um visualizador de documentos minimalista Comment[ru]=Минималистичный просмотрщик документов Comment[tr]=Minimalist bir belge görüntüleyicisi Comment[uk_UA]=Легкий переглядач документів -Exec=zathura %f +Exec=zathura %F Terminal=false Categories=Office;Viewer; Keywords=PDF;PS;PostScript;DjVU;document;presentation; From e10cf0eaf3dbe567ea643dce353725cd8a274759 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Tue, 24 Nov 2015 01:22:47 +0100 Subject: [PATCH 72/94] Add viewer to Keywords --- zathura.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zathura.desktop b/zathura.desktop index 1280f0d..5d04a12 100644 --- a/zathura.desktop +++ b/zathura.desktop @@ -22,4 +22,4 @@ Comment[uk_UA]=Легкий переглядач документів Exec=zathura %F Terminal=false Categories=Office;Viewer; -Keywords=PDF;PS;PostScript;DjVU;document;presentation; +Keywords=PDF;PS;PostScript;DjVU;document;presentation;viewer; From b64a5ce4bb9bd4d20851ea7e3f96ef3e31ddf91e Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 30 Nov 2015 18:19:23 +0100 Subject: [PATCH 73/94] Update appdata Signed-off-by: Sebastian Ramacher --- data/zathura.appdata.xml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/data/zathura.appdata.xml b/data/zathura.appdata.xml index 89bb46c..0a13dba 100644 --- a/data/zathura.appdata.xml +++ b/data/zathura.appdata.xml @@ -1,8 +1,8 @@ - + - - zathura.desktop + + zathura.desktop CC0-1.0 Zlib @@ -23,11 +23,20 @@

http://pwmt.org/projects/zathura + https://bugs.pwmt.org/project/zathura - http://pwmt.org/projects/zathura/img/zathura-cover.png - http://pwmt.org/projects/zathura/img/zathura-completion.png - http://pwmt.org/projects/zathura/img/zathura-follow.png - http://pwmt.org/projects/zathura/img/zathura-bookmarks.png + + http://pwmt.org/projects/zathura/img/zathura-cover.png + + + http://pwmt.org/projects/zathura/img/zathura-completion.png + + + http://pwmt.org/projects/zathura/img/zathura-follow.png + + + http://pwmt.org/projects/zathura/img/zathura-bookmarks.png + - zathura@lists.pwmt.org - + zathura@lists.pwmt.org + From 1de8e2a568b9d4ddbcbd7d394d43b2922611986d Mon Sep 17 00:00:00 2001 From: Lukas K Date: Wed, 2 Dec 2015 22:56:47 +0100 Subject: [PATCH 74/94] add gio download --- zathura/zathura.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index 391f756..101b7ee 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -502,6 +502,41 @@ prepare_document_open_from_stdin(zathura_t* zathura, const char* path) return file; } +static gchar* +prepare_document_open_from_gfile(zathura_t* zathura, GFile* source) +{ + g_return_val_if_fail(zathura, NULL); + gchar* file = NULL; + GFileIOStream *iostream; + GError* error = NULL; + + GFile *tmpfile = g_file_new_tmp("zathura.gio.XXXXXX", &iostream, &error); + if(tmpfile == NULL) { + if (error != NULL) { + girara_error("Can not create temporary file: %s", error->message); + g_error_free(error); + } + return NULL; + } + + gboolean rc = g_file_copy(source, tmpfile, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error); + if(rc == FALSE) { + if (error != NULL) { + girara_error("Can not copy to temporary file: %s", error->message); + g_error_free(error); + } + g_object_unref(iostream); + g_object_unref(tmpfile); + return NULL; + } + + file = g_file_get_path(tmpfile); + g_object_unref(iostream); + g_object_unref(tmpfile); + + return file; +} + static gboolean document_info_open(gpointer data) { @@ -520,7 +555,20 @@ document_info_open(gpointer data) document_info->zathura->stdin_support.file = g_strdup(file); } } else { - file = g_strdup(document_info->path); + GFile *gf = g_file_new_for_commandline_arg(document_info->path); + if(g_file_is_native(gf)) { + file = g_strdup(document_info->path); + } + else { + file = prepare_document_open_from_gfile(document_info->zathura, gf); + if (file == NULL) { + girara_notify(document_info->zathura->ui.session, GIRARA_ERROR, + _("Could not read file from GIO and copy it to a temporary file.")); + } else { + document_info->zathura->stdin_support.file = g_strdup(file); + } + } + g_object_unref(gf); } if (file != NULL) { From c3337bdd8098bd3840dc2863b5ce7a7b807835fe Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 6 Dec 2015 13:51:49 +0100 Subject: [PATCH 75/94] Also handle file:// URIs Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index d96af77..bcf38c2 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -571,17 +571,25 @@ document_info_open(gpointer data) document_info->zathura->stdin_support.file = g_strdup(file); } } else { - GFile *gf = g_file_new_for_commandline_arg(document_info->path); - if(g_file_is_native(gf)) { - file = g_strdup(document_info->path); + GFile* gf = g_file_new_for_commandline_arg(document_info->path); + if (g_file_is_native(gf) == TRUE) { + /* file was given as a native path */ + file = g_file_get_path(gf); } else { - file = prepare_document_open_from_gfile(document_info->zathura, gf); - if (file == NULL) { - girara_notify(document_info->zathura->ui.session, GIRARA_ERROR, - _("Could not read file from GIO and copy it to a temporary file.")); + char* gf_file_path = g_file_get_path(gf); + if (gf_file_path != NULL) { + /* file is not given via a native path, but available from a path */ + file = gf_file_path; } else { - document_info->zathura->stdin_support.file = g_strdup(file); + /* copy file with GIO */ + file = prepare_document_open_from_gfile(document_info->zathura, gf); + if (file == NULL) { + girara_notify(document_info->zathura->ui.session, GIRARA_ERROR, + _("Could not read file from GIO and copy it to a temporary file.")); + } else { + document_info->zathura->stdin_support.file = g_strdup(file); + } } } g_object_unref(gf); From 3d14894549fc69b2aca1455c95cc8c272a192153 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 6 Dec 2015 17:38:14 +0100 Subject: [PATCH 76/94] Revert parts of c3337bdd8098bd3840dc2863b5ce7a7b807835fe We still need a copy for the plugins. Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index bcf38c2..8ed568a 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -577,19 +577,13 @@ document_info_open(gpointer data) file = g_file_get_path(gf); } else { - char* gf_file_path = g_file_get_path(gf); - if (gf_file_path != NULL) { - /* file is not given via a native path, but available from a path */ - file = gf_file_path; + /* copy file with GIO */ + file = prepare_document_open_from_gfile(document_info->zathura, gf); + if (file == NULL) { + girara_notify(document_info->zathura->ui.session, GIRARA_ERROR, + _("Could not read file from GIO and copy it to a temporary file.")); } else { - /* copy file with GIO */ - file = prepare_document_open_from_gfile(document_info->zathura, gf); - if (file == NULL) { - girara_notify(document_info->zathura->ui.session, GIRARA_ERROR, - _("Could not read file from GIO and copy it to a temporary file.")); - } else { - document_info->zathura->stdin_support.file = g_strdup(file); - } + document_info->zathura->stdin_support.file = g_strdup(file); } } g_object_unref(gf); From a4619843d725b692f512794973c97712f21fe66d Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 6 Dec 2015 19:06:50 +0100 Subject: [PATCH 77/94] Advertise URL support Signed-off-by: Sebastian Ramacher --- zathura.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zathura.desktop b/zathura.desktop index 5d04a12..f031bdc 100644 --- a/zathura.desktop +++ b/zathura.desktop @@ -19,7 +19,7 @@ Comment[pt_BR]=Um visualizador de documentos minimalista Comment[ru]=Минималистичный просмотрщик документов Comment[tr]=Minimalist bir belge görüntüleyicisi Comment[uk_UA]=Легкий переглядач документів -Exec=zathura %F +Exec=zathura %U Terminal=false Categories=Office;Viewer; Keywords=PDF;PS;PostScript;DjVU;document;presentation;viewer; From 73e8eedc356b72eb52c6696a2622906a9d973b78 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 6 Dec 2015 19:12:51 +0100 Subject: [PATCH 78/94] Remove unused parameter Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index 8ed568a..a11660d 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -456,10 +456,8 @@ zathura_set_argv(zathura_t* zathura, char** argv) } static gchar* -prepare_document_open_from_stdin(zathura_t* zathura, const char* path) +prepare_document_open_from_stdin(const char* path) { - g_return_val_if_fail(zathura, NULL); - int infileno = -1; if (g_strcmp0(path, "-") == 0) { infileno = fileno(stdin); @@ -519,11 +517,10 @@ prepare_document_open_from_stdin(zathura_t* zathura, const char* path) } static gchar* -prepare_document_open_from_gfile(zathura_t* zathura, GFile* source) +prepare_document_open_from_gfile(GFile* source) { - g_return_val_if_fail(zathura, NULL); gchar* file = NULL; - GFileIOStream *iostream; + GFileIOStream* iostream = NULL; GError* error = NULL; GFile *tmpfile = g_file_new_tmp("zathura.gio.XXXXXX", &iostream, &error); @@ -563,7 +560,7 @@ document_info_open(gpointer data) char* file = NULL; if (g_strcmp0(document_info->path, "-") == 0 || g_str_has_prefix(document_info->path, "/proc/self/fd/") == true) { - file = prepare_document_open_from_stdin(document_info->zathura, document_info->path); + file = prepare_document_open_from_stdin(document_info->path); if (file == NULL) { girara_notify(document_info->zathura->ui.session, GIRARA_ERROR, _("Could not read file from stdin and write it to a temporary file.")); @@ -578,7 +575,7 @@ document_info_open(gpointer data) } else { /* copy file with GIO */ - file = prepare_document_open_from_gfile(document_info->zathura, gf); + file = prepare_document_open_from_gfile(gf); if (file == NULL) { girara_notify(document_info->zathura->ui.session, GIRARA_ERROR, _("Could not read file from GIO and copy it to a temporary file.")); From d895ad32a19b0735445932b6fac065a67cfc72ea Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 6 Dec 2015 20:23:18 +0100 Subject: [PATCH 79/94] White spaces Signed-off-by: Sebastian Ramacher --- zathura/zathura.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zathura/zathura.c b/zathura/zathura.c index a11660d..a6a71b9 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -524,7 +524,7 @@ prepare_document_open_from_gfile(GFile* source) GError* error = NULL; GFile *tmpfile = g_file_new_tmp("zathura.gio.XXXXXX", &iostream, &error); - if(tmpfile == NULL) { + if (tmpfile == NULL) { if (error != NULL) { girara_error("Can not create temporary file: %s", error->message); g_error_free(error); @@ -533,7 +533,7 @@ prepare_document_open_from_gfile(GFile* source) } gboolean rc = g_file_copy(source, tmpfile, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error); - if(rc == FALSE) { + if (rc == FALSE) { if (error != NULL) { girara_error("Can not copy to temporary file: %s", error->message); g_error_free(error); From 73699b12ea0da23780ed9691094d3d3ffbc4b3cf Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Sun, 6 Dec 2015 21:04:24 +0100 Subject: [PATCH 80/94] Handle URIs in :open Signed-off-by: Sebastian Ramacher --- zathura/commands.c | 6 +++--- zathura/zathura.c | 43 +++++++++++++++++++++++++++++++------------ 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/zathura/commands.c b/zathura/commands.c index fcea1cb..c697be0 100644 --- a/zathura/commands.c +++ b/zathura/commands.c @@ -238,9 +238,9 @@ cmd_open(girara_session_t* session, girara_list_t* argument_list) document_close(zathura, false); } - document_open(zathura, girara_list_nth(argument_list, 0), - (argc == 2) ? girara_list_nth(argument_list, 1) : NULL, - ZATHURA_PAGE_NUMBER_UNSPECIFIED); + document_open_idle(zathura, girara_list_nth(argument_list, 0), + (argc == 2) ? girara_list_nth(argument_list, 1) : NULL, + ZATHURA_PAGE_NUMBER_UNSPECIFIED, NULL, NULL); } else { girara_notify(session, GIRARA_ERROR, _("No arguments given.")); return false; diff --git a/zathura/zathura.c b/zathura/zathura.c index a6a71b9..86cc1e8 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -46,11 +46,11 @@ typedef struct zathura_document_info_s { zathura_t* zathura; - const char* path; - const char* password; + char* path; + char* password; int page_number; - const char* mode; - const char* synctex; + char* mode; + char* synctex; } zathura_document_info_t; @@ -63,6 +63,20 @@ static void zathura_jumplist_save(zathura_t* zathura); static gboolean zathura_signal_sigterm(gpointer data); #endif +static void +free_document_info(zathura_document_info_t* document_info) +{ + if (document_info == NULL) { + return; + } + + g_free(document_info->path); + g_free(document_info->password); + g_free(document_info->mode); + g_free(document_info->synctex); + g_free(document_info); +} + /* function implementation */ zathura_t* zathura_create(void) @@ -610,7 +624,7 @@ document_info_open(gpointer data) } } - g_free(document_info); + free_document_info(document_info); return FALSE; } @@ -1043,9 +1057,8 @@ void document_open_idle(zathura_t* zathura, const char* path, const char* password, int page_number, const char* mode, const char* synctex) { - if (zathura == NULL || path == NULL) { - return; - } + g_return_if_fail(zathura != NULL); + g_return_if_fail(path != NULL); zathura_document_info_t* document_info = g_try_malloc0(sizeof(zathura_document_info_t)); if (document_info == NULL) { @@ -1053,11 +1066,17 @@ document_open_idle(zathura_t* zathura, const char* path, const char* password, } document_info->zathura = zathura; - document_info->path = path; - document_info->password = password; + document_info->path = g_strdup(path); + if (password != NULL) { + document_info->password = g_strdup(password); + } document_info->page_number = page_number; - document_info->mode = mode; - document_info->synctex = synctex; + if (mode != NULL) { + document_info->mode = g_strdup(mode); + } + if (synctex != NULL) { + document_info->synctex = g_strdup(synctex); + } gdk_threads_add_idle(document_info_open, document_info); } From 859e0efa0ff32b013e01b6a7cb0dff48fd987d8e Mon Sep 17 00:00:00 2001 From: Lukas K Date: Sun, 6 Dec 2015 21:27:18 +0100 Subject: [PATCH 81/94] open URLs from dbus --- zathura/dbus-interface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zathura/dbus-interface.c b/zathura/dbus-interface.c index 33e3b9c..e2560f6 100644 --- a/zathura/dbus-interface.c +++ b/zathura/dbus-interface.c @@ -213,13 +213,14 @@ handle_method_call(GDBusConnection* UNUSED(connection), g_variant_get(parameters, "(ssi)", &filename, &password, &page); document_close(priv->zathura, false); - const bool ret = document_open(priv->zathura, filename, - strlen(password) > 0 ? password : NULL, - page); + document_open_idle(priv->zathura, filename, + strlen(password) > 0 ? password : NULL, + page, + NULL, NULL); g_free(filename); g_free(password); - GVariant* result = g_variant_new("(b)", ret); + GVariant* result = g_variant_new("(b)", true); g_dbus_method_invocation_return_value(invocation, result); return; } else if (g_strcmp0(method_name, "CloseDocument") == 0) { From 337305457f26af506b9d4d26b5ec3b84e0f9d281 Mon Sep 17 00:00:00 2001 From: Lukas K Date: Mon, 7 Dec 2015 01:13:59 +0100 Subject: [PATCH 82/94] display uri in statusbar/title --- zathura/callbacks.c | 3 ++- zathura/document.c | 19 +++++++++++++---- zathura/document.h | 10 ++++++++- zathura/internal.h | 1 + zathura/print.c | 10 ++++----- zathura/shortcuts.c | 2 +- zathura/zathura.c | 50 ++++++++++++++++++++++++++++++--------------- zathura/zathura.h | 14 +++++++++++-- 8 files changed, 77 insertions(+), 32 deletions(-) diff --git a/zathura/callbacks.c b/zathura/callbacks.c index 0ee3b0b..070796d 100644 --- a/zathura/callbacks.c +++ b/zathura/callbacks.c @@ -440,11 +440,12 @@ cb_password_dialog(GtkEntry* entry, zathura_password_dialog_info_t* dialog) } /* try to open document again */ - if (document_open(dialog->zathura, dialog->path, input, + if (document_open(dialog->zathura, dialog->path, dialog->uri, input, ZATHURA_PAGE_NUMBER_UNSPECIFIED) == false) { gdk_threads_add_idle(password_dialog, dialog); } else { g_free(dialog->path); + g_free(dialog->uri); free(dialog); } diff --git a/zathura/document.c b/zathura/document.c index 8fed1a3..82648f0 100644 --- a/zathura/document.c +++ b/zathura/document.c @@ -22,6 +22,7 @@ */ struct zathura_document_s { char* file_path; /**< File path of the document */ + char* uri; /**< URI of the document */ char* basename; /**< Basename of the document */ const char* password; /**< Password of the document */ unsigned int current_page_number; /**< Current page number */ @@ -61,7 +62,7 @@ check_set_error(zathura_error_t* error, zathura_error_t code) { zathura_document_t* zathura_document_open(zathura_plugin_manager_t* plugin_manager, const char* - path, const char* password, zathura_error_t* error) + path, const char *uri, const char* password, zathura_error_t* error) { if (path == NULL) { return NULL; @@ -116,6 +117,7 @@ zathura_document_open(zathura_plugin_manager_t* plugin_manager, const char* document->file_path = real_path; document->basename = g_file_get_basename(file); + document->uri = g_strdup(uri); document->password = password; document->scale = 1.0; document->plugin = plugin; @@ -216,9 +218,8 @@ zathura_document_free(zathura_document_t* document) error = functions->document_free(document, document->data); } - if (document->file_path != NULL) { - free(document->file_path); - } + g_free(document->file_path); + g_free(document->uri); g_free(document->basename); g_free(document); @@ -236,6 +237,16 @@ zathura_document_get_path(zathura_document_t* document) return document->file_path; } +const char* +zathura_document_get_uri(zathura_document_t* document) +{ + if (document == NULL) { + return NULL; + } + + return document->uri; +} + const char* zathura_document_get_basename(zathura_document_t* document) { diff --git a/zathura/document.h b/zathura/document.h index 08f6b20..6880d07 100644 --- a/zathura/document.h +++ b/zathura/document.h @@ -18,7 +18,7 @@ * @return The document object and NULL if an error occurs */ zathura_document_t* zathura_document_open(zathura_plugin_manager_t* - plugin_manager, const char* path, const char* password, zathura_error_t* + plugin_manager, const char* path, const char *uri, const char* password, zathura_error_t* error); /** @@ -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 URI of the document + * + * @param document The document + * @return The URI of the document + */ +const char* zathura_document_get_uri(zathura_document_t* document); + /** * Returns the basename of the document * diff --git a/zathura/internal.h b/zathura/internal.h index 4ca2fac..9d3e348 100644 --- a/zathura/internal.h +++ b/zathura/internal.h @@ -12,6 +12,7 @@ typedef struct zathura_password_dialog_info_s { char* path; /**< Path to the file */ + char* uri; /**< URI to the file */ zathura_t* zathura; /**< Zathura session */ } zathura_password_dialog_info_t; diff --git a/zathura/print.c b/zathura/print.c index 3bf91d0..ccd06c4 100644 --- a/zathura/print.c +++ b/zathura/print.c @@ -78,12 +78,10 @@ cb_print_end(GtkPrintOperation* UNUSED(print_operation), GtkPrintContext* return; } - const char* file_path = zathura_document_get_path(zathura->document); - - if (file_path != NULL) { - girara_statusbar_item_set_text(zathura->ui.session, - zathura->ui.statusbar.file, file_path); - } + char* file_path = get_formatted_filename(zathura, true); + girara_statusbar_item_set_text(zathura->ui.session, + zathura->ui.statusbar.file, file_path); + g_free(file_path); } static void diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c index a80231a..a6a16cb 100644 --- a/zathura/shortcuts.c +++ b/zathura/shortcuts.c @@ -442,7 +442,7 @@ sc_reload(girara_session_t* session, girara_argument_t* UNUSED(argument), document_close(zathura, true); /* reopen document */ - document_open(zathura, zathura->file_monitor.file_path, + document_open(zathura, zathura->file_monitor.file_path, NULL, zathura->file_monitor.password, ZATHURA_PAGE_NUMBER_UNSPECIFIED); diff --git a/zathura/zathura.c b/zathura/zathura.c index 86cc1e8..87c4aef 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -569,6 +569,7 @@ document_info_open(gpointer data) { zathura_document_info_t* document_info = data; g_return_val_if_fail(document_info != NULL, FALSE); + char* uri = NULL; if (document_info->zathura != NULL && document_info->path != NULL) { char* file = NULL; @@ -589,6 +590,7 @@ document_info_open(gpointer data) } else { /* copy file with GIO */ + uri = g_file_get_uri(gf); file = prepare_document_open_from_gfile(gf); if (file == NULL) { girara_notify(document_info->zathura->ui.session, GIRARA_ERROR, @@ -602,13 +604,14 @@ document_info_open(gpointer data) if (file != NULL) { if (document_info->synctex != NULL) { - document_open_synctex(document_info->zathura, file, + document_open_synctex(document_info->zathura, file, uri, document_info->password, document_info->synctex); } else { - document_open(document_info->zathura, file, document_info->password, + document_open(document_info->zathura, file, uri, document_info->password, document_info->page_number); } g_free(file); + g_free(uri); if (document_info->mode != NULL) { if (g_strcmp0(document_info->mode, "presentation") == 0) { @@ -628,14 +631,18 @@ document_info_open(gpointer data) return FALSE; } -static char* -get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar) +char* +get_formatted_filename(zathura_t* zathura, bool statusbar) { bool basename_only = false; + const char* file_path = zathura_document_get_uri(zathura->document); + if(file_path == NULL) { + file_path = zathura_document_get_path(zathura->document); + } if (statusbar == true) { - girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); - } else { girara_setting_get(zathura->ui.session, "statusbar-basename", &basename_only); + } else { + girara_setting_get(zathura->ui.session, "window-title-basename", &basename_only); } if (basename_only == false) { @@ -666,8 +673,16 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar return g_strdup(file_path); } } else { - const char* basename = zathura_document_get_basename(zathura->document); - return g_strdup(basename); + char *basename = NULL; + if(zathura_document_get_uri(zathura->document) == NULL) { + basename = g_strdup(zathura_document_get_basename(zathura->document)); + } + else { + GFile *gf = g_file_new_for_uri(zathura_document_get_uri(zathura->document)); + basename = g_file_get_basename(gf); + g_object_unref(gf); + } + return basename; } } @@ -682,7 +697,7 @@ document_open_password_dialog(gpointer data) } bool -document_open(zathura_t* zathura, const char* path, const char* password, +document_open(zathura_t* zathura, const char* path, const char* uri, const char* password, int page_number) { if (zathura == NULL || zathura->plugins.manager == NULL || path == NULL) { @@ -691,7 +706,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, gchar* file_uri = NULL; zathura_error_t error = ZATHURA_ERROR_OK; - zathura_document_t* document = zathura_document_open(zathura->plugins.manager, path, password, &error); + zathura_document_t* document = zathura_document_open(zathura->plugins.manager, path, uri, password, &error); if (document == NULL) { if (error == ZATHURA_ERROR_INVALID_PASSWORD) { @@ -700,6 +715,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, if (password_dialog_info != NULL) { password_dialog_info->zathura = zathura; password_dialog_info->path = g_strdup(path); + password_dialog_info->uri = g_strdup(uri); if (password_dialog_info->path != NULL) { gdk_threads_add_idle(document_open_password_dialog, password_dialog_info); @@ -715,6 +731,8 @@ document_open(zathura_t* zathura, const char* path, const char* password, } goto error_out; } + + zathura->document = document; const char* file_path = zathura_document_get_path(document); unsigned int number_of_pages = zathura_document_get_number_of_pages(document); @@ -800,7 +818,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, zathura->bisect.end = number_of_pages - 1; /* update statusbar */ - char* filename = get_formatted_filename(zathura, file_path, true); + char* filename = get_formatted_filename(zathura, true); girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, filename); g_free(filename); @@ -846,8 +864,6 @@ document_open(zathura_t* zathura, const char* path, const char* password, goto error_free; } - zathura->document = document; - /* page cache size */ int cache_size = 0; girara_setting_get(zathura->ui.session, "page-cache-size", &cache_size); @@ -976,7 +992,7 @@ document_open(zathura_t* zathura, const char* path, const char* password, } /* update title */ - char* formatted_filename = get_formatted_filename(zathura, file_path, false); + char* formatted_filename = get_formatted_filename(zathura, false); girara_set_window_title(zathura->ui.session, formatted_filename); g_free(formatted_filename); @@ -1029,10 +1045,10 @@ error_out: } bool -document_open_synctex(zathura_t* zathura, const char* path, +document_open_synctex(zathura_t* zathura, const char* path, const char* uri, const char* password, const char* synctex) { - bool ret = document_open(zathura, path, password, + bool ret = document_open(zathura, path, password, uri, ZATHURA_PAGE_NUMBER_UNSPECIFIED); if (ret == false) { return false; @@ -1264,7 +1280,7 @@ statusbar_page_number_update(zathura_t* zathura) girara_setting_get(zathura->ui.session, "window-title-page", &page_number_in_window_title); if (page_number_in_window_title == true) { - char* filename = get_formatted_filename(zathura, zathura_document_get_path(zathura->document), false); + char* filename = get_formatted_filename(zathura, false); char* title = g_strdup_printf("%s %s", filename, page_number_text); girara_set_window_title(zathura->ui.session, title); g_free(title); diff --git a/zathura/zathura.h b/zathura/zathura.h index 92a20bf..e536b56 100644 --- a/zathura/zathura.h +++ b/zathura/zathura.h @@ -306,7 +306,7 @@ void zathura_set_argv(zathura_t* zathura, char** argv); * * @return If no error occured true, otherwise false, is returned. */ -bool document_open(zathura_t* zathura, const char* path, const char* password, +bool document_open(zathura_t* zathura, const char* path, const char* uri, const char* password, int page_number); /** @@ -319,7 +319,7 @@ bool document_open(zathura_t* zathura, const char* path, const char* password, * * @return If no error occured true, otherwise false, is returned. */ -bool document_open_synctex(zathura_t* zathura, const char* path, +bool document_open_synctex(zathura_t* zathura, const char* path, const char* uri, const char* password, const char* synctex); /** @@ -470,4 +470,14 @@ void zathura_jumplist_trim(zathura_t* zathura); */ bool zathura_jumplist_load(zathura_t* zathura, const char* file); +/** + * Gets the nicely formatted filename of the loaded document according to settings + * + * @param zathura The zathura session + * @param statusbar Whether return value will be dispalyed in status bar + * + * return Printable filename. Free with g_free. + */ +char* get_formatted_filename(zathura_t* zathura, bool statusbar); + #endif // ZATHURA_H From f1a5fb45446685be784185769d41dcbd32e4711b Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 7 Dec 2015 12:41:06 +0100 Subject: [PATCH 83/94] Move jumplist code --- zathura/jumplist.c | 181 +++++++++++++++++++++++++++++++++++++++++++++ zathura/zathura.c | 175 ------------------------------------------- 2 files changed, 181 insertions(+), 175 deletions(-) create mode 100644 zathura/jumplist.c diff --git a/zathura/jumplist.c b/zathura/jumplist.c new file mode 100644 index 0000000..fedfb98 --- /dev/null +++ b/zathura/jumplist.c @@ -0,0 +1,181 @@ +#include "zathura.h" +#include "document.h" +#include "database.h" + +#include + +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); + +bool +zathura_jumplist_has_previous(zathura_t* zathura) +{ + return girara_list_iterator_has_previous(zathura->jumplist.cur); +} + +bool +zathura_jumplist_has_next(zathura_t* zathura) +{ + return girara_list_iterator_has_next(zathura->jumplist.cur); +} + +zathura_jump_t* +zathura_jumplist_current(zathura_t* zathura) +{ + if (zathura->jumplist.cur != NULL) { + return girara_list_iterator_data(zathura->jumplist.cur); + } else { + return NULL; + } +} + +void +zathura_jumplist_forward(zathura_t* zathura) +{ + if (girara_list_iterator_has_next(zathura->jumplist.cur)) { + girara_list_iterator_next(zathura->jumplist.cur); + } +} + +void +zathura_jumplist_backward(zathura_t* zathura) +{ + if (girara_list_iterator_has_previous(zathura->jumplist.cur)) { + girara_list_iterator_previous(zathura->jumplist.cur); + } +} + +static void +zathura_jumplist_reset_current(zathura_t* zathura) +{ + g_return_if_fail(zathura != NULL && zathura->jumplist.cur != NULL); + + while (true) { + if (girara_list_iterator_has_next(zathura->jumplist.cur) == false) { + return; + } + + girara_list_iterator_next(zathura->jumplist.cur); + } +} + +static void +zathura_jumplist_append_jump(zathura_t* zathura) +{ + g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL); + + zathura_jump_t* jump = g_try_malloc0(sizeof(zathura_jump_t)); + if (jump == NULL) { + return; + } + + jump->page = 0; + jump->x = 0.0; + jump->y = 0.0; + 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_trim(zathura); +} + +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; + } + + girara_list_iterator_remove(cur); + --zathura->jumplist.size; + } + + if (zathura->jumplist.size == 0 || (zathura->jumplist.size != 0 && zathura->jumplist.cur != NULL)) { + girara_list_iterator_free(cur); + } else { + zathura->jumplist.cur = cur; + } +} + +void +zathura_jumplist_add(zathura_t* zathura) +{ + g_return_if_fail(zathura != NULL && zathura->document != NULL && zathura->jumplist.list != NULL); + + unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); + double x = zathura_document_get_position_x(zathura->document); + double y = zathura_document_get_position_y(zathura->document); + + if (zathura->jumplist.size != 0) { + zathura_jumplist_reset_current(zathura); + + zathura_jump_t* cur = zathura_jumplist_current(zathura); + + if (cur != NULL) { + if (cur->page == pagenum && cur->x == x && cur->y == y) { + return; + } + } + } + + zathura_jumplist_append_jump(zathura); + zathura_jumplist_reset_current(zathura); + zathura_jumplist_save(zathura); +} + +bool +zathura_jumplist_load(zathura_t* zathura, const char* file) +{ + g_return_val_if_fail(zathura != NULL && file != NULL, false); + + if (zathura->database == NULL) { + return 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) +{ + g_return_if_fail(zathura != NULL && zathura->document != NULL); + + zathura_jump_t* cur = zathura_jumplist_current(zathura); + + unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); + + if (cur != NULL) { + cur->page = pagenum; + cur->x = zathura_document_get_position_x(zathura->document); + cur->y = zathura_document_get_position_y(zathura->document); + } +} diff --git a/zathura/zathura.c b/zathura/zathura.c index 86cc1e8..aff5b25 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -55,9 +55,6 @@ typedef struct zathura_document_info_s { static gboolean document_info_open(gpointer data); -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); #ifdef G_OS_UNIX static gboolean zathura_signal_sigterm(gpointer data); @@ -1437,178 +1434,6 @@ error_ret: return false; } -bool -zathura_jumplist_has_previous(zathura_t* zathura) -{ - return girara_list_iterator_has_previous(zathura->jumplist.cur); -} - -bool -zathura_jumplist_has_next(zathura_t* zathura) -{ - return girara_list_iterator_has_next(zathura->jumplist.cur); -} - -zathura_jump_t* -zathura_jumplist_current(zathura_t* zathura) -{ - if (zathura->jumplist.cur != NULL) { - return girara_list_iterator_data(zathura->jumplist.cur); - } else { - return NULL; - } -} - -void -zathura_jumplist_forward(zathura_t* zathura) -{ - if (girara_list_iterator_has_next(zathura->jumplist.cur)) { - girara_list_iterator_next(zathura->jumplist.cur); - } -} - -void -zathura_jumplist_backward(zathura_t* zathura) -{ - if (girara_list_iterator_has_previous(zathura->jumplist.cur)) { - girara_list_iterator_previous(zathura->jumplist.cur); - } -} - -static void -zathura_jumplist_reset_current(zathura_t* zathura) -{ - g_return_if_fail(zathura != NULL && zathura->jumplist.cur != NULL); - - while (true) { - if (girara_list_iterator_has_next(zathura->jumplist.cur) == false) { - return; - } - - girara_list_iterator_next(zathura->jumplist.cur); - } -} - -static void -zathura_jumplist_append_jump(zathura_t* zathura) -{ - g_return_if_fail(zathura != NULL && zathura->jumplist.list != NULL); - - zathura_jump_t* jump = g_try_malloc0(sizeof(zathura_jump_t)); - if (jump == NULL) { - return; - } - - jump->page = 0; - jump->x = 0.0; - jump->y = 0.0; - 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_trim(zathura); -} - -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; - } - - girara_list_iterator_remove(cur); - --zathura->jumplist.size; - } - - if (zathura->jumplist.size == 0 || (zathura->jumplist.size != 0 && zathura->jumplist.cur != NULL)) { - girara_list_iterator_free(cur); - } else { - zathura->jumplist.cur = cur; - } -} - -void -zathura_jumplist_add(zathura_t* zathura) -{ - g_return_if_fail(zathura != NULL && zathura->document != NULL && zathura->jumplist.list != NULL); - - unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); - double x = zathura_document_get_position_x(zathura->document); - double y = zathura_document_get_position_y(zathura->document); - - if (zathura->jumplist.size != 0) { - zathura_jumplist_reset_current(zathura); - - zathura_jump_t* cur = zathura_jumplist_current(zathura); - - if (cur != NULL) { - if (cur->page == pagenum && cur->x == x && cur->y == y) { - return; - } - } - } - - zathura_jumplist_append_jump(zathura); - zathura_jumplist_reset_current(zathura); - zathura_jumplist_save(zathura); -} - -bool -zathura_jumplist_load(zathura_t* zathura, const char* file) -{ - g_return_val_if_fail(zathura != NULL && file != NULL, false); - - if (zathura->database == NULL) { - return 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) -{ - g_return_if_fail(zathura != NULL && zathura->document != NULL); - - zathura_jump_t* cur = zathura_jumplist_current(zathura); - - unsigned int pagenum = zathura_document_get_current_page_number(zathura->document); - - if (cur != NULL) { - cur->page = pagenum; - cur->x = zathura_document_get_position_x(zathura->document); - cur->y = zathura_document_get_position_y(zathura->document); - } -} - #ifdef G_OS_UNIX static gboolean zathura_signal_sigterm(gpointer data) From c4fa62fe0001a7d7a7a3ff9f00af1126359b4602 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 7 Dec 2015 12:41:15 +0100 Subject: [PATCH 84/94] Use HTTPS --- data/zathura.appdata.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/zathura.appdata.xml b/data/zathura.appdata.xml index 0a13dba..280025e 100644 --- a/data/zathura.appdata.xml +++ b/data/zathura.appdata.xml @@ -22,20 +22,20 @@

- http://pwmt.org/projects/zathura + https://pwmt.org/projects/zathura https://bugs.pwmt.org/project/zathura - http://pwmt.org/projects/zathura/img/zathura-cover.png + https://pwmt.org/projects/zathura/img/zathura-cover.png - http://pwmt.org/projects/zathura/img/zathura-completion.png + https://pwmt.org/projects/zathura/img/zathura-completion.png - http://pwmt.org/projects/zathura/img/zathura-follow.png + https://pwmt.org/projects/zathura/img/zathura-follow.png - http://pwmt.org/projects/zathura/img/zathura-bookmarks.png + https://pwmt.org/projects/zathura/img/zathura-bookmarks.png zathura@lists.pwmt.org From ca0b8e19532be1e8ef5c9a401c1928518da6a1b4 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 7 Dec 2015 12:52:34 +0100 Subject: [PATCH 85/94] Call correct free function Signed-off-by: Sebastian Ramacher --- zathura/render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zathura/render.c b/zathura/render.c index 61b22af..21841e4 100644 --- a/zathura/render.c +++ b/zathura/render.c @@ -162,7 +162,7 @@ renderer_finalize(GObject* object) } g_mutex_clear(&(priv->mutex)); - free(priv->page_cache.cache); + g_free(priv->page_cache.cache); girara_list_free(priv->requests); } From 7dc30c9c147df8f0de2e94a797de627836e9e9ed Mon Sep 17 00:00:00 2001 From: Lukas K Date: Mon, 7 Dec 2015 22:27:09 +0100 Subject: [PATCH 86/94] move uri basename handling to zathura_document_open --- zathura/document.c | 9 ++++++++- zathura/zathura.c | 14 +++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/zathura/document.c b/zathura/document.c index 82648f0..fb03f65 100644 --- a/zathura/document.c +++ b/zathura/document.c @@ -116,8 +116,15 @@ zathura_document_open(zathura_plugin_manager_t* plugin_manager, const char* } document->file_path = real_path; - document->basename = g_file_get_basename(file); document->uri = g_strdup(uri); + if (document->uri == NULL) { + document->basename = g_file_get_basename(file); + } + else { + GFile *gf = g_file_new_for_uri(document->uri); + document->basename = g_file_get_basename(gf); + g_object_unref(gf); + } document->password = password; document->scale = 1.0; document->plugin = plugin; diff --git a/zathura/zathura.c b/zathura/zathura.c index 87c4aef..5e988e1 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -636,7 +636,7 @@ get_formatted_filename(zathura_t* zathura, bool statusbar) { bool basename_only = false; const char* file_path = zathura_document_get_uri(zathura->document); - if(file_path == NULL) { + if (file_path == NULL) { file_path = zathura_document_get_path(zathura->document); } if (statusbar == true) { @@ -673,16 +673,8 @@ get_formatted_filename(zathura_t* zathura, bool statusbar) return g_strdup(file_path); } } else { - char *basename = NULL; - if(zathura_document_get_uri(zathura->document) == NULL) { - basename = g_strdup(zathura_document_get_basename(zathura->document)); - } - else { - GFile *gf = g_file_new_for_uri(zathura_document_get_uri(zathura->document)); - basename = g_file_get_basename(gf); - g_object_unref(gf); - } - return basename; + const char* basename = zathura_document_get_basename(zathura->document); + return g_strdup(basename); } } From c4575fe3e4b004b7e7bacbbe93e836a9646c2c3a Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 14 Dec 2015 22:08:00 +0100 Subject: [PATCH 87/94] Sort files and colorful output Bring the Makefile up to par with girara. Signed-off-by: Sebastian Ramacher --- config.mk | 3 +++ po/Makefile | 44 ++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/config.mk b/config.mk index 70a9a2e..3b90908 100644 --- a/config.mk +++ b/config.mk @@ -139,6 +139,9 @@ VALGRIND_SUPPRESSION_FILE = zathura.suppression # set to something != 0 if you want verbose build output VERBOSE ?= 0 +# gettext package name +GETTEXT_PACKAGE ?= ${PROJECT} + # colors COLOR ?= 1 diff --git a/po/Makefile b/po/Makefile index e17f0c5..cebea0e 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,58 +1,58 @@ # See LICENSE file for license and copyright information -PROJECT = zathura -GETTEXT_PACKAGE = $(PROJECT) -CATALOGS = $(wildcard *.po) -LINGUAS ?= $(patsubst %.po, %, $(CATALOGS)) +include ../config.mk +include ../common.mk +include ../colors.mk + +PROJECT = zathura +CATALOGS = $(sort $(wildcard *.po)) +LINGUAS ?= $(patsubst %.po, %, $(CATALOGS)) ifeq ($(LINGUAS),) ALINGUAS = else ALINGUAS = $(shell find $(patsubst %, %.po, $(LINGUAS)) 2>/dev/null) endif -MOS = $(patsubst %, %/LC_MESSAGES/${GETTEXT_PACKAGE}.mo, $(patsubst %.po, %, $(ALINGUAS))) - -include ../config.mk -include ../common.mk +MOS = $(patsubst %, %/LC_MESSAGES/${GETTEXT_PACKAGE}.mo, $(patsubst %.po, %, $(ALINGUAS))) all: ${MOS} clean: $(QUIET)rm -rf POTFILES.in POTFILES.in.tmp $(patsubst %.po, %, $(CATALOGS)) ${PROJECT}.pot -POTFILES.in: $(wildcard ../zathura/*.c) +POTFILES.in: $(sort $(wildcard ../girara/*.c)) $(QUIET) set -e && rm -f $@.tmp && touch $@.tmp && \ for f in $(^F) ; do \ - echo zathura/$$f >> $@.tmp ; \ + echo girara/$$f >> $@.tmp ; \ done && \ mv $@.tmp $@ -${PROJECT}.pot: POTFILES.in - $(ECHO) regenerate ${PROJECT}.pot - $(QUIET)intltool-update --pot --gettext-package=${PROJECT} +${GETTEXT_PACKAGE}.pot: POTFILES.in + $(ECHO) regenerate $@ + $(QUIET)intltool-update --pot --gettext-package=${GETTEXT_PACKAGE} -update-po: ${PROJECT}.pot - $(ECHO) updating po: files ${CATALOGS} +update-po: ${GETTEXT_PACKAGE}.pot + $(call colorecho,PO,"Updating po files ${CATALOGS}") $(QUIET)set -e && for f in ${CATALOGS} ; do \ - intltool-update --dist --gettext-package=${PROJECT} `echo $$f | sed 's/\.po//'` ; \ + intltool-update --dist --gettext-package=${GETTEXT_PACKAGE} `echo $$f | sed 's/\.po//'` ; \ sed -i 's/Report-Msgid-Bugs-To: \\n/Report-Msgid-Bugs-To: http:\/\/bugs.pwmt.org\\n/' "$$f" ; \ done -%/LC_MESSAGES/${PROJECT}.mo: %.po +%/LC_MESSAGES/${GETTEXT_PACKAGE}.mo: %.po @mkdir -p $(@D) - $(ECHO) msgfmt $(shell echo $< | sed 's/\.po//') + $(call colorecho,MSGFMT,$(shell echo $< | sed 's/\.po//')) $(QUIET)${MSGFMT} ${MSGFMTFLAGS} -c $< -o $@ install: ${MOS} - $(ECHO) installing translations + $(call colorecho,INSTALL,"Install translations") $(QUIET)set -e && for f in $^ ; do \ mkdir -p -m 755 $(DESTDIR)$(LOCALEDIR)/`dirname $$f`; \ install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`dirname $$f` ; \ done uninstall: ${MOS} - $(ECHO) removing translations + $(call colorecho,UNINSTALL,"Uninstall translations") $(QUIET)set -e && for f in $^ ; do \ - rm -f $(DESTDIR)$(LOCALEDIR)/$$f; \ + rm -f $(LOCALEDIR)/$$f; \ done -.PHONY: all clean update-po install uninstall +.PHONY: all clean install uninstall update-po From 743e2bad0e11bb435c9188a22dc78ead7153c481 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 14 Dec 2015 22:17:04 +0100 Subject: [PATCH 88/94] Run update-po Signed-off-by: Sebastian Ramacher --- po/ca.po | 504 ++++++++++++++++++++++++++------------------------- po/cs.po | 504 ++++++++++++++++++++++++++------------------------- po/de.po | 512 ++++++++++++++++++++++++++-------------------------- po/el.po | 504 ++++++++++++++++++++++++++------------------------- po/eo.po | 504 ++++++++++++++++++++++++++------------------------- po/es.po | 504 ++++++++++++++++++++++++++------------------------- po/es_CL.po | 504 ++++++++++++++++++++++++++------------------------- po/et.po | 504 ++++++++++++++++++++++++++------------------------- po/fr.po | 506 +++++++++++++++++++++++++-------------------------- po/he.po | 504 ++++++++++++++++++++++++++------------------------- po/hr.po | 504 ++++++++++++++++++++++++++------------------------- po/id_ID.po | 504 ++++++++++++++++++++++++++------------------------- po/it.po | 506 +++++++++++++++++++++++++-------------------------- po/lt.po | 504 ++++++++++++++++++++++++++------------------------- po/no.po | 507 +++++++++++++++++++++++++-------------------------- po/pl.po | 506 +++++++++++++++++++++++++-------------------------- po/pt_BR.po | 506 +++++++++++++++++++++++++-------------------------- po/ru.po | 506 +++++++++++++++++++++++++-------------------------- po/ta_IN.po | 504 ++++++++++++++++++++++++++------------------------- po/tr.po | 504 ++++++++++++++++++++++++++------------------------- po/uk_UA.po | 504 ++++++++++++++++++++++++++------------------------- 21 files changed, 5345 insertions(+), 5260 deletions(-) diff --git a/po/ca.po b/po/ca.po index c7b85c3..3b5808e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:09+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/zathura/language/" @@ -20,11 +20,179 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." msgstr "" +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Entrada invàlida '%s'." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Índex invàlid '%s'." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "No s'ha obert cap document." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Nombre d'arguments invàlids." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "No s'ha pogut crear el marcador: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "No s'ha pogut crear el marcador: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Marcador actualitzat correctament: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Marcador creat correctament: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Esborrat el marcador: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "No s'ha pogut esborrar el marcador: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Marcador no existent: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Cap informació disponible." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Massa arguments." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Cap argument subministrat." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Document desat." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "No s'ha pogut desar el document." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Nombre d'arguments invàlids." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "No s'ha pogut escriure el fitxer adjunt '%s' a '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "S'ha escrit el fitxer adjunt '%s' a '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "S'ha escrit la imatge '%s' a '%s'." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "No s'ha pogut escriure la imatge '%s' a '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Imatge desconeguda '%s'." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Imatge o fitxer adjunt desconegut '%s'." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "L'argument ha de ser un nombre." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Pàgina %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Fitxers adjunts" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Imatges" + #. zathura settings #: ../zathura/config.c:144 msgid "Database backend" @@ -316,233 +484,6 @@ msgstr "Realça els resultats de recerca actual" msgid "Show version information" msgstr "Mostra informació sobre la versió" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Entrada invàlida '%s'." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Índex invàlid '%s'." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "No s'ha obert cap document." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Nombre d'arguments invàlids." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "No s'ha pogut crear el marcador: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "No s'ha pogut crear el marcador: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Marcador actualitzat correctament: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Marcador creat correctament: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Esborrat el marcador: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "No s'ha pogut esborrar el marcador: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Marcador no existent: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Cap informació disponible." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Massa arguments." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Cap argument subministrat." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Document desat." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "No s'ha pogut desar el document." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Nombre d'arguments invàlids." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "No s'ha pogut escriure el fitxer adjunt '%s' a '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "S'ha escrit el fitxer adjunt '%s' a '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "S'ha escrit la imatge '%s' a '%s'." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "No s'ha pogut escriure la imatge '%s' a '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Imatge desconeguda '%s'." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Imatge o fitxer adjunt desconegut '%s'." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "L'argument ha de ser un nombre." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Carregant..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copia la imatge" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Desa imatge com a" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Reassigna a la finestra especificada per xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Ruta al directori de configuració" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Camí al directori de dades" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Camí al directori que conté els plugins" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Bifurca en segon pla" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Contrasenya del document" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Nivell de registre (depuració, informació, advertiments, errors)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Imprimeix informació sobre la versió" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Editor synctex (reenviat a l'ordre synctex)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "No s'ha pogut executar xdg-open." @@ -561,40 +502,103 @@ msgstr "Enllaç: %s" msgid "Link: Invalid" msgstr "Enllaç: Invàlid" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Reassigna a la finestra especificada per xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Ruta al directori de configuració" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Camí al directori de dades" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Camí al directori que conté els plugins" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Bifurca en segon pla" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Contrasenya del document" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Nivell de registre (depuració, informació, advertiments, errors)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Imprimeix informació sobre la versió" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Editor synctex (reenviat a l'ordre synctex)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Carregant..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copia la imatge" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Desa imatge com a" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Aquest document no conté cap índex" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Pàgina %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Fitxers adjunts" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Imatges" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Sense nom]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/cs.po b/po/cs.po index 2d2a832..d6f69d6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:09+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: pwmt.org \n" @@ -15,11 +15,179 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." msgstr "" +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Neplatný vstup: %s" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Neplatný index: %s" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Není otevřený žádný dokument." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Špatný počet argumentů." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Nemůžu vytvořit záložku: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Nemůžu vytvořit záložku: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Záložka úspěšně aktualizována: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Záložka úspěšně vytvořena: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Záložka smazána: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Nemůžu smazat záložku: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Záložka neexistuje: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Nejsou dostupné žádné informace." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Příliš mnoho argumentů." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Nezadali jste argumenty." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Dokument uložen." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Nepovedlo se uložit dokument." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Špatný počet argumentů." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Nepovedlo se zapsat přílohu '%s' do '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Příloha '%s' zapsána do '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Obrázek '%s' zapsán do '%s'." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Nepovedlo se zapsat obrázek '%s' do '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Neznámý obrázek '%s'." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Neznámá příloha nebo obrázek '%s'." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Argumentem musí být číslo." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Strana %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Přílohy" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Obrázky" + #. zathura settings #: ../zathura/config.c:144 msgid "Database backend" @@ -311,233 +479,6 @@ msgstr "Zvýrazňovat výsledky tohoto hledání" msgid "Show version information" msgstr "" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Neplatný vstup: %s" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Neplatný index: %s" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Není otevřený žádný dokument." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Špatný počet argumentů." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Nemůžu vytvořit záložku: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Nemůžu vytvořit záložku: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Záložka úspěšně aktualizována: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Záložka úspěšně vytvořena: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Záložka smazána: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Nemůžu smazat záložku: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Záložka neexistuje: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Nejsou dostupné žádné informace." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Příliš mnoho argumentů." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Nezadali jste argumenty." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Dokument uložen." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Nepovedlo se uložit dokument." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Špatný počet argumentů." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Nepovedlo se zapsat přílohu '%s' do '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Příloha '%s' zapsána do '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Obrázek '%s' zapsán do '%s'." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Nepovedlo se zapsat obrázek '%s' do '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Neznámý obrázek '%s'." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Neznámá příloha nebo obrázek '%s'." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Argumentem musí být číslo." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Načítám ..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Zkopíruj obrázek" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Ulož obrázek jako" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Cesta k souboru s nastavením" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Cesta k adresáři s daty" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Cesta k adresářům s pluginy" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Forknout se na pozadí" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Heslo" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Úroveň logování (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Zobrazit informace o souboru" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Nepovedlo se spustit xdg-open." @@ -556,40 +497,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Cesta k souboru s nastavením" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Cesta k adresáři s daty" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Cesta k adresářům s pluginy" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Forknout se na pozadí" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Heslo" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Úroveň logování (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Zobrazit informace o souboru" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Načítám ..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Zkopíruj obrázek" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Ulož obrázek jako" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Tenhle dokument neobsahuje žádné indexy" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Strana %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Přílohy" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Obrázky" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Nepojmenovaný]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/de.po b/po/de.po index ab613ea..6b5a05c 100644 --- a/po/de.po +++ b/po/de.po @@ -8,22 +8,190 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" -"PO-Revision-Date: 2015-10-15 23:08+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" +"PO-Revision-Date: 2015-12-14 22:15+0100\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: German (http://www.transifex.com/projects/p/zathura/language/" "de/)\n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.5\n" +"X-Generator: Poedit 1.8.6\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" -msgstr "Drucken fehlgeschlagen: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "'%s' darf nicht 0 sein. Auf 1 gesetzt." + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Ungültige Eingabe '%s' angegeben." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Ungültiger Index '%s' angegeben." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "Der gewählte Text wurde in die Zwischenablage %s kopiert: %s" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Kein Dokument geöffnet." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Ungültige Anzahl an Argumenten angegeben." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Konnte Lesezeichen nicht aktualisieren: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Konnte Lesezeichen nicht erstellen: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Lesezeichen erfolgreich aktualisiert: %s." + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Lesezeichen erfolgreich erstellt: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Lesezeichen entfernt: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Konnte Lesezeichen nicht entfernen: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Lesezeichen existiert nicht: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Titel" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Autor" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "Betreff" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Schlagwörter" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "Ersteller" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Produzent" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Erstellungsdatum" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Modifikationsdatum" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Keine Information verfügbar." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Zu viele Argumente angegeben." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Keine Argumente angegeben." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Dokument gespeichert." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Konnte Dokument nicht speichern." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Ungültige Anzahl an Argumenten." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Konnte Anhang '%s' nicht nach '%s' schreiben." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Anhang '%s' nach '%s' geschrieben." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Anhang '%s' nach '%s' geschrieben." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Konnte Anhang '%s' nicht nach '%s' schreiben." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Unbekanntes Bild '%s'." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Unbekannter Anhanng oder Bild '%s'." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Das Argument ist keine Zahl." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Seite %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Speichere Anhänge" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Bilder" #. zathura settings #: ../zathura/config.c:144 @@ -319,233 +487,6 @@ msgstr "Hebe aktuelle Suchergebnisse hervor" msgid "Show version information" msgstr "Zeige Versionsinformationen an" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "'%s' darf nicht 0 sein. Auf 1 gesetzt." - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Ungültige Eingabe '%s' angegeben." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Ungültiger Index '%s' angegeben." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "Der gewählte Text wurde in die Zwischenablage %s kopiert: %s" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Kein Dokument geöffnet." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Ungültige Anzahl an Argumenten angegeben." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Konnte Lesezeichen nicht aktualisieren: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Konnte Lesezeichen nicht erstellen: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Lesezeichen erfolgreich aktualisiert: %s." - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Lesezeichen erfolgreich erstellt: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Lesezeichen entfernt: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Konnte Lesezeichen nicht entfernen: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Lesezeichen existiert nicht: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Titel" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Autor" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "Betreff" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Schlagwörter" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "Ersteller" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Produzent" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Erstellungsdatum" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Modifikationsdatum" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Keine Information verfügbar." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Zu viele Argumente angegeben." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Keine Argumente angegeben." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Dokument gespeichert." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Konnte Dokument nicht speichern." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Ungültige Anzahl an Argumenten." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Konnte Anhang '%s' nicht nach '%s' schreiben." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Anhang '%s' nach '%s' geschrieben." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Anhang '%s' nach '%s' geschrieben." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Konnte Anhang '%s' nicht nach '%s' schreiben." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Unbekanntes Bild '%s'." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Unbekannter Anhanng oder Bild '%s'." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Das Argument ist keine Zahl." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Lädt..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Bild kopieren" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Bild speichern als" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Reparentiert zathura an das Fenster mit der xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Pfad zum Konfigurationsverzeichnis" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Pfad zum Datenverzeichnis" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "Pfad zum Cacheverzeichnis" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Pfad zum Pluginverzeichnis" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Forkt den Prozess in den Hintergrund" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Dokument Passwort" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "Zur Seite springen" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Log-Stufe (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Zeige Versionsinformationen an" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Synctex Editor (wird an synctex weitergeleitet)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "Zur gewählten SyncTeX-Position springen" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "Gewählte Position im Prozess hervorheben" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "In einem Nicht-Standardmodus starten" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Konnte xdg-open nicht ausführen." @@ -564,40 +505,103 @@ msgstr "Verknüpfung: %s" msgid "Link: Invalid" msgstr "Verknüpfung: ungültig" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Reparentiert zathura an das Fenster mit der xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Pfad zum Konfigurationsverzeichnis" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Pfad zum Datenverzeichnis" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "Pfad zum Cacheverzeichnis" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Pfad zum Pluginverzeichnis" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Forkt den Prozess in den Hintergrund" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Dokument Passwort" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "Zur Seite springen" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Log-Stufe (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Zeige Versionsinformationen an" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Synctex Editor (wird an synctex weitergeleitet)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "Zur gewählten SyncTeX-Position springen" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "Gewählte Position im Prozess hervorheben" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "In einem Nicht-Standardmodus starten" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Lädt..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Bild kopieren" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Bild speichern als" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "Drucken fehlgeschlagen: %s" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Dieses Dokument beinhaltet kein Inhaltsverzeichnis." -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Seite %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Speichere Anhänge" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Bilder" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Kein Name]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "Konnte Datei nicht von stdin lesen und in temporäre Datei schreiben." -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "Konnte Datei nicht mittels GIO in temporäre Datei kopieren." + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "Passwort:" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Dateityp ist nicht unterstützt. Installiere das benötigete Plugin." -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "Dieses Dokument beinhaltet keine Seiten" diff --git a/po/el.po b/po/el.po index b722c37..c99c38a 100644 --- a/po/el.po +++ b/po/el.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Greek (http://www.transifex.com/projects/p/zathura/language/" @@ -20,11 +20,179 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." msgstr "" +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Η είσοδος '%s' είναι άκυρη." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Ο δείκτης '%s' είναι άκυρος." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Δεν άνοιξε κανένα αρχείο. " + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Μη έγκυρος αριθμός παραμέτρων." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Η δημιουργία του σελιδοδείκτη: %s δεν ήταν δυνατή." + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Η δημιουργία του σελιδοδείκτη: %s δεν ήταν δυνατή." + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Η ενημέρωση του σελιδοδείκτη: %s ήταν επιτυχής. " + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Η δημιουργία του σελιδοδείκτη: %s ήταν επιτυχής." + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Ο σελιδοδείκτης: %s διεγράφει. " + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Η διαγραφή του σελιδοδείκτη: %s απέτυχε. " + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Ο σελιδοδείκτης: %s δεν βρέθηκε. " + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Εισήχθησαν πολλές παράμετροι. " + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Δεν εισήχθησαν παράμετροι. " + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Το αρχείο αποθηκεύτηκε." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Η αποθήκευση του αρχείου απέτυχε. " + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Μη έγκυρος ο αριθμός των παραμέτρων. " + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Μη επιτυχής η εγγραγή της προσάρτησης '%s' στην '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Επιτυχής η εγγραφή της προσάρτησης '%s' στην '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Ενεγράφει η εικόνα '%s' στην '%s'" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Δεν ενεγράφει η εικόνα '%s' στην '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Άγνωστη εικόνα '%s'. " + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Άγνωστο προσάρτημα είτε εικόνα '%s'. " + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Η παράμετρος πρέπει να είναι αριθμός." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Σελίδα %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Προσαρτήσεις" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Εικόνες" + #. zathura settings #: ../zathura/config.c:144 msgid "Database backend" @@ -318,233 +486,6 @@ msgstr "Τονισμός στα τρέχοντα αποτελέσματα της msgid "Show version information" msgstr "Εμφάνιση πληροφοριών έκδοσης" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Η είσοδος '%s' είναι άκυρη." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Ο δείκτης '%s' είναι άκυρος." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Δεν άνοιξε κανένα αρχείο. " - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Μη έγκυρος αριθμός παραμέτρων." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Η δημιουργία του σελιδοδείκτη: %s δεν ήταν δυνατή." - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Η δημιουργία του σελιδοδείκτη: %s δεν ήταν δυνατή." - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Η ενημέρωση του σελιδοδείκτη: %s ήταν επιτυχής. " - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Η δημιουργία του σελιδοδείκτη: %s ήταν επιτυχής." - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Ο σελιδοδείκτης: %s διεγράφει. " - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Η διαγραφή του σελιδοδείκτη: %s απέτυχε. " - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Ο σελιδοδείκτης: %s δεν βρέθηκε. " - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Δεν υπάρχουν διαθέσιμες πληροφορίες." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Εισήχθησαν πολλές παράμετροι. " - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Δεν εισήχθησαν παράμετροι. " - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Το αρχείο αποθηκεύτηκε." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Η αποθήκευση του αρχείου απέτυχε. " - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Μη έγκυρος ο αριθμός των παραμέτρων. " - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Μη επιτυχής η εγγραγή της προσάρτησης '%s' στην '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Επιτυχής η εγγραφή της προσάρτησης '%s' στην '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Ενεγράφει η εικόνα '%s' στην '%s'" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Δεν ενεγράφει η εικόνα '%s' στην '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Άγνωστη εικόνα '%s'. " - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Άγνωστο προσάρτημα είτε εικόνα '%s'. " - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Η παράμετρος πρέπει να είναι αριθμός." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Φορτώνει ..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Αντιγραφή εικόνας" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Αποθήκευση εικόνας ως..." - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Reparents to window specified by xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Διαδρομή του αρχείου ρυθμίσεων" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Διαδρομή του φακέλου δεδομένων" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Διαδρομή φακέλου που περιέχει τα πρόσθετα" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Διακλάδωση στο παρασκήνιο" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Κωδικός αρχείου" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Επίπεδο καταγραφής (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Εκτύπωση πληροφοριών έκδοσης" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Synctex editor (Προώθηση στην εντολή synctex)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Απέτυχε η εκτέλεση του xdg-open. " @@ -563,40 +504,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Reparents to window specified by xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Διαδρομή του αρχείου ρυθμίσεων" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Διαδρομή του φακέλου δεδομένων" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Διαδρομή φακέλου που περιέχει τα πρόσθετα" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Διακλάδωση στο παρασκήνιο" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Κωδικός αρχείου" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Επίπεδο καταγραφής (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Εκτύπωση πληροφοριών έκδοσης" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Synctex editor (Προώθηση στην εντολή synctex)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Φορτώνει ..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Αντιγραφή εικόνας" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Αποθήκευση εικόνας ως..." + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Το αρχείο δεν περιέχει κανένα δείκτη" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Σελίδα %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Προσαρτήσεις" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Εικόνες" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Χωρίς όνομα]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/eo.po b/po/eo.po index 94e7b0e..edd4f21 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/zathura/" @@ -19,11 +19,179 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." msgstr "" +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Nevalida enigo '%s' uzata." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Nevalida indekso '%s' uzata." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Neniu dokumento malfermita." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Nevalida nombro da argumentoj uzata." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Neeble krei paĝosignon: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Neeble krei paĝosignon: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Paĝosigno sukcese aktualigita: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Paĝosigno sukcese kreita: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Paĝosigno forigita: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Neeble forigi paĝosignon: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Neniu paĝosigno: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Neniu informacio disponebla." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Tro multe da argumentoj." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Neniuj argumentoj uzata." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Dokumento konservita." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Neeble konservi dokumenton." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Nevalida nombro da argumentoj." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Neeble skribi kunsendaĵon '%s' en '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Skribis kunsendaĵon '%s' en '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Skribis kunsendaĵon '%s' en '%s'." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Neeble skribi kunsendaĵon '%s' en '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Nekonata bildo '%s'." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Argumento devas esti nombro." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Paĝo %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Konservu kunsendaĵojn" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Bildoj" + #. zathura settings #: ../zathura/config.c:144 msgid "Database backend" @@ -315,233 +483,6 @@ msgstr "" msgid "Show version information" msgstr "" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Nevalida enigo '%s' uzata." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Nevalida indekso '%s' uzata." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Neniu dokumento malfermita." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Nevalida nombro da argumentoj uzata." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Neeble krei paĝosignon: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Neeble krei paĝosignon: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Paĝosigno sukcese aktualigita: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Paĝosigno sukcese kreita: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Paĝosigno forigita: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Neeble forigi paĝosignon: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Neniu paĝosigno: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Neniu informacio disponebla." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Tro multe da argumentoj." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Neniuj argumentoj uzata." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Dokumento konservita." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Neeble konservi dokumenton." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Nevalida nombro da argumentoj." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Neeble skribi kunsendaĵon '%s' en '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Skribis kunsendaĵon '%s' en '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Skribis kunsendaĵon '%s' en '%s'." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Neeble skribi kunsendaĵon '%s' en '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Nekonata bildo '%s'." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Argumento devas esti nombro." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Ŝargado ..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Kopiu bildon" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Savi bildojn kiel" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Vojo al la agorda dosierujo" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Vojo al la datuma dosierujo" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Vojoj al dosierujoj enhavantaj kromaĵojn" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Nivelo de ĵurnalo (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Montru dosiera informacio" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Fiaskis iro de xdg-open" @@ -560,40 +501,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Vojo al la agorda dosierujo" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Vojo al la datuma dosierujo" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Vojoj al dosierujoj enhavantaj kromaĵojn" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Nivelo de ĵurnalo (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Montru dosiera informacio" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Ŝargado ..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Kopiu bildon" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Savi bildojn kiel" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Ĉi-tiu dokumento enhavas neniam indekson." -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Paĝo %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Konservu kunsendaĵojn" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Bildoj" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Neniu nomo]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/es.po b/po/es.po index 137d309..83d0de6 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" @@ -18,11 +18,179 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." msgstr "" +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Entrada inválida: '%s'." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Índice invalido: '%s'." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Ningún documento abierto." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Número de argumentos inválido." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Error al crear favorito: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Error al crear favorito: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Favorito actualizado con éxitosamente: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Favorito creado con éxitosamente: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Favorito eliminado: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Error al eliminar el favorito: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "No existe el favorito: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "No hay información disponible." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Demasiados argumentos." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Ningún argumento recibido." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Documento guardado." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Error al guardar el documento." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Número de argumentos inválido." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Escrito fichero adjunto '%s' a '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Escrito fichero adjunto '%s' a '%s'." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Imagen desconocida '%s'." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Adjunto o imagen desconocidos '%s'." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "El argumento ha de ser un número." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Página %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Guardar ficheros adjuntos" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Imágenes" + #. zathura settings #: ../zathura/config.c:144 msgid "Database backend" @@ -316,233 +484,6 @@ msgstr "Destacar los resultados de la búsqueda actual" msgid "Show version information" msgstr "Mostrar versión" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Entrada inválida: '%s'." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Índice invalido: '%s'." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Ningún documento abierto." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Número de argumentos inválido." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Error al crear favorito: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Error al crear favorito: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Favorito actualizado con éxitosamente: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Favorito creado con éxitosamente: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Favorito eliminado: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Error al eliminar el favorito: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "No existe el favorito: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "No hay información disponible." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Demasiados argumentos." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Ningún argumento recibido." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Documento guardado." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Error al guardar el documento." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Número de argumentos inválido." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Escrito fichero adjunto '%s' a '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Escrito fichero adjunto '%s' a '%s'." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Imagen desconocida '%s'." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Adjunto o imagen desconocidos '%s'." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "El argumento ha de ser un número." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Cargando ..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copiar imagen" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Salvar imagen como" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Reasignar a la ventana especificada por xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Ruta al directorio de configuración" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Ruta para el directorio de datos" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Ruta a los directorios que contienen los plugins" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Fork, ejecutándose en background" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Contraseña del documento" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Nivel de log (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Mostrar información del fichero" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Editor de Synctex (reenvíado al commando synctex)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Error al tratar de ejecutar xdg-open" @@ -561,40 +502,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Reasignar a la ventana especificada por xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Ruta al directorio de configuración" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Ruta para el directorio de datos" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Ruta a los directorios que contienen los plugins" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Fork, ejecutándose en background" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Contraseña del documento" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Nivel de log (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Mostrar información del fichero" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Editor de Synctex (reenvíado al commando synctex)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Cargando ..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copiar imagen" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Salvar imagen como" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Este documento no contiene ningún índice" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Página %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Guardar ficheros adjuntos" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Imágenes" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Sin nombre]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/es_CL.po b/po/es_CL.po index 666b423..8bc8ee4 100644 --- a/po/es_CL.po +++ b/po/es_CL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Spanish (Chile) (http://www.transifex.net/projects/p/zathura/" @@ -19,9 +19,177 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Entrada inválida: '%s'." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Índice invalido: '%s'." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Ningún documento abierto." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Número de argumentos inválido." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "No se pudo crear marcador: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "No se pudo crear marcador: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Marcador actualizado exitosamente: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Marcador creado exitosamente: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Marcador eliminado: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Error al eliminar marcador: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "No existe marcador: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "No hay información disponible." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Demasiados argumentos." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Ningún argumento recibido." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Documento guardado." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Error al guardar el documento." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Número de argumentos inválido." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Fichero adjunto escrito '%s' a '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Fichero adjunto escrito '%s' a '%s'." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "El argumento debe ser un número." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Guardar archivos adjuntos" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" msgstr "" #. zathura settings @@ -315,233 +483,6 @@ msgstr "" msgid "Show version information" msgstr "" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Entrada inválida: '%s'." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Índice invalido: '%s'." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Ningún documento abierto." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Número de argumentos inválido." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "No se pudo crear marcador: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "No se pudo crear marcador: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Marcador actualizado exitosamente: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Marcador creado exitosamente: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Marcador eliminado: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Error al eliminar marcador: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "No existe marcador: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "No hay información disponible." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Demasiados argumentos." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Ningún argumento recibido." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Documento guardado." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Error al guardar el documento." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Número de argumentos inválido." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Fichero adjunto escrito '%s' a '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Fichero adjunto escrito '%s' a '%s'." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "El argumento debe ser un número." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Cargando..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copiar imagen" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Reasignar a la ventana especificada por xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Ruta al directorio de configuración" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Ruta al directorio de datos" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Ruta al directorio que contiene plugins" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Ejecución en background" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Nivel de log (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Mostrar información del archivo" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Error al ejecutar xdg-open." @@ -560,40 +501,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Reasignar a la ventana especificada por xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Ruta al directorio de configuración" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Ruta al directorio de datos" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Ruta al directorio que contiene plugins" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Ejecución en background" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Nivel de log (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Mostrar información del archivo" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Cargando..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copiar imagen" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Este document no contiene índice" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Guardar archivos adjuntos" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Sin nombre]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/et.po b/po/et.po index 7510962..53ae129 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: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Estonian (http://www.transifex.net/projects/p/zathura/" @@ -19,9 +19,177 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "" + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "" + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "" + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "" + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "" + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "" + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "" + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "" + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "" + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Salvesta manused" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" msgstr "" #. zathura settings @@ -315,233 +483,6 @@ msgstr "" msgid "Show version information" msgstr "" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "" - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "" - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "" - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "" - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "" - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "" - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "" - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "" - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "" - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "" - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Kopeeri pilt" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Näita faili infot" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "" @@ -560,40 +501,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Näita faili infot" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "" + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Kopeeri pilt" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Salvesta manused" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Nime pole]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/fr.po b/po/fr.po index ff8206f..0e2c7b6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:07+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: French (http://www.transifex.com/projects/p/zathura/language/" @@ -23,10 +23,178 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" -msgstr "Echec d'impression : %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Entrée invalide : '%s'" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Index invalide : '%s'" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Aucun document ouvert." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Nombre d'arguments invalide." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Impossible de créer le marque-page : %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Impossible de créer le marque-page : %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Marque page mis à jour avec succès : %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Marque page créé avec succès : %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Marque page supprimé : %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Échec lors de la suppression du marque-page : %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Aucun marque-page correspondant : %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Titre" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Auteur" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "Sujet" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Mots clé" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "Créateur" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Producteur" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Date de création" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Date de modification" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Aucune information disponible." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Trop d'arguments." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Aucun argument passé." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Document enregistré." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Échec lors de l'enregistrement du document." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Nombre d'arguments invalide." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Impossible d'écrire la pièce jointe '%s' dans '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Pièce jointe '%s' écrite dans '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Image '%s' écrite dans '%s'." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Impossible d'écrire l'image '%s' dans '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Image '%s' inconnue." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Pièce jointe ou image '%s' inconnue." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "L'argument doit être un nombre." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Page %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Pièces jointes" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Images" #. zathura settings #: ../zathura/config.c:144 @@ -321,233 +489,6 @@ msgstr "Surligner les résultats de la recherche en cours" msgid "Show version information" msgstr "Afficher les informations de version" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Entrée invalide : '%s'" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Index invalide : '%s'" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Aucun document ouvert." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Nombre d'arguments invalide." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Impossible de créer le marque-page : %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Impossible de créer le marque-page : %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Marque page mis à jour avec succès : %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Marque page créé avec succès : %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Marque page supprimé : %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Échec lors de la suppression du marque-page : %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Aucun marque-page correspondant : %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Titre" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Auteur" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "Sujet" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Mots clé" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "Créateur" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Producteur" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Date de création" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Date de modification" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Aucune information disponible." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Trop d'arguments." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Aucun argument passé." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Document enregistré." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Échec lors de l'enregistrement du document." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Nombre d'arguments invalide." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Impossible d'écrire la pièce jointe '%s' dans '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Pièce jointe '%s' écrite dans '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Image '%s' écrite dans '%s'." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Impossible d'écrire l'image '%s' dans '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Image '%s' inconnue." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Pièce jointe ou image '%s' inconnue." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "L'argument doit être un nombre." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Chargement..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copier l'image" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Enregistrer l'image sous" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Rattacher à la fenêtre spécifiée par xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Chemin vers le dossier de configuration" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Chemin vers le dossier de données" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Chemin vers le dossier de plugins" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Détacher en arrière-plan" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Mot de passe du document" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "Numéro de page où aller" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Niveau de journalisation (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Afficher les informations de version" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Éditeur synctex (transféré à la commande synctex)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "Démarrer dans un mode non-défaut" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Échec lors du lancement de xdg-open." @@ -566,43 +507,106 @@ msgstr "Lien : %s" msgid "Link: Invalid" msgstr "Lien : Invalide" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Rattacher à la fenêtre spécifiée par xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Chemin vers le dossier de configuration" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Chemin vers le dossier de données" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Chemin vers le dossier de plugins" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Détacher en arrière-plan" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Mot de passe du document" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "Numéro de page où aller" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Niveau de journalisation (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Afficher les informations de version" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Éditeur synctex (transféré à la commande synctex)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "Démarrer dans un mode non-défaut" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Chargement..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copier l'image" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Enregistrer l'image sous" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "Echec d'impression : %s" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Ce document ne contient pas d'index" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Page %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Pièces jointes" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Images" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Sans nom]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Impossible de lire le fichier depuis stdin et de le sauvegarder dans un " "fichier temporaire." -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" "Type de fichier non supporté. Veuillez installer l'extension nécessaire." -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 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 4fcd1f4..8c9cf6a 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: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2014-01-31 09:37+0000\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/zathura/language/" @@ -17,9 +17,177 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "" + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "" + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "" + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "" + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "" + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "" + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "" + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "" + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "" + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" msgstr "" #. zathura settings @@ -313,233 +481,6 @@ msgstr "" msgid "Show version information" msgstr "" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "" - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "" - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "" - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "" - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "" - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "" - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "" - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "" - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "" - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "" - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "" @@ -558,40 +499,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "" + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/hr.po b/po/hr.po index 445c124..166620d 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: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2014-01-31 09:37+0000\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/zathura/" @@ -18,9 +18,177 @@ 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" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "" + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "" + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "" + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "" + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "" + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "" + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "" + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "" + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "" + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" msgstr "" #. zathura settings @@ -314,233 +482,6 @@ msgstr "" msgid "Show version information" msgstr "" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "" - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "" - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "" - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "" - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "" - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "" - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "" - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "" - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "" - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "" - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "" @@ -559,40 +500,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "" + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/id_ID.po b/po/id_ID.po index 1284a9e..bed3af9 100644 --- a/po/id_ID.po +++ b/po/id_ID.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/" @@ -19,11 +19,179 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." msgstr "" +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Masukan '%s' tidak valid" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Index '%s' tidak valid" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Tidak ada dokumen yang terbuka." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "jumlah argumen yang diberikan tidak valid" + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Tidak dapat membuat bookmark: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Tidak dapat membuat bookmark: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "bookmark yang sukses terupdate : %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Bookmark yang sukses dibuat: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Bookmark %s telah sukses dihapus" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Gagal menghapus bookmark: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Tidak ada bookmark: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Judul" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Penulis" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "Subjek" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Kata kunci" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "Pembuat" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Produser" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Tanggal pembuatan" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Tanggal ubahan" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Tidak ada informasi tersedia" + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Argumen terlalu banyak" + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Tidak ada argumen yang diberikan" + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Dokumen telah disimpan" + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Gagal menyimpan dokumen" + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Jumlah argumen tidak valid" + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Tidak dapat menulis lampiran '%s' ke '%s'" + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Tidak dapat menyimpan lampiran '%s' ke '%s'" + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Menulis citra dari '%s' ke '%s'" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Tidak dapat menulis citra '%s' ke %s'" + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Citra tidak diketahui '%s'" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Lampiran atau gambar tidak diketahui '%s'" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Argumen harus berupa angka." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Halaman %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Lampiran" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Citra" + #. zathura settings #: ../zathura/config.c:144 msgid "Database backend" @@ -315,233 +483,6 @@ msgstr "Sorot hasil pencarian sekarang" msgid "Show version information" msgstr "Tunjukan informasi versi" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Masukan '%s' tidak valid" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Index '%s' tidak valid" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Tidak ada dokumen yang terbuka." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "jumlah argumen yang diberikan tidak valid" - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Tidak dapat membuat bookmark: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Tidak dapat membuat bookmark: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "bookmark yang sukses terupdate : %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Bookmark yang sukses dibuat: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Bookmark %s telah sukses dihapus" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Gagal menghapus bookmark: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Tidak ada bookmark: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Judul" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Penulis" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "Subjek" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Kata kunci" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "Pembuat" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Produser" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Tanggal pembuatan" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Tanggal ubahan" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Tidak ada informasi tersedia" - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Argumen terlalu banyak" - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Tidak ada argumen yang diberikan" - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Dokumen telah disimpan" - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Gagal menyimpan dokumen" - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Jumlah argumen tidak valid" - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Tidak dapat menulis lampiran '%s' ke '%s'" - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Tidak dapat menyimpan lampiran '%s' ke '%s'" - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Menulis citra dari '%s' ke '%s'" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Tidak dapat menulis citra '%s' ke %s'" - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Citra tidak diketahui '%s'" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Lampiran atau gambar tidak diketahui '%s'" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Argumen harus berupa angka." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Memuat....." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Salin gambar" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Simpan gambar sebagai" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Mengembalikan jendela sesuai dengan xid yang ditentukan" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Path ke direktori konfigurasi" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Path ke direktori data" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Path ke direktori plugin" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Jalankan pada latar" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Kata sandi dokumen" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "Nomor halaman tujuan" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Tingkat log (debug, info, peringatan, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Cetak informasi versi" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Synctex editor (diteruskan ke perintah synctex)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Gagal menjalankan program xdg-open" @@ -560,41 +501,104 @@ msgstr "Link: %s" msgid "Link: Invalid" msgstr "Link: Tidak valid" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Mengembalikan jendela sesuai dengan xid yang ditentukan" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Path ke direktori konfigurasi" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Path ke direktori data" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Path ke direktori plugin" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Jalankan pada latar" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Kata sandi dokumen" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "Nomor halaman tujuan" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Tingkat log (debug, info, peringatan, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Cetak informasi versi" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Synctex editor (diteruskan ke perintah synctex)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Memuat....." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Salin gambar" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Simpan gambar sebagai" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Dokumen ini tidak mempunyai indeks" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Halaman %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Lampiran" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Citra" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Tidak berjudul]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Tidak dapat membaca berkas dari stdin dan menulisnya ke berkas sementar" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Tipe berkas tidak didukung. Silakan memasang plugin yang dibutuhkan." -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "Dokumen tidak mempunyai laman apapun" diff --git a/po/it.po b/po/it.po index 0aa745c..77e750b 100644 --- a/po/it.po +++ b/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Italian (http://www.transifex.com/projects/p/zathura/language/" @@ -22,10 +22,178 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" -msgstr "Impossibile stampare: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "'%s' non può essere 0. Imposta ad 1." + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Input inserito '%s' non valido." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Indice inserito '%s' non valido." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Nessun documento aperto." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Numero di argomenti errato." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Impossibile creare il segnalibro: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Impossibile creare il segnalibro: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Segnalibro aggiornato con successo: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Segnalibro creato con successo: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Segnalibro rimosso: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Impossibile rimuovere il segnalibro: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Nessun segnalibro corrispondente: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Titolo" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Autore" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "Argomento" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Parole chiave" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "Creato da" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Prodotto da" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Data di creazione" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Data di modifica" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Nessun' informazione disponibile." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Numero di argomenti eccessivo." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Nessun argomento specificato." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Documento salvato." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Impossibile salvare il documento." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Numero di argomenti non valido." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Impossibile salvare l' allegato '%s' in '%s'" + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Allegato '%s' salvato in '%s'" + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Immagine '%s' salvata come '%s'" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Impossibile salvare l' immagine '%s' come '%s'" + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Immagine sconosciuta '%s'" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Immagine o allegato sconosciuti '%s" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "L' argomento dev' essere un numero." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Pagina %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Allegati" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Immagini" #. zathura settings #: ../zathura/config.c:144 @@ -318,233 +486,6 @@ msgstr "Evidenzia i risultati della ricerca in corso" msgid "Show version information" msgstr "Mostra informazioni sulla versione" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "'%s' non può essere 0. Imposta ad 1." - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Input inserito '%s' non valido." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Indice inserito '%s' non valido." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Nessun documento aperto." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Numero di argomenti errato." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Impossibile creare il segnalibro: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Impossibile creare il segnalibro: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Segnalibro aggiornato con successo: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Segnalibro creato con successo: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Segnalibro rimosso: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Impossibile rimuovere il segnalibro: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Nessun segnalibro corrispondente: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Titolo" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Autore" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "Argomento" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Parole chiave" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "Creato da" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Prodotto da" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Data di creazione" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Data di modifica" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Nessun' informazione disponibile." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Numero di argomenti eccessivo." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Nessun argomento specificato." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Documento salvato." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Impossibile salvare il documento." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Numero di argomenti non valido." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Impossibile salvare l' allegato '%s' in '%s'" - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Allegato '%s' salvato in '%s'" - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Immagine '%s' salvata come '%s'" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Impossibile salvare l' immagine '%s' come '%s'" - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Immagine sconosciuta '%s'" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Immagine o allegato sconosciuti '%s" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "L' argomento dev' essere un numero." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Caricamento..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copia immagine" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Salva immagine come" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Percorso della directory della configurazione" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Percorso della directory dei dati" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "Percorso della cartella di cache" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Percorso della directory contenente i plugin" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Crea un processo separato" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Password del documento" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Livello di log (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Mostra le informazioni sul file" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Impossibile eseguire xdg-open." @@ -563,42 +504,105 @@ msgstr "Link: %s" msgid "Link: Invalid" msgstr "Link: non valido" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Percorso della directory della configurazione" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Percorso della directory dei dati" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "Percorso della cartella di cache" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Percorso della directory contenente i plugin" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Crea un processo separato" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Password del documento" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Livello di log (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Mostra le informazioni sul file" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Caricamento..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copia immagine" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Salva immagine come" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "Impossibile stampare: %s" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Questo documento non contiene l' indice" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Pagina %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Allegati" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Immagini" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Nessun nome]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Impossibile leggere il file dall' stdin e scriverlo in un file temporaneo." -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" "Tipo di file non supportato. Per favore, installa il plugin necessario." -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "Il documento non contiene alcuna pagina" diff --git a/po/lt.po b/po/lt.po index e18dce8..3285f03 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/zathura/" @@ -20,11 +20,179 @@ msgstr "" "%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." msgstr "" +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Netinkama įvestis: „%s“." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Duotas netinkamas indeksas: „%s“." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Nėra atidarytų dokumentų." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Duotų parametrų skaičius yra neteisingas." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Žymė negalėjo būti atnaujinta: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Žymė negalėjo būti sukurta: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Žymė sėkmingai atnaujinta: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Žymė sėkmingai sukurta: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Žymė ištrinta: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Žymė negalėjo būti panaikinta: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Nėra tokios žymės: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Pavadinimas" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Autorius" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Raktažodžiai" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Gamintojas" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Sukūrimo data" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Pakeitimo data" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Nėra informacijos." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Per daug parametrų." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Parametrai neduoti." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Dokumentas išsaugotas." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Dokumento išsaugoti nepavyko." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Neteisingas parametrų skaičius." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Priedas „%s“ negalėjo būti įrašytas į „%s“." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Priedas „%s“ įrašytas į „%s“." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Atvaizdas „%s“ įrašytas į „%s“." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Atvaizdas „%s“ negalėjo būti įrašytas į „%s“," + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Nežinomas atvaizdas „%s“." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Nežinomas priedas ar atvaizdas „%s“." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Parametras turi būti skaičius." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "%d puslapis" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Priedai" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Atvaizdai" + #. zathura settings #: ../zathura/config.c:144 msgid "Database backend" @@ -316,233 +484,6 @@ msgstr "Pažymėti dabartinės paieškos rezultatus" msgid "Show version information" msgstr "Rodyti versijos informaciją" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Netinkama įvestis: „%s“." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Duotas netinkamas indeksas: „%s“." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Nėra atidarytų dokumentų." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Duotų parametrų skaičius yra neteisingas." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Žymė negalėjo būti atnaujinta: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Žymė negalėjo būti sukurta: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Žymė sėkmingai atnaujinta: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Žymė sėkmingai sukurta: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Žymė ištrinta: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Žymė negalėjo būti panaikinta: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Nėra tokios žymės: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Pavadinimas" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Autorius" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Raktažodžiai" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Gamintojas" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Sukūrimo data" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Pakeitimo data" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Nėra informacijos." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Per daug parametrų." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Parametrai neduoti." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Dokumentas išsaugotas." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Dokumento išsaugoti nepavyko." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Neteisingas parametrų skaičius." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Priedas „%s“ negalėjo būti įrašytas į „%s“." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Priedas „%s“ įrašytas į „%s“." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Atvaizdas „%s“ įrašytas į „%s“." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Atvaizdas „%s“ negalėjo būti įrašytas į „%s“," - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Nežinomas atvaizdas „%s“." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Nežinomas priedas ar atvaizdas „%s“." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Parametras turi būti skaičius." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Kraunama..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Kopijuoti atvaizdą" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Irašyti atvaizdą kaip" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Konfigūracinių failų aplanko adresas" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Duomenų aplanko adresas" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Įskiepių aplanko adresas" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Dokumento slaptažodis" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "Pereiti į puslapį" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Registravimo lygis (derinimas, informacija, įspėjimai, klaidos)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Spausdinti versijos informaciją" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Synctex redaktorius (naudojama synctex komandoje)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Klaida xdg-open paleidime." @@ -561,40 +502,103 @@ msgstr "Nuoroda: %s" msgid "Link: Invalid" msgstr "Neteisinga nuoroda" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Konfigūracinių failų aplanko adresas" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Duomenų aplanko adresas" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Įskiepių aplanko adresas" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Dokumento slaptažodis" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "Pereiti į puslapį" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Registravimo lygis (derinimas, informacija, įspėjimai, klaidos)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Spausdinti versijos informaciją" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Synctex redaktorius (naudojama synctex komandoje)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Kraunama..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Kopijuoti atvaizdą" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Irašyti atvaizdą kaip" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Šit dokumentas neturi turinio" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "%d puslapis" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Priedai" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Atvaizdai" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Bevardis]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Bylos tipas nepalaikomas. Įdiekite tam skirtus įskiepius." -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "Dokumente puslapių nėra" diff --git a/po/no.po b/po/no.po index 1af3853..772f1be 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Norwegian (http://www.transifex.com/projects/p/zathura/" @@ -19,10 +19,178 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" -msgstr "Utskrift feilet: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Ugyldig inndata '%s' gitt." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Ugyldig index '%s' gitt." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Ingen dokumenter åpnet." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Ugyldig nummer av argumenter gitt." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Kunne ikke oppdatere bokmerke: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Kunne ikke lage bokmerke: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Bokmerke er oppdatert: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Bokmerket er laget: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Fjernet bokmerke: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Kunne ikke fjerne bokmerke: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Bokmerke eksisterer ikke: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Tittel" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Forfatter" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "Subjekt" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Nøkkelord" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "Laget av" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Produsent" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Laget dato" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Modifisert dato" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Ingen informasjon tilgjengelig." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "For mange argumenter." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Ingen argumenter gitt." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Dokumentet er lagret." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Kunne ikke lagre dokumentet." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Ugyldig nummer av argumenter." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Kunne ikke skrive vedlegg '%s' til '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Skrev vedlegg '%s' til '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Skrev bilde '%s' til '%s'." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Kunne ikke skrive bilde '%s' til '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Ukjent bilde '%s'." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Ukjent vedlegg eller bilde '%s'." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Argumentet må være et tall." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Side %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Vedlegg" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Bilder" #. zathura settings #: ../zathura/config.c:144 @@ -315,233 +483,6 @@ msgstr "Uthev følgende søkeresultater" msgid "Show version information" msgstr "Vis versjonsinformasjon" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Ugyldig inndata '%s' gitt." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Ugyldig index '%s' gitt." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Ingen dokumenter åpnet." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Ugyldig nummer av argumenter gitt." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Kunne ikke oppdatere bokmerke: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Kunne ikke lage bokmerke: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Bokmerke er oppdatert: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Bokmerket er laget: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Fjernet bokmerke: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Kunne ikke fjerne bokmerke: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Bokmerke eksisterer ikke: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Tittel" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Forfatter" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "Subjekt" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Nøkkelord" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "Laget av" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Produsent" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Laget dato" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Modifisert dato" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Ingen informasjon tilgjengelig." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "For mange argumenter." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Ingen argumenter gitt." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Dokumentet er lagret." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Kunne ikke lagre dokumentet." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Ugyldig nummer av argumenter." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Kunne ikke skrive vedlegg '%s' til '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Skrev vedlegg '%s' til '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Skrev bilde '%s' til '%s'." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Kunne ikke skrive bilde '%s' til '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Ukjent bilde '%s'." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Ukjent vedlegg eller bilde '%s'." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Argumentet må være et tall." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Laster..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Kopier bilde" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Lagre bilde som" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Sti til konfigureringsmappe" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Sti til data-mappe" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Sti til mapper som inneholder plugins" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Dokument passord" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "Sidetall å gå til" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Logg nivå (diagnostisering, info, advarsler, feil)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Skriv ut versjonsinformasjon" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "Start i ikke-standard modus" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Klarte ikke å kjøre xdg-open." @@ -560,40 +501,104 @@ msgstr "" msgid "Link: Invalid" msgstr "Link: Ugyldig" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Sti til konfigureringsmappe" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Sti til data-mappe" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Sti til mapper som inneholder plugins" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Dokument passord" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "Sidetall å gå til" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Logg nivå (diagnostisering, info, advarsler, feil)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Skriv ut versjonsinformasjon" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "Start i ikke-standard modus" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Laster..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Kopier bilde" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Lagre bilde som" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "Utskrift feilet: %s" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Dette dokumenetet inneholder ikke noen index" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Side %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Vedlegg" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Bilder" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Inget navn]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "Kunne ikke lese fil fra stdin og skrive til temporærfil." -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +#, fuzzy +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "Kunne ikke lese fil fra stdin og skrive til temporærfil." + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Usupportert filtype. Vennligst innstaller den nødvendige pluginen." -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "Dokumentet inneholder ingen sider" diff --git a/po/pl.po b/po/pl.po index 6ba5ab9..03669b3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Polish (http://www.transifex.com/projects/p/zathura/language/" @@ -21,10 +21,178 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" -msgstr "Nie można wydrukować: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Nieprawidłowy argument: %s" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Nieprawidłowy indeks: %s" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Nie otwarto żadnego pliku" + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Nieprawidłowa liczba parametrów polecenia" + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Nie można stworzyć zakładki: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Nie można stworzyć zakładki: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Zaktualizowano zakładkę: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Utworzono zakładkę: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Usunięto zakładkę: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Nie można usunąć zakładki: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Nie znaleziono zakładki: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Tytuł" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Autor" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "Temat" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Słowa kluczowe" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "Twórca" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Producent" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Data utworzenia" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Data modyfikacji" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Brak informacji o pliku" + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Za dużo parametrów polecenia" + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Nie podano parametrów polecenia" + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Zapisano dokument" + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Błąd zapisu" + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Niewłaściwa liczba parametrów polecenia" + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Nie można dodać załącznika %s do pliku %s" + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Zapisano załącznik %s do pliku %s" + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Obrazek %s zapisano do pliku %s" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Nie można dodać obrazka %s do pliku %s" + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Nieznany obrazek '%s'." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Nieznany załącznik lub obrazek '%s'." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Parametr polecenia musi być liczbą" + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Strona %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Załączniki" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Obrazki" #. zathura settings #: ../zathura/config.c:144 @@ -317,233 +485,6 @@ msgstr "Podświetl aktualne wyniki wyszukiwania" msgid "Show version information" msgstr "Wyświetl informacje o wersji" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Nieprawidłowy argument: %s" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Nieprawidłowy indeks: %s" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Nie otwarto żadnego pliku" - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Nieprawidłowa liczba parametrów polecenia" - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Nie można stworzyć zakładki: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Nie można stworzyć zakładki: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Zaktualizowano zakładkę: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Utworzono zakładkę: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Usunięto zakładkę: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Nie można usunąć zakładki: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Nie znaleziono zakładki: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Tytuł" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Autor" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "Temat" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Słowa kluczowe" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "Twórca" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Producent" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Data utworzenia" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Data modyfikacji" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Brak informacji o pliku" - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Za dużo parametrów polecenia" - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Nie podano parametrów polecenia" - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Zapisano dokument" - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Błąd zapisu" - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Niewłaściwa liczba parametrów polecenia" - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Nie można dodać załącznika %s do pliku %s" - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Zapisano załącznik %s do pliku %s" - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Obrazek %s zapisano do pliku %s" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Nie można dodać obrazka %s do pliku %s" - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Nieznany obrazek '%s'." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Nieznany załącznik lub obrazek '%s'." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Parametr polecenia musi być liczbą" - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Wczytywanie pliku..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Skopiuj obrazek" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Zapisz obrazek jako" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Przypisz proces do rodzica o danym xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Położenie katalogu konfiguracyjnego" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Położenie katalogu danych" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Położenie katalogu wtyczek" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Forkuj w tle" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Hasło dokumentu" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Szczegółowość komunikatów (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Wyświetl informacje o wersji" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Edytor synctex (przekierowanie do komendy synctex)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Wystąpił problem z uruchomieniem xdg-open" @@ -562,40 +503,103 @@ msgstr "Link: %s" msgid "Link: Invalid" msgstr "Nieprawidłowy link" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Przypisz proces do rodzica o danym xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Położenie katalogu konfiguracyjnego" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Położenie katalogu danych" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Położenie katalogu wtyczek" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Forkuj w tle" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Hasło dokumentu" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Szczegółowość komunikatów (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Wyświetl informacje o wersji" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Edytor synctex (przekierowanie do komendy synctex)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Wczytywanie pliku..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Skopiuj obrazek" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Zapisz obrazek jako" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "Nie można wydrukować: %s" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Dokument nie zawiera indeksu" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Strona %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Załączniki" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Obrazki" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[bez nazwy]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Niewspierany rodzaj pliku. Zainstaluj wymagane wtyczki" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "Dokument nie zawiera żadnej strony" diff --git a/po/pt_BR.po b/po/pt_BR.po index 28d9c75..79f008e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" @@ -19,10 +19,178 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" -msgstr "Impressão falhou: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Dados de entrada inválida '%s' ." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Dados de índice invalido '%s'." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Nenhum documento aberto." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Número de argumentos dados inválidos." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Não foi possível criar favorito: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Não foi possível criar favorito: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Favorito atualizado com sucesso: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Favorito criado com sucesso: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Favorito removido: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Falha ao remover favorito: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Não há favoritos: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Título" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Autor" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "Assunto" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Palavras-chave" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "Criador" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Produtor" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Data de criação" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Data de modificação" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Nenhuma informação disponível." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Muitos argumentos." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Nenhum argumento dado." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Documento salvo." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Falha ao salvar o documento." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Número de argumento invalido." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Não foi possível gravar anexo '%s' para '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Escreveu anexo '%s' para '%s'." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Escreveu imagem '%s' para '%s'." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Não foi possível gravar imagem '%s' para '%s'." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Imagem desconhecida '%s'." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Anexo desconhecido ou imagem '%s'." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "O argumento deve ser um número." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Página %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Anexos" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Imagens" #. zathura settings #: ../zathura/config.c:144 @@ -318,233 +486,6 @@ msgstr "Destacar resultado de busca atual" msgid "Show version information" msgstr "Mostrar informações sobre a versão" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Dados de entrada inválida '%s' ." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Dados de índice invalido '%s'." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Nenhum documento aberto." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Número de argumentos dados inválidos." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Não foi possível criar favorito: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Não foi possível criar favorito: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Favorito atualizado com sucesso: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Favorito criado com sucesso: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Favorito removido: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Falha ao remover favorito: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Não há favoritos: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Título" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Autor" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "Assunto" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Palavras-chave" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "Criador" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Produtor" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Data de criação" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Data de modificação" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Nenhuma informação disponível." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Muitos argumentos." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Nenhum argumento dado." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Documento salvo." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Falha ao salvar o documento." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Número de argumento invalido." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Não foi possível gravar anexo '%s' para '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Escreveu anexo '%s' para '%s'." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Escreveu imagem '%s' para '%s'." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Não foi possível gravar imagem '%s' para '%s'." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Imagem desconhecida '%s'." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Anexo desconhecido ou imagem '%s'." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "O argumento deve ser um número." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Carregando..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Copiar imagem" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Salvar imagem para" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Reparar a janela especificada por xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Caminho de diretório para configuração" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Caminho para diretório de dados" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Caminho de diretório que contenham plugins" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Deslocar no fundo" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Senha do documento" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "Número da página para ir" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Nível de log (depurar, informação, aviso, erro)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Imprimir informações sobre a versão" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Editor synctex (encaminhado para o comando synctex)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "Mover para determinada posição synctex" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "Destacar determinada posição no determinado processo" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "Começar em um modo não padrão" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Falha ao executar xdg-open." @@ -563,43 +504,106 @@ msgstr "Link: %s" msgid "Link: Invalid" msgstr "Link: Inválido" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Reparar a janela especificada por xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Caminho de diretório para configuração" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Caminho para diretório de dados" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Caminho de diretório que contenham plugins" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Deslocar no fundo" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Senha do documento" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "Número da página para ir" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Nível de log (depurar, informação, aviso, erro)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Imprimir informações sobre a versão" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Editor synctex (encaminhado para o comando synctex)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "Mover para determinada posição synctex" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "Destacar determinada posição no determinado processo" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "Começar em um modo não padrão" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Carregando..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Copiar imagem" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Salvar imagem para" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "Impressão falhou: %s" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Este documento não contem qualquer índice" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Página %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Anexos" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Imagens" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Sem nome]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Não foi possível ler o arquivo a partir de stdin e gravá-lo em um arquivo " "temporário." -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" "Formato de arquivo não suportado. Por favor, instale o plugin necessário." -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 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 eaf90e3..f65fe4b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:06+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Russian (http://www.transifex.com/projects/p/zathura/language/" @@ -23,10 +23,178 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" -msgstr "Не удалось напечатать %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Неправильный ввод: %s." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Получен неверный индекс: %s." + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Нет открытых документов." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Указано неверное число аргументов." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Не могу создать закладку %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Не удалось создать закладку %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Закладка %s успешно обновлена" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Закладка %s успешно создана" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Закладка %s удалена" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Не удалось удалить закладку %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Закладки %s не существует" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "Заголовок" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "Автор" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "Тема" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "Ключевые слова" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "Создатель" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "Производитель" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "Время создания" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "Время изменения" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Нет доступной информации." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Слишком много аргументов." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Отсутствуют аргументы." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Документ сохранён." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Не удалось сохранить документ." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Неверное количество аргументов." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Не удалось сохранить приложенный файл «%s» в «%s»." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Файл «%s» сохранён в «%s»." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "Изображение «%s» сохранено в «%s»." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "Не удалось записать изображение «%s» в «%s»." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Неизвестное изображение «%s»." + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Неизвестное вложение или изображение «%s»." + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Аргумент должен быть числом." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Страница %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Прикреплённые файлы" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Изображения" #. zathura settings #: ../zathura/config.c:144 @@ -319,233 +487,6 @@ msgstr "Подсветить результаты текущего поиска" msgid "Show version information" msgstr "Показать информацию о версии файла" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Неправильный ввод: %s." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Получен неверный индекс: %s." - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Нет открытых документов." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Указано неверное число аргументов." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Не могу создать закладку %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Не удалось создать закладку %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Закладка %s успешно обновлена" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Закладка %s успешно создана" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Закладка %s удалена" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Не удалось удалить закладку %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Закладки %s не существует" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "Заголовок" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "Автор" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "Тема" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "Ключевые слова" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "Создатель" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "Производитель" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "Время создания" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "Время изменения" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Нет доступной информации." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Слишком много аргументов." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Отсутствуют аргументы." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Документ сохранён." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Не удалось сохранить документ." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Неверное количество аргументов." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Не удалось сохранить приложенный файл «%s» в «%s»." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Файл «%s» сохранён в «%s»." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "Изображение «%s» сохранено в «%s»." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "Не удалось записать изображение «%s» в «%s»." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Неизвестное изображение «%s»." - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Неизвестное вложение или изображение «%s»." - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Аргумент должен быть числом." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Загрузка..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Скопировать изображение" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Сохранить изображение как" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Сменить материнское окно на окно, указанное в xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Путь к каталогу с настройкой" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Путь к каталогу с данными" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Путь к каталогу с плагинами" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Запустить в фоне" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Пароль документа" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "Перейти к странице номер" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Уровень журналирования (debug, info, warning, error)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Показать информацию о файле" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "Редактор для synctex (передаётся далее программе synctex)" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "Перейти к указанному положению synctex" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "Подсветка заданного положения в заданном процессе" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "Запустить в специальном режиме" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Не удалось запустить xdg-open" @@ -564,42 +505,105 @@ msgstr "Ссылка: %s" msgid "Link: Invalid" msgstr "Ссылка: неправильная" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Сменить материнское окно на окно, указанное в xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Путь к каталогу с настройкой" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Путь к каталогу с данными" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Путь к каталогу с плагинами" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Запустить в фоне" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Пароль документа" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "Перейти к странице номер" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Уровень журналирования (debug, info, warning, error)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Показать информацию о файле" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "Редактор для synctex (передаётся далее программе synctex)" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "Перейти к указанному положению synctex" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "Подсветка заданного положения в заданном процессе" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "Запустить в специальном режиме" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Загрузка..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Скопировать изображение" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Сохранить изображение как" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "Не удалось напечатать %s" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "В документе нет индекса" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Страница %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Прикреплённые файлы" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Изображения" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Без названия]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" "Не удалось прочитать файл со стандартного входа и записать его во временный " "файл." -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "Тип файла не поддерживается. Установите соответствующий плагин." -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "В документе нет страниц" diff --git a/po/ta_IN.po b/po/ta_IN.po index 91fd152..48e1085 100644 --- a/po/ta_IN.po +++ b/po/ta_IN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2014-01-31 09:37+0000\n" "Last-Translator: mankand007 \n" "Language-Team: Tamil (India) (http://www.transifex.net/projects/p/zathura/" @@ -18,9 +18,177 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "கொடுக்கப்பட்ட உள்ளீடு(input) '%s' தவறு" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "கொடுக்கப்பட்ட index '%s' தவறு" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "எந்தக் ஆவணமும் திறக்கப்படவில்லை" + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "கொடுக்கப்பட்ட arguments-களின் எண்ணிக்கை தவறு" + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Bookmark-ஐ உருவாக்க முடியவில்லை: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Bookmark-ஐ உருவாக்க முடியவில்லை: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Bookmark வெற்றிகரமாக நிகழ்நிலை(update) படுத்தப்பட்டது: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Bookmark வெற்றிகரமாக உருவாக்கப்பட்டது: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Bookmark அழிக்கப்பட்டது: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Bookmark-ஐ அழிக்க இயலவில்லை: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "அந்தப் பெயரில் எந்த bookmark-ம் இல்லை: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "எந்தத் தகவலும் இல்லை" + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Argumentகளின் எண்ணிக்கை மிகவும் அதிகம்" + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "எந்த argument-ம் தரப்படவில்லை" + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "கோப்பு சேமிக்கப்பட்டது" + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "ஆவணத்தை சேமிக்க இயலவில்லை" + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "கொடுக்கப்பட்ட argument-களின் எண்ணிக்கை தவறு" + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Argument ஒரு எண்ணாக இருக்க வேண்டும்" + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "இணைப்புகளைச் சேமிக்கவும்" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" msgstr "" #. zathura settings @@ -314,233 +482,6 @@ msgstr "" msgid "Show version information" msgstr "" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "கொடுக்கப்பட்ட உள்ளீடு(input) '%s' தவறு" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "கொடுக்கப்பட்ட index '%s' தவறு" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "எந்தக் ஆவணமும் திறக்கப்படவில்லை" - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "கொடுக்கப்பட்ட arguments-களின் எண்ணிக்கை தவறு" - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Bookmark-ஐ உருவாக்க முடியவில்லை: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Bookmark-ஐ உருவாக்க முடியவில்லை: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Bookmark வெற்றிகரமாக நிகழ்நிலை(update) படுத்தப்பட்டது: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Bookmark வெற்றிகரமாக உருவாக்கப்பட்டது: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Bookmark அழிக்கப்பட்டது: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Bookmark-ஐ அழிக்க இயலவில்லை: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "அந்தப் பெயரில் எந்த bookmark-ம் இல்லை: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "எந்தத் தகவலும் இல்லை" - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Argumentகளின் எண்ணிக்கை மிகவும் அதிகம்" - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "எந்த argument-ம் தரப்படவில்லை" - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "கோப்பு சேமிக்கப்பட்டது" - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "ஆவணத்தை சேமிக்க இயலவில்லை" - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "கொடுக்கப்பட்ட argument-களின் எண்ணிக்கை தவறு" - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Argument ஒரு எண்ணாக இருக்க வேண்டும்" - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "" - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "படத்தை ஒரு பிரதியெடு" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "ஆவணம் பற்றிய தகவல்களைக் காட்டு" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "xdg-open-ஐ இயக்க முடியவில்லை" @@ -559,40 +500,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "ஆவணம் பற்றிய தகவல்களைக் காட்டு" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "" + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "படத்தை ஒரு பிரதியெடு" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "இந்த ஆவணத்தில் எந்த index-ம் இல்லை" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "இணைப்புகளைச் சேமிக்கவும்" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "பெயரற்ற ஆவணம்" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/tr.po b/po/tr.po index 68d2636..2f1a841 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:05+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Turkish (http://www.transifex.net/projects/p/zathura/language/" @@ -20,11 +20,179 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." msgstr "" +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Hatalı girdi '%s'" + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Hatalı dizin '%s'" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Açık belge yok." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Yanlış sayıda argüman" + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Yer imi yaratılamadı: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Yer imi yaratılamadı: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Yer imi başarıyla güncellendi: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Yer imi yaratıldı: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Yer imi silindi: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Yer imi silinemedi: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Böyle bir yer imi yok: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Bilgi mevcut değil." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Çok fazla sayıda argüman." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Argüman verilmedi." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Belge kaydedildi." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Belge kaydedilemedi." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Yanlış sayıda argüman." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "'%s' eki '%s' konumuna yazılamadı." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "'%s' eki '%s' konumuna yazıldı." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "'%s' eki '%s' konumuna yazıldı." + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "'%s' eki '%s' konumuna yazılamadı." + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "Tanınmayan resim dosyası '%s'" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "Tanınmayan eklenti veya resim dosyası '%s'" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Argüman bir sayı olmalı." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "Sayfa %d" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "Ekleri kaydet" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" +msgstr "Resimler" + #. zathura settings #: ../zathura/config.c:144 msgid "Database backend" @@ -316,233 +484,6 @@ msgstr "Şuanki arama sonuçlarını vurgula" msgid "Show version information" msgstr "Versiyon bilgisi göster" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Hatalı girdi '%s'" - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Hatalı dizin '%s'" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Açık belge yok." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Yanlış sayıda argüman" - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Yer imi yaratılamadı: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Yer imi yaratılamadı: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Yer imi başarıyla güncellendi: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Yer imi yaratıldı: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Yer imi silindi: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Yer imi silinemedi: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Böyle bir yer imi yok: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Bilgi mevcut değil." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Çok fazla sayıda argüman." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Argüman verilmedi." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Belge kaydedildi." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Belge kaydedilemedi." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Yanlış sayıda argüman." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "'%s' eki '%s' konumuna yazılamadı." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "'%s' eki '%s' konumuna yazıldı." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "'%s' eki '%s' konumuna yazıldı." - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "'%s' eki '%s' konumuna yazılamadı." - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "Tanınmayan resim dosyası '%s'" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "Tanınmayan eklenti veya resim dosyası '%s'" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Argüman bir sayı olmalı." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "Yüklüyor ..." - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Resim kopyala" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "Resmi farklı kaydet" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Xid tarafından belirlendiği gibi bir üst seviye pencereye bağlı" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Ayar dizini adresi" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Veri dizini adresi" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Eklentileri içeren dizinin adresi" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Arka planda işlemden çocuk oluştur" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "Belge şifresi" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Kayıt seviyesi (hata ayıklama, bilgi, uyarı, hata)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Dosya bilgisi göster" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "xdg-open çalıştırılamadı" @@ -561,40 +502,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Xid tarafından belirlendiği gibi bir üst seviye pencereye bağlı" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Ayar dizini adresi" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Veri dizini adresi" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Eklentileri içeren dizinin adresi" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Arka planda işlemden çocuk oluştur" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "Belge şifresi" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Kayıt seviyesi (hata ayıklama, bilgi, uyarı, hata)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Dosya bilgisi göster" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "Yüklüyor ..." + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Resim kopyala" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "Resmi farklı kaydet" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Bu belge fihrist içermiyor" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "Sayfa %d" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "Ekleri kaydet" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "Resimler" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[İsimsiz]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" diff --git a/po/uk_UA.po b/po/uk_UA.po index de3e94f..df236d4 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zathura\n" "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n" -"POT-Creation-Date: 2015-10-15 23:03+0200\n" +"POT-Creation-Date: 2015-12-14 22:03+0100\n" "PO-Revision-Date: 2015-10-15 23:05+0200\n" "Last-Translator: Sebastian Ramacher \n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/" @@ -20,9 +20,177 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.8.5\n" -#: ../zathura/print.c:64 ../zathura/print.c:211 +#: ../zathura/callbacks.c:233 #, c-format -msgid "Printing failed: %s" +msgid "'%s' must not be 0. Set to 1." +msgstr "" + +#: ../zathura/callbacks.c:315 +#, c-format +msgid "Invalid input '%s' given." +msgstr "Вказано невірний аргумент: %s." + +#: ../zathura/callbacks.c:351 +#, c-format +msgid "Invalid index '%s' given." +msgstr "Вказано невірний індекс: %s" + +#: ../zathura/callbacks.c:594 +#, c-format +msgid "Copied selected text to selection %s: %s" +msgstr "" + +#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 +#: ../zathura/commands.c:152 ../zathura/commands.c:268 +#: ../zathura/commands.c:298 ../zathura/commands.c:324 +#: ../zathura/commands.c:423 ../zathura/commands.c:550 +#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216 +#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272 +msgid "No document opened." +msgstr "Документ не відкрито." + +#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 +#: ../zathura/commands.c:428 +msgid "Invalid number of arguments given." +msgstr "Вказана невірна кількість аргументів." + +#: ../zathura/commands.c:53 +#, c-format +msgid "Could not update bookmark: %s" +msgstr "Не можу створити закладку: %s" + +#: ../zathura/commands.c:55 +#, c-format +msgid "Could not create bookmark: %s" +msgstr "Не можу створити закладку: %s" + +#: ../zathura/commands.c:60 +#, c-format +msgid "Bookmark successfully updated: %s" +msgstr "Закладку вдало поновлено: %s" + +#: ../zathura/commands.c:62 +#, c-format +msgid "Bookmark successfully created: %s" +msgstr "Закладку створено вдало: %s" + +#: ../zathura/commands.c:88 +#, c-format +msgid "Removed bookmark: %s" +msgstr "Закладку видалено: %s" + +#: ../zathura/commands.c:90 +#, c-format +msgid "Failed to remove bookmark: %s" +msgstr "Видалення закладки невдалося: %s" + +#: ../zathura/commands.c:116 +#, c-format +msgid "No such bookmark: %s" +msgstr "Такої закладки немає: %s" + +#: ../zathura/commands.c:162 +msgid "Title" +msgstr "" + +#: ../zathura/commands.c:163 +msgid "Author" +msgstr "" + +#: ../zathura/commands.c:164 +msgid "Subject" +msgstr "" + +#: ../zathura/commands.c:165 +msgid "Keywords" +msgstr "" + +#: ../zathura/commands.c:166 +msgid "Creator" +msgstr "" + +#: ../zathura/commands.c:167 +msgid "Producer" +msgstr "" + +#: ../zathura/commands.c:168 +msgid "Creation date" +msgstr "" + +#: ../zathura/commands.c:169 +msgid "Modification date" +msgstr "" + +#: ../zathura/commands.c:174 ../zathura/commands.c:196 +msgid "No information available." +msgstr "Інформація недоступна." + +#: ../zathura/commands.c:234 +msgid "Too many arguments." +msgstr "Забагато аргументів." + +#: ../zathura/commands.c:245 +msgid "No arguments given." +msgstr "Жодного аргументу не вказано." + +#: ../zathura/commands.c:304 ../zathura/commands.c:330 +msgid "Document saved." +msgstr "Документ збережено." + +#: ../zathura/commands.c:306 ../zathura/commands.c:332 +msgid "Failed to save document." +msgstr "Документ не вдалося зберегти." + +#: ../zathura/commands.c:309 ../zathura/commands.c:335 +msgid "Invalid number of arguments." +msgstr "Невірна кількість аргументів." + +#: ../zathura/commands.c:447 +#, c-format +msgid "Couldn't write attachment '%s' to '%s'." +msgstr "Неможливо записати прикріплення '%s' до '%s'." + +#: ../zathura/commands.c:449 +#, c-format +msgid "Wrote attachment '%s' to '%s'." +msgstr "Прикріплення записано %s до %s." + +#: ../zathura/commands.c:493 +#, c-format +msgid "Wrote image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:495 +#, c-format +msgid "Couldn't write image '%s' to '%s'." +msgstr "" + +#: ../zathura/commands.c:502 +#, c-format +msgid "Unknown image '%s'." +msgstr "" + +#: ../zathura/commands.c:506 +#, c-format +msgid "Unknown attachment or image '%s'." +msgstr "" + +#: ../zathura/commands.c:563 +msgid "Argument must be a number." +msgstr "Аргумент повинен бути цифрою." + +#: ../zathura/completion.c:285 +#, c-format +msgid "Page %d" +msgstr "" + +#: ../zathura/completion.c:328 +msgid "Attachments" +msgstr "" + +#. add images +#: ../zathura/completion.c:359 +msgid "Images" msgstr "" #. zathura settings @@ -316,233 +484,6 @@ msgstr "" msgid "Show version information" msgstr "" -#: ../zathura/callbacks.c:233 -#, c-format -msgid "'%s' must not be 0. Set to 1." -msgstr "" - -#: ../zathura/callbacks.c:310 -#, c-format -msgid "Invalid input '%s' given." -msgstr "Вказано невірний аргумент: %s." - -#: ../zathura/callbacks.c:346 -#, c-format -msgid "Invalid index '%s' given." -msgstr "Вказано невірний індекс: %s" - -#: ../zathura/callbacks.c:588 -#, c-format -msgid "Copied selected text to selection %s: %s" -msgstr "" - -#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103 -#: ../zathura/commands.c:152 ../zathura/commands.c:268 -#: ../zathura/commands.c:298 ../zathura/commands.c:324 -#: ../zathura/commands.c:423 ../zathura/commands.c:550 -#: ../zathura/shortcuts.c:417 ../zathura/shortcuts.c:1227 -#: ../zathura/shortcuts.c:1257 ../zathura/shortcuts.c:1284 -msgid "No document opened." -msgstr "Документ не відкрито." - -#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109 -#: ../zathura/commands.c:428 -msgid "Invalid number of arguments given." -msgstr "Вказана невірна кількість аргументів." - -#: ../zathura/commands.c:53 -#, c-format -msgid "Could not update bookmark: %s" -msgstr "Не можу створити закладку: %s" - -#: ../zathura/commands.c:55 -#, c-format -msgid "Could not create bookmark: %s" -msgstr "Не можу створити закладку: %s" - -#: ../zathura/commands.c:60 -#, c-format -msgid "Bookmark successfully updated: %s" -msgstr "Закладку вдало поновлено: %s" - -#: ../zathura/commands.c:62 -#, c-format -msgid "Bookmark successfully created: %s" -msgstr "Закладку створено вдало: %s" - -#: ../zathura/commands.c:88 -#, c-format -msgid "Removed bookmark: %s" -msgstr "Закладку видалено: %s" - -#: ../zathura/commands.c:90 -#, c-format -msgid "Failed to remove bookmark: %s" -msgstr "Видалення закладки невдалося: %s" - -#: ../zathura/commands.c:116 -#, c-format -msgid "No such bookmark: %s" -msgstr "Такої закладки немає: %s" - -#: ../zathura/commands.c:162 -msgid "Title" -msgstr "" - -#: ../zathura/commands.c:163 -msgid "Author" -msgstr "" - -#: ../zathura/commands.c:164 -msgid "Subject" -msgstr "" - -#: ../zathura/commands.c:165 -msgid "Keywords" -msgstr "" - -#: ../zathura/commands.c:166 -msgid "Creator" -msgstr "" - -#: ../zathura/commands.c:167 -msgid "Producer" -msgstr "" - -#: ../zathura/commands.c:168 -msgid "Creation date" -msgstr "" - -#: ../zathura/commands.c:169 -msgid "Modification date" -msgstr "" - -#: ../zathura/commands.c:174 ../zathura/commands.c:196 -msgid "No information available." -msgstr "Інформація недоступна." - -#: ../zathura/commands.c:234 -msgid "Too many arguments." -msgstr "Забагато аргументів." - -#: ../zathura/commands.c:245 -msgid "No arguments given." -msgstr "Жодного аргументу не вказано." - -#: ../zathura/commands.c:304 ../zathura/commands.c:330 -msgid "Document saved." -msgstr "Документ збережено." - -#: ../zathura/commands.c:306 ../zathura/commands.c:332 -msgid "Failed to save document." -msgstr "Документ не вдалося зберегти." - -#: ../zathura/commands.c:309 ../zathura/commands.c:335 -msgid "Invalid number of arguments." -msgstr "Невірна кількість аргументів." - -#: ../zathura/commands.c:447 -#, c-format -msgid "Couldn't write attachment '%s' to '%s'." -msgstr "Неможливо записати прикріплення '%s' до '%s'." - -#: ../zathura/commands.c:449 -#, c-format -msgid "Wrote attachment '%s' to '%s'." -msgstr "Прикріплення записано %s до %s." - -#: ../zathura/commands.c:493 -#, c-format -msgid "Wrote image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:495 -#, c-format -msgid "Couldn't write image '%s' to '%s'." -msgstr "" - -#: ../zathura/commands.c:502 -#, c-format -msgid "Unknown image '%s'." -msgstr "" - -#: ../zathura/commands.c:506 -#, c-format -msgid "Unknown attachment or image '%s'." -msgstr "" - -#: ../zathura/commands.c:563 -msgid "Argument must be a number." -msgstr "Аргумент повинен бути цифрою." - -#: ../zathura/page-widget.c:561 -msgid "Loading..." -msgstr "" - -#: ../zathura/page-widget.c:1006 -msgid "Copy image" -msgstr "Копіювати картинку" - -#: ../zathura/page-widget.c:1007 -msgid "Save image as" -msgstr "" - -#: ../zathura/main.c:60 -msgid "Reparents to window specified by xid" -msgstr "Вертатися до вікна, вказаного xid" - -#: ../zathura/main.c:62 -msgid "Path to the config directory" -msgstr "Шлях до теки конфігурації" - -#: ../zathura/main.c:63 -msgid "Path to the data directory" -msgstr "Шлях до теки з даними" - -#: ../zathura/main.c:64 -msgid "Path to the cache directory" -msgstr "" - -#: ../zathura/main.c:65 -msgid "Path to the directories containing plugins" -msgstr "Шлях до теки з плаґінами" - -#: ../zathura/main.c:66 -msgid "Fork into the background" -msgstr "Працювати у фоні" - -#: ../zathura/main.c:67 -msgid "Document password" -msgstr "" - -#: ../zathura/main.c:68 -msgid "Page number to go to" -msgstr "" - -#: ../zathura/main.c:69 -msgid "Log level (debug, info, warning, error)" -msgstr "Рівень логування (налагодження, інфо, застереження, помилка)" - -#: ../zathura/main.c:70 -msgid "Print version information" -msgstr "Показати інформацію файлу" - -#: ../zathura/main.c:72 -msgid "Synctex editor (forwarded to the synctex command)" -msgstr "" - -#: ../zathura/main.c:73 -msgid "Move to given synctex position" -msgstr "" - -#: ../zathura/main.c:74 -msgid "Highlight given position in the given process" -msgstr "" - -#: ../zathura/main.c:76 -msgid "Start in a non-default mode" -msgstr "" - #: ../zathura/links.c:203 ../zathura/links.c:282 msgid "Failed to run xdg-open." msgstr "Запуск xdg-open не вдався." @@ -561,40 +502,103 @@ msgstr "" msgid "Link: Invalid" msgstr "" -#: ../zathura/shortcuts.c:1137 +#: ../zathura/main.c:155 +msgid "Reparents to window specified by xid" +msgstr "Вертатися до вікна, вказаного xid" + +#: ../zathura/main.c:157 +msgid "Path to the config directory" +msgstr "Шлях до теки конфігурації" + +#: ../zathura/main.c:158 +msgid "Path to the data directory" +msgstr "Шлях до теки з даними" + +#: ../zathura/main.c:159 +msgid "Path to the cache directory" +msgstr "" + +#: ../zathura/main.c:160 +msgid "Path to the directories containing plugins" +msgstr "Шлях до теки з плаґінами" + +#: ../zathura/main.c:161 +msgid "Fork into the background" +msgstr "Працювати у фоні" + +#: ../zathura/main.c:162 +msgid "Document password" +msgstr "" + +#: ../zathura/main.c:163 +msgid "Page number to go to" +msgstr "" + +#: ../zathura/main.c:164 +msgid "Log level (debug, info, warning, error)" +msgstr "Рівень логування (налагодження, інфо, застереження, помилка)" + +#: ../zathura/main.c:165 +msgid "Print version information" +msgstr "Показати інформацію файлу" + +#: ../zathura/main.c:167 +msgid "Synctex editor (forwarded to the synctex command)" +msgstr "" + +#: ../zathura/main.c:168 +msgid "Move to given synctex position" +msgstr "" + +#: ../zathura/main.c:169 +msgid "Highlight given position in the given process" +msgstr "" + +#: ../zathura/main.c:171 +msgid "Start in a non-default mode" +msgstr "" + +#: ../zathura/page-widget.c:561 +msgid "Loading..." +msgstr "" + +#: ../zathura/page-widget.c:1006 +msgid "Copy image" +msgstr "Копіювати картинку" + +#: ../zathura/page-widget.c:1007 +msgid "Save image as" +msgstr "" + +#: ../zathura/print.c:64 ../zathura/print.c:209 +#, c-format +msgid "Printing failed: %s" +msgstr "" + +#: ../zathura/shortcuts.c:1126 msgid "This document does not contain any index" msgstr "Індекс відсутній в цьому документі" -#: ../zathura/completion.c:285 -#, c-format -msgid "Page %d" -msgstr "" - -#: ../zathura/completion.c:328 -msgid "Attachments" -msgstr "" - -#. add images -#: ../zathura/completion.c:359 -msgid "Images" -msgstr "" - -#: ../zathura/zathura.c:206 ../zathura/zathura.c:1129 +#: ../zathura/zathura.c:218 ../zathura/zathura.c:1224 msgid "[No name]" msgstr "[Без назви]" -#: ../zathura/zathura.c:520 +#: ../zathura/zathura.c:578 msgid "Could not read file from stdin and write it to a temporary file." msgstr "" -#: ../zathura/zathura.c:604 +#: ../zathura/zathura.c:594 +msgid "Could not read file from GIO and copy it to a temporary file." +msgstr "" + +#: ../zathura/zathura.c:683 msgid "Enter password:" msgstr "" -#: ../zathura/zathura.c:639 +#: ../zathura/zathura.c:719 msgid "Unsupported file type. Please install the necessary plugin." msgstr "" -#: ../zathura/zathura.c:649 +#: ../zathura/zathura.c:731 msgid "Document does not contain any pages" msgstr "" From f16e93d6c07267a5628c9790c7ca6ca491f9b50e Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 14 Dec 2015 22:23:42 +0100 Subject: [PATCH 89/94] Remove fuzzy translation --- po/no.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/no.po b/po/no.po index 772f1be..2c42c35 100644 --- a/po/no.po +++ b/po/no.po @@ -587,9 +587,8 @@ msgid "Could not read file from stdin and write it to a temporary file." msgstr "Kunne ikke lese fil fra stdin og skrive til temporærfil." #: ../zathura/zathura.c:594 -#, fuzzy msgid "Could not read file from GIO and copy it to a temporary file." -msgstr "Kunne ikke lese fil fra stdin og skrive til temporærfil." +msgstr "" #: ../zathura/zathura.c:683 msgid "Enter password:" From 5afde94e3db0f9faaeb31fa7bfc4c01cf89c0afa Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 21 Dec 2015 02:01:48 +0100 Subject: [PATCH 90/94] Manipulating data directly requires to call flush and mark_dirty See documentation of cairo_image_surface_get_data. Signed-off-by: Sebastian Ramacher --- zathura/render.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zathura/render.c b/zathura/render.c index 21841e4..cd3be04 100644 --- a/zathura/render.c +++ b/zathura/render.c @@ -596,6 +596,8 @@ recolor(private_t* priv, zathura_page_t* page, unsigned int page_width, * same effect. */ + cairo_surface_flush(surface); + const int rowstride = cairo_image_surface_get_stride(surface); unsigned char* image = cairo_image_surface_get_data(surface); @@ -713,6 +715,8 @@ recolor(private_t* priv, zathura_page_t* page, unsigned int page_width, girara_list_free(rectangles); } + cairo_surface_mark_dirty(surface); + #undef rgb1 #undef rgb2 } From f240bdb93cf2c495ba68c2cc0997692f25f17b50 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 21 Dec 2015 02:22:05 +0100 Subject: [PATCH 91/94] Divide by 255 Signed-off-by: Sebastian Ramacher --- zathura/render.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zathura/render.c b/zathura/render.c index cd3be04..7217183 100644 --- a/zathura/render.c +++ b/zathura/render.c @@ -665,9 +665,9 @@ recolor(private_t* priv, zathura_page_t* page, unsigned int page_width, /* Careful. data color components blue, green, red. */ const double rgb[3] = { - (double) data[2] / 256., - (double) data[1] / 256., - (double) data[0] / 256. + data[2] / 255., + data[1] / 255., + data[0] / 255. }; /* compute h, s, l data */ From 6f6e8ea94e3f6e409efbfc1802a3f4872d85e7f0 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 21 Dec 2015 02:23:27 +0100 Subject: [PATCH 92/94] Check errors of cairo_image_surface_create properly Signed-off-by: Sebastian Ramacher --- zathura/print.c | 5 +++++ zathura/render.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/zathura/print.c b/zathura/print.c index ccd06c4..d144cfb 100644 --- a/zathura/print.c +++ b/zathura/print.c @@ -130,6 +130,11 @@ cb_print_draw_page(GtkPrintOperation* print_operation, GtkPrintContext* gtk_print_operation_cancel(print_operation); return; } + if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) { + gtk_print_operation_cancel(print_operation); + cairo_surface_destroy(surface); + return; + } cairo_t* temp_cairo = cairo_create(surface); if (cairo == NULL) { diff --git a/zathura/render.c b/zathura/render.c index 7217183..f18ceb4 100644 --- a/zathura/render.c +++ b/zathura/render.c @@ -746,6 +746,10 @@ render(render_job_t* job, ZathuraRenderRequest* request, ZathuraRenderer* render if (surface == NULL) { return false; } + if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) { + cairo_surface_destroy(surface); + return false; + } cairo_t* cairo = cairo_create(surface); if (cairo == NULL) { From 601fb84048df40d6a28d9725f5846667f62ba13a Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Mon, 21 Dec 2015 03:06:54 +0100 Subject: [PATCH 93/94] Split cb_print_draw_page Signed-off-by: Sebastian Ramacher --- zathura/print.c | 129 +++++++++++++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 56 deletions(-) diff --git a/zathura/print.c b/zathura/print.c index d144cfb..a31df9e 100644 --- a/zathura/print.c +++ b/zathura/print.c @@ -84,6 +84,77 @@ cb_print_end(GtkPrintOperation* UNUSED(print_operation), GtkPrintContext* g_free(file_path); } +static bool +draw_page_cairo(cairo_t* cairo, zathura_t* zathura, zathura_page_t* page) +{ + /* Try to render the page without a temporary surface. This only works with + * plugins that support rendering to any surface. */ + zathura_renderer_lock(zathura->sync.render_thread); + const int err = zathura_page_render(page, cairo, true); + zathura_renderer_unlock(zathura->sync.render_thread); + + return err == ZATHURA_ERROR_OK; +} + +static bool +draw_page_image(cairo_t* cairo, GtkPrintContext* context, zathura_t* zathura, + zathura_page_t* page) +{ + /* Try to render the page on a temporary image surface. */ + const double width = gtk_print_context_get_width(context); + const double height = gtk_print_context_get_height(context); + + const double scale_height = 5; + const double scale_width = 5; + + /* Render to a surface that is 5 times larger to workaround quality issues. */ + const double page_height = zathura_page_get_height(page) * scale_height; + const double page_width = zathura_page_get_width(page) * scale_width; + cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, page_width, page_height); + if (surface == NULL) { + return false; + } + if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) { + cairo_surface_destroy(surface); + return false; + } + + cairo_t* temp_cairo = cairo_create(surface); + if (cairo == NULL) { + cairo_surface_destroy(surface); + return false; + } + + /* Draw a white background. */ + cairo_save(temp_cairo); + cairo_set_source_rgb(temp_cairo, 1, 1, 1); + cairo_rectangle(temp_cairo, 0, 0, page_width, page_height); + cairo_fill(temp_cairo); + cairo_restore(temp_cairo); + + /* Render the page to the temporary surface */ + zathura_renderer_lock(zathura->sync.render_thread); + const int err = zathura_page_render(page, temp_cairo, true); + zathura_renderer_unlock(zathura->sync.render_thread); + if (err != ZATHURA_ERROR_OK) { + cairo_destroy(temp_cairo); + cairo_surface_destroy(surface); + return false; + } + + /* Rescale the page and keep the aspect ratio */ + const gdouble scale = MIN(width / page_width, height / page_height); + cairo_scale(cairo, scale, scale); + + /* Blit temporary surface to original cairo object. */ + cairo_set_source_surface(cairo, surface, 0.0, 0.0); + cairo_paint(cairo); + cairo_destroy(temp_cairo); + cairo_surface_destroy(surface); + + return true; +} + static void cb_print_draw_page(GtkPrintOperation* print_operation, GtkPrintContext* context, gint page_number, zathura_t* zathura) @@ -108,69 +179,15 @@ cb_print_draw_page(GtkPrintOperation* print_operation, GtkPrintContext* return; } - /* Try to render the page without a temporary surface. This only works with - * plugins that support rendering to any surface. */ girara_debug("printing page %d ...", page_number); - zathura_renderer_lock(zathura->sync.render_thread); - int err = zathura_page_render(page, cairo, true); - zathura_renderer_unlock(zathura->sync.render_thread); - if (err == ZATHURA_ERROR_OK) { + if (draw_page_cairo(cairo, zathura, page) == true) { return; } - /* Try to render the page on a temporary image surface. */ - const gdouble width = gtk_print_context_get_width(context); - const gdouble height = gtk_print_context_get_height(context); - - /* Render to a surface that is 5 times larger to workaround quality issues. */ - const double page_height = zathura_page_get_height(page) * 5; - const double page_width = zathura_page_get_width(page) * 5; - cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, page_width, page_height); - if (surface == NULL) { - gtk_print_operation_cancel(print_operation); - return; - } - if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) { - gtk_print_operation_cancel(print_operation); - cairo_surface_destroy(surface); - return; - } - - cairo_t* temp_cairo = cairo_create(surface); - if (cairo == NULL) { - gtk_print_operation_cancel(print_operation); - cairo_surface_destroy(surface); - return; - } - - /* Draw a white background. */ - cairo_save(temp_cairo); - cairo_set_source_rgb(temp_cairo, 1, 1, 1); - cairo_rectangle(temp_cairo, 0, 0, page_width, page_height); - cairo_fill(temp_cairo); - cairo_restore(temp_cairo); - - /* Render the page to the temporary surface */ girara_debug("printing page %d (fallback) ...", page_number); - zathura_renderer_lock(zathura->sync.render_thread); - err = zathura_page_render(page, temp_cairo, true); - zathura_renderer_unlock(zathura->sync.render_thread); - if (err != ZATHURA_ERROR_OK) { - cairo_destroy(temp_cairo); - cairo_surface_destroy(surface); + if (draw_page_image(cairo, context, zathura, page) == false) { gtk_print_operation_cancel(print_operation); - return; } - - /* Rescale the page and keep the aspect ratio */ - const gdouble scale = MIN(width / page_width, height / page_height); - cairo_scale(cairo, scale, scale); - - /* Blit temporary surface to original cairo object. */ - cairo_set_source_surface(cairo, surface, 0.0, 0.0); - cairo_paint(cairo); - cairo_destroy(temp_cairo); - cairo_surface_destroy(surface); } static void From ae20f729e287283f31537edbb35aaeac1e016f4f Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Mon, 21 Dec 2015 11:19:06 +0100 Subject: [PATCH 94/94] Version 0.3.4 --- config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index 3b90908..96c4009 100644 --- a/config.mk +++ b/config.mk @@ -6,7 +6,7 @@ PROJECT = zathura ZATHURA_VERSION_MAJOR = 0 ZATHURA_VERSION_MINOR = 3 -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. @@ -18,7 +18,7 @@ VERSION = ${ZATHURA_VERSION_MAJOR}.${ZATHURA_VERSION_MINOR}.${ZATHURA_VERSION_RE # girara GIRARA_VERSION_CHECK ?= 1 -GIRARA_MIN_VERSION = 0.2.4 +GIRARA_MIN_VERSION = 0.2.5 GIRARA_PKG_CONFIG_NAME = girara-gtk3 # glib GLIB_VERSION_CHECK ?= 1