Plugins-Commits February 2018

plugins-commits@lists.geany.org

1 participants
37 discussions

[geany/geany-plugins] 089786: pohelper: Fix locating line breaks
by Colomban Wendling 19 Feb '18

19 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 19 Feb 2018 04:17:27 UTC Commit: 089786be21422e25c5122d86e0b8b98ffb36798c https://github.com/geany/geany-plugins/commit/089786be21422e25c5122d86e0b8b… Log Message: ----------- pohelper: Fix locating line breaks Properly handle escape sequences when looking for a line break. This fixes handling of "\\n", e.g. escaped line breaks. Modified Paths: -------------- pohelper/src/gph-plugin.c Modified: pohelper/src/gph-plugin.c 17 lines changed, 16 insertions(+), 1 deletions(-) =================================================================== @@ -858,6 +858,21 @@ get_msgid_text_at (GeanyDocument *doc, return NULL; } +static const gchar * +find_line_break (const gchar *str) +{ + for (; *str; str++) { + if (*str == '\\') { + if (str[1] == 'n') + return str; + else if (str[1]) + str++; + } + } + + return NULL; +} + /* cuts @str in human-readable chunks for max @len. * cuts first at \n, then at spaces and punctuation */ static gchar ** @@ -870,7 +885,7 @@ split_msg (const gchar *str, GString *chunk = g_string_sized_new (len); while (*str) { - const gchar *nl = strstr (str, "\\n"); + const gchar *nl = find_line_break (str); const gchar *p = strpbrk (str, " \t\v\r\n?!,.;:-"); glong chunk_len = g_utf8_strlen (chunk->str, (gssize) chunk->len); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 2fb4dd: pohelper: Consider dash a separator when rewrapping messages
by Colomban Wendling 19 Feb '18

19 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 19 Feb 2018 04:06:36 UTC Commit: 2fb4dd080ad9cd521f9b5d981c517314fd3c6b7c https://github.com/geany/geany-plugins/commit/2fb4dd080ad9cd521f9b5d981c517… Log Message: ----------- pohelper: Consider dash a separator when rewrapping messages Modified Paths: -------------- pohelper/src/gph-plugin.c Modified: pohelper/src/gph-plugin.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -871,7 +871,7 @@ split_msg (const gchar *str, while (*str) { const gchar *nl = strstr (str, "\\n"); - const gchar *p = strpbrk (str, " \t\v\r\n?!,.;:"); + const gchar *p = strpbrk (str, " \t\v\r\n?!,.;:-"); glong chunk_len = g_utf8_strlen (chunk->str, (gssize) chunk->len); if (nl) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e1175d: pohelper: Do not leave spaces at the start of a line when rewrapping
by Colomban Wendling 19 Feb '18

19 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 19 Feb 2018 04:06:36 UTC Commit: e1175d4c0e32f9b76e0f440abd9e657369d405eb https://github.com/geany/geany-plugins/commit/e1175d4c0e32f9b76e0f440abd9e6… Log Message: ----------- pohelper: Do not leave spaces at the start of a line when rewrapping Modified Paths: -------------- pohelper/src/gph-plugin.c Modified: pohelper/src/gph-plugin.c 10 lines changed, 7 insertions(+), 3 deletions(-) =================================================================== @@ -877,10 +877,14 @@ split_msg (const gchar *str, if (nl) nl += 2; - if (p) - p++; - else /* if there is no separator, use the end of the string */ + if (! p) /* if there is no separator, use the end of the string */ p = strchr (str, 0); + else { + p++; + /* try not to leave a space at the start of a chunk */ + while (*p == ' ') + p++; + } if (nl && ((gsize)(chunk_len + g_utf8_strlen (str, nl - str)) <= len || (nl len == 0))) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 22bccb: Update of Spanish translation
by Frank Lanitz 18 Feb '18

18 Feb '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 18 Feb 2018 09:35:28 UTC Commit: 22bccb7b15ae0c55e0cb63e018425fef7408b6ea https://github.com/geany/geany-plugins/commit/22bccb7b15ae0c55e0cb63e018425… Log Message: ----------- Update of Spanish translation Modified Paths: -------------- NEWS po/es.po Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,7 @@ Geany Plugins 1.33 (not yet released) * Renamed "folder" to "sub-directory" (PR #678) Internationalization: - * Updated translations: de, fr + * Updated translations: de, es, fr Geany Plugins 1.32 (2017-11-19) Modified: po/es.po 56 lines changed, 24 insertions(+), 32 deletions(-) =================================================================== @@ -1,24 +1,24 @@ # translation of es.po to # Spanish translation for geany-plugins -# Copyright (C) 2009 - 2017 Lucas Vieites +# Copyright (C) 2009 - 2018 Lucas Vieites # This file is distributed under the same license as the geany-plugins package. # Andrew Janke <a.janke(a)gmail.com>, 2009 -# Lucas Vieites <lucas(a)codexion.com>, 2009 - 2017. +# Lucas Vieites <lucas(a)codexion.com>, 2009 - 2018. # msgid "" msgstr "" -"Project-Id-Version: Geany-Plugins 1.32\n" +"Project-Id-Version: Geany-Plugins 1.33\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-11 17:41+0100\n" -"PO-Revision-Date: 2017-11-08 11:26+0100\n" -"Last-Translator: Lucas Vieites <lucas(a)codexion.com>\n" +"POT-Creation-Date: 2018-02-14 03:19+0000\n" +"PO-Revision-Date: 2018-02-14 11:02+0100\n" +"Last-Translator: Lucas Vieites Fariña <lucas(a)codexion.com>\n" "Language-Team: Español <geany-i18n(a)uvena.de>\n" "Language: es\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" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Geany 1.32\n" #: ../addons/src/ao_bookmarklist.c:190 msgid "(Empty Line)" @@ -289,11 +289,11 @@ msgstr "" #: ../addons/src/addons.c:664 msgid "Show a calltip when hovering over a color value" -msgstr "" +msgstr "Mostrar una ayuda emergente al pasar por encima de un valor de color" #: ../addons/src/addons.c:670 msgid "Open Color Chooser when double-clicking a color value" -msgstr "" +msgstr "Abrir el selector de colores al pulsar dos veces sobre un valor de color" #: ../autoclose/src/autoclose.c:49 msgid "Auto-close" @@ -2628,15 +2628,14 @@ msgid "Insert BibTeX reference dialog" msgstr "Diálogo insertar referencia BibTeX" #: ../latex/src/latex.c:2064 -#, fuzzy msgid "" "LaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" "Please report all bugs or feature requests to one of the authors." msgstr "" -"GeanyLaTeX es un complemento para mejorar el soporte de LaTeX en Geany.\n" +"LaTeX es un complemento para mejorar el apoyo de LaTeX en Geany.\n" "\n" -"Por favor, notifique todos los fallos o características deseadas a " +"Notifique todos los fallos o características deseadas a " "cualquiera de los autores." #: ../latex/src/latex.c:2102 @@ -7243,15 +7242,16 @@ msgid "_Directory to look for dictionary files:" msgstr "_Directorio en el que buscar archivos de diccionario:" #: ../spellcheck/src/scplugin.c:361 -#, fuzzy msgid "" "Read additional dictionary files from this directory. For now, this only " "works with hunspell dictionaries. With Enchant 2.0 or later, the " "dictionaries are searched in a subfolder called \"hunspell\". See the " "plugin's Help for details." msgstr "" "Leer archivos de diccionario adicionales de este directorio. Por ahora " -"solamente funciona con diccionarios de myspell." +"solamente funciona con diccionarios hunspell. Con Enchant 2.0 o posterior" +"se buscarán los diccionarios en una subcarpeta llamafa \"hunspell\"." +"Para más información consulte la Ayuda del complemento." #: ../spellcheck/src/scplugin.c:394 msgid "Behavior" @@ -7937,12 +7937,10 @@ msgid "Windows" msgstr "Ventanas" #: ../workbench/src/dialogs.c:45 -#, fuzzy msgid "Create new file" -msgstr "Crear archivo _nuevo" +msgstr "Crear archivo nuevo" #: ../workbench/src/dialogs.c:80 -#, fuzzy msgid "Create new directory" msgstr "Crear directorio nuevo" @@ -8028,9 +8026,8 @@ msgid "Workbench settings" msgstr "Configuración del área de trabajo" #: ../workbench/src/dialogs.c:432 -#, fuzzy msgid "_Rescan all projects on open" -msgstr "Explorar todos los proyectos al abrir:" +msgstr "Volve_r a explorar todos los proyectos al abrir" #: ../workbench/src/dialogs.c:435 msgid "" @@ -8104,12 +8101,13 @@ msgid "Could not add project file: %s" msgstr "No se ha podido añadir el archivo de proyecto: %s." #: ../workbench/src/popup_menu.c:559 -#, fuzzy, c-format msgid "" "Could not create new file \"%s\":\n" "\n" "%s" -msgstr "No se ha podido crear el archivo de área de trabajo nuevo: %s" +msgstr "No se ha podido crear el archivo de área de trabajo nuevo: «%s»:\n" +"\n" +"%s" #: ../workbench/src/popup_menu.c:616 msgid "_Add project..." @@ -8164,14 +8162,12 @@ msgid "_Close all files in directory" msgstr "_Cerrar todos los archivos en el directorio" #: ../workbench/src/popup_menu.c:702 -#, fuzzy msgid "_Open all files in sub-directory" -msgstr "Abrir t_odos los archivos en el directorio" +msgstr "Abrir t_odos los archivos en el subdirectorio" #: ../workbench/src/popup_menu.c:708 -#, fuzzy msgid "_Close all files in sub-directory" -msgstr "_Cerrar todos los archivos en el directorio" +msgstr "_Cerrar todos los archivos en el subdirectorio" #: ../workbench/src/popup_menu.c:718 msgid "_Expand all" @@ -8194,14 +8190,12 @@ msgid "_Remove from Bookmarks" msgstr "Elimina_r de marcadores" #: ../workbench/src/popup_menu.c:756 -#, fuzzy msgid "_Create file here..." -msgstr "Crear archivo _nuevo" +msgstr "_Crear archivo aquí..." #: ../workbench/src/popup_menu.c:762 -#, fuzzy msgid "_Create directory here..." -msgstr "Crear directorio nuevo" +msgstr "_Crear directorio aqui..." #: ../workbench/src/sidebar.c:320 msgid "Base dir" @@ -8217,7 +8211,6 @@ msgid "No workbench opened." msgstr "No hay área de trabajo abierta." #: ../workbench/src/sidebar.c:628 -#, fuzzy, c-format msgid "%s: %u Project" msgid_plural "%s: %u Projects" msgstr[0] "%s: %u Proyectos" @@ -8271,9 +8264,8 @@ msgid "Ignored File Patterns:" msgstr "Patrones de directorios ignorados:" #: ../workbench/src/wb_project.c:982 -#, fuzzy, c-format msgid "Number of Sub-Directories: %u\n" -msgstr "Número de directorios: %u\n" +msgstr "Número de subdirectorios: %u\n" #: ../workbench/src/wb_project.c:983 #, c-format -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] b2183b: workbench: support live update. Closes #659.
by LarsDW223 17 Feb '18

17 Feb '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Sat, 17 Feb 2018 17:33:10 UTC Commit: b2183bd9b1407a348e543f06b25debab873c5e0e https://github.com/geany/geany-plugins/commit/b2183bd9b1407a348e543f06b25de… Log Message: ----------- workbench: support live update. Closes #659. With this PR the workbench file list and sidebar will automatically be updated if a file is created, removed or renamed. The feature uses the file monitoring from the GIO lib to monitor directories. If required, the feature can be disabled in the workbench settings dialog. Modified Paths: -------------- workbench/README workbench/src/Makefile.am workbench/src/dialogs.c workbench/src/menu.c workbench/src/plugin_main.c workbench/src/popup_menu.c workbench/src/sidebar.c workbench/src/sidebar.h workbench/src/wb_monitor.c workbench/src/wb_monitor.h workbench/src/wb_project.c workbench/src/wb_project.h workbench/src/workbench.c workbench/src/workbench.h Modified: workbench/README 31 lines changed, 29 insertions(+), 2 deletions(-) =================================================================== @@ -53,8 +53,8 @@ related settings is done using the context menu on the sidebar. Some items in the context menu will only be active if you right click inside a project, directory or bookmark. -The Workbench context menu: ---------------------------- +The Workbench context menu +-------------------------- These are the available items: @@ -141,6 +141,33 @@ These are the available items: Select this item to create a new directory at the current selected position in the file tree. Available since version 1.02 of the workbench plugin. +The Workbench settings +---------------------- +The following settings exist for a workbench: + +**Rescan all projects on open** + If the option is activated (default), then all projects will be re-scanned + on opening of a workbench. + +**Enable live update** + If the option is activated (default), then the list of files and the sidebar + will be updated automatically if a file or directory is created, removed or renamed. + A manual re-scan is not required if the option is enabled. This feature is available + since version 1.03 of the workbench plugin. If you open a workbench file + which has been created with an older version of the workbench plugin + then the option will be added with value "activated". + +Live update +----------- +From version 1.03 on the workbench plugin supports an automatic live update +of the file list and the sidebar. + +This feature will only work if your system supports directory file monitoring. +If the workbench plugin cannot setup file monitoring for a directory then it +will output a message in the message window. The message has the following form:: + + Could not setup file monitoring for directory: "exampledir". Error: <some error message> + Known issues ============ Modified: workbench/src/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,8 @@ workbench_la_SOURCES = \ workbench.c \ wb_project.h \ wb_project.c \ + wb_monitor.h \ + wb_monitor.c \ dialogs.h \ dialogs.c \ menu.h \ Modified: workbench/src/dialogs.c 18 lines changed, 17 insertions(+), 1 deletions(-) =================================================================== @@ -407,11 +407,12 @@ gboolean dialogs_directory_settings(WB_PROJECT_DIR *directory) gboolean dialogs_workbench_settings(WORKBENCH *workbench) { gint result; - GtkWidget *w_rescan_projects_on_open; + GtkWidget *w_rescan_projects_on_open, *w_enable_live_update; GtkWidget *dialog, *content_area; GtkWidget *vbox, *hbox, *table; GtkDialogFlags flags; gboolean changed, rescan_projects_on_open, rescan_projects_on_open_old; + gboolean enable_live_update, enable_live_update_old; /* Create the widgets */ flags = GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT; @@ -437,6 +438,15 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) rescan_projects_on_open_old = workbench_get_rescan_projects_on_open(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_rescan_projects_on_open), rescan_projects_on_open_old); + w_enable_live_update = gtk_check_button_new_with_mnemonic(_("_Enable live update")); + ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); + gtk_widget_set_tooltip_text(w_enable_live_update, + _("If the option is activated (default), then the list of files and the sidebar" + " will be updated automatically if a file or directory is created, removed or renamed." + "A manual re-scan is not required if the option is enabled.")); + enable_live_update_old = workbench_get_enable_live_update(workbench); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_live_update), enable_live_update_old); + gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 6); hbox = gtk_hbox_new(FALSE, 0); @@ -456,6 +466,12 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) changed = TRUE; workbench_set_rescan_projects_on_open(workbench, rescan_projects_on_open); } + enable_live_update = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w_enable_live_update)); + if (enable_live_update != enable_live_update_old) + { + changed = TRUE; + workbench_set_enable_live_update(workbench, enable_live_update); + } } gtk_widget_destroy(dialog); Modified: workbench/src/menu.c 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -148,9 +148,27 @@ static void item_workbench_settings_activate_cb(G_GNUC_UNUSED GtkMenuItem *menui { if (wb_globals.opened_wb != NULL) { + gboolean enable_live_update_old, enable_live_update; + + enable_live_update_old = workbench_get_enable_live_update(wb_globals.opened_wb); if (dialogs_workbench_settings(wb_globals.opened_wb)) { sidebar_update(SIDEBAR_CONTEXT_WB_SETTINGS_CHANGED, NULL); + + enable_live_update = workbench_get_enable_live_update(wb_globals.opened_wb); + if (enable_live_update != enable_live_update_old) + { + if (enable_live_update == TRUE) + { + /* Start/create all file monitors. */ + workbench_enable_live_update(wb_globals.opened_wb); + } + else + { + /* Stop/free all file monitors. */ + workbench_disable_live_update(wb_globals.opened_wb); + } + } } } } Modified: workbench/src/plugin_main.c 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -46,7 +46,8 @@ static void plugin_workbench_on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNU project = workbench_file_is_included(wb_globals.opened_wb, doc->file_name); if (project != NULL) { - wb_project_remove_single_tm_file(project, doc->file_name); + wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID_REMOVE_SINGLE_TM_FILE, + project, g_strdup(doc->file_name)); } } @@ -69,7 +70,8 @@ static void plugin_workbench_on_doc_close(G_GNUC_UNUSED GObject * obj, GeanyDocu project = workbench_file_is_included(wb_globals.opened_wb, doc->file_name); if (project != NULL) { - wb_project_add_single_tm_file(project, doc->file_name); + wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID_ADD_SINGLE_TM_FILE, + project, g_strdup(doc->file_name)); } } @@ -128,7 +130,7 @@ void geany_load_module(GeanyPlugin *plugin) /* Set metadata */ plugin->info->name = _("Workbench"); plugin->info->description = _("Manage and customize multiple projects."); - plugin->info->version = "1.02"; + plugin->info->version = "1.03"; plugin->info->author = "LarsGit223"; /* Set functions */ Modified: workbench/src/popup_menu.c 20 lines changed, 16 insertions(+), 4 deletions(-) =================================================================== @@ -561,8 +561,15 @@ static void popup_menu_on_new_file(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_U else { fclose(new_file); - wb_project_dir_rescan(context.project, context.directory); - sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_RESCANNED, &context); + + if (workbench_get_enable_live_update(wb_globals.opened_wb) == FALSE) + { + /* Live update is disabled. We need to update the file list and + the sidebar manually. */ + wb_project_dir_rescan(context.project, context.directory); + sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_RESCANNED, &context); + } + document_open_file(filename, FALSE, NULL, NULL); } } @@ -595,8 +602,13 @@ static void popup_menu_on_new_directory(G_GNUC_UNUSED GtkMenuItem *menuitem, G_G filename = dialogs_create_new_directory(abs_path); if (filename != NULL) { - wb_project_dir_rescan(context.project, context.directory); - sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_RESCANNED, &context); + if (workbench_get_enable_live_update(wb_globals.opened_wb) == FALSE) + { + /* Live update is disabled. We need to update the file list and + the sidebar manually. */ + wb_project_dir_rescan(context.project, context.directory); + sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_RESCANNED, &context); + } } g_free(abs_path); Modified: workbench/src/sidebar.c 374 lines changed, 362 insertions(+), 12 deletions(-) =================================================================== @@ -33,18 +33,6 @@ #include "popup_menu.h" #include "utils.h" -enum -{ - DATA_ID_UNSET = 0, - DATA_ID_WB_BOOKMARK, - DATA_ID_PROJECT, - DATA_ID_PRJ_BOOKMARK, - DATA_ID_DIRECTORY, - DATA_ID_NO_DIRS, - DATA_ID_SUB_DIRECTORY, - DATA_ID_FILE, -}; - enum { FILEVIEW_COLUMN_ICON, @@ -61,12 +49,29 @@ typedef enum MATCH_PATTERN } MatchType; +typedef struct +{ + gboolean iter_valid; + GtkTreeIter iter; + gboolean parent_valid; + GtkTreeIter parent; +}ITER_SEARCH_RESULT; + typedef struct { GeanyProject *project; GPtrArray *expanded_paths; } ExpandData; +typedef struct +{ + SIDEBAR_CONTEXT *context; + GtkTreeModel *model; + guint dataid; + void (*func)(SIDEBAR_CONTEXT *, gpointer userdata); + gpointer userdata; +}SB_CALLFOREACH_CONTEXT; + typedef struct SIDEBAR { GtkWidget *file_view_vbox; @@ -76,6 +81,9 @@ typedef struct SIDEBAR }SIDEBAR; static SIDEBAR sidebar = {NULL, NULL, NULL, NULL}; +static gboolean sidebar_get_directory_iter(WB_PROJECT *prj, WB_PROJECT_DIR *dir, GtkTreeIter *iter); +static gboolean sidebar_get_filepath_iter (WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath, ITER_SEARCH_RESULT *result); + /* Remove all child nodes below parent */ static void sidebar_remove_children(GtkTreeIter *parent) { @@ -363,6 +371,104 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter } +/* Add a file to the sidebar. filepath can be a file or directory. */ +static void sidebar_add_file (WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) +{ + GIcon *icon = NULL; + gchar *name; + guint dataid; + ITER_SEARCH_RESULT search_result; + + if (!sidebar_get_filepath_iter(prj, root, filepath, &search_result)) + { + return; + } + else + { + if (search_result.iter_valid) + { + /* Error, file already exists in sidebar tree. */ + return; + } + else + { + /* This is the expected result as we want to add a new file node. + But parent should be valid. */ + if (!search_result.parent_valid) + { + return; + } + } + } + + /* Collect data */ + name = g_path_get_basename(filepath); + if (g_file_test (filepath, G_FILE_TEST_IS_DIR)) + { + dataid = DATA_ID_SUB_DIRECTORY; + icon = g_icon_new_for_string("folder", NULL); + } + else + { + dataid = DATA_ID_FILE; + + gchar *content_type = g_content_type_guess(filepath, NULL, 0, NULL); + if (content_type) + { + icon = g_content_type_get_icon(content_type); + if (icon) + { + GtkIconInfo *icon_info; + + icon_info = gtk_icon_theme_lookup_by_gicon(gtk_icon_theme_get_default(), icon, 16, 0); + if (!icon_info) + { + g_object_unref(icon); + icon = NULL; + } + else + gtk_icon_info_free(icon_info); + } + g_free(content_type); + } + + } + + /* Create new row/node in sidebar tree. */ + gtk_tree_store_insert_with_values(sidebar.file_store, &search_result.iter, &search_result.parent, -1, + FILEVIEW_COLUMN_ICON, icon, + FILEVIEW_COLUMN_NAME, name, + FILEVIEW_COLUMN_DATA_ID, dataid, + FILEVIEW_COLUMN_ASSIGNED_DATA_POINTER, g_strdup(filepath), + -1); + + if (icon) + { + g_object_unref(icon); + } +} + + +/* Remove a file from the sidebar. filepath can be a file or directory. */ +static void sidebar_remove_file (WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) +{ + ITER_SEARCH_RESULT search_result; + + if (!sidebar_get_filepath_iter(prj, root, filepath, &search_result)) + { + return; + } + else + { + if (search_result.iter_valid) + { + /* File was found, remove the node. */ + gtk_tree_store_remove(sidebar.file_store, &search_result.iter); + } + } +} + + /* Get the GtkTreeIter for project prj */ static gboolean sidebar_get_project_iter(WB_PROJECT *prj, GtkTreeIter *iter) { @@ -386,6 +492,140 @@ static gboolean sidebar_get_project_iter(WB_PROJECT *prj, GtkTreeIter *iter) } +/* Get the GtkTreeIter for directory dir in project prj */ +static gboolean sidebar_get_directory_iter(WB_PROJECT *prj, WB_PROJECT_DIR *dir, GtkTreeIter *iter) +{ + GtkTreeIter parent; + GtkTreeModel *model; + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.file_view)); + if (sidebar_get_project_iter(prj, iter)) + { + parent = *iter; + if (gtk_tree_model_iter_children (model, iter, &parent)) + { + WB_PROJECT_DIR *current; + + do + { + gtk_tree_model_get(model, iter, FILEVIEW_COLUMN_ASSIGNED_DATA_POINTER, &current, -1); + if (current == dir) + { + return TRUE; + } + }while (gtk_tree_model_iter_next(model, iter)); + } + } + return FALSE; +} + + +/* Get the GtkTreeIter for filepath (absolute) in directory root in project prj */ +static gboolean sidebar_get_filepath_iter (WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath, ITER_SEARCH_RESULT *search_result) +{ + guint len, index; + gchar *part, **parts, *found = NULL, *last_found, *abs_base_dir; + GtkTreeIter iter, parent; + GtkTreeModel *model; + + if (search_result == NULL) + { + return FALSE; + } + search_result->iter_valid = FALSE; + search_result->parent_valid = FALSE; + + abs_base_dir = get_combined_path(wb_project_get_filename(prj), wb_project_dir_get_base_dir(root)); + len = strlen(abs_base_dir); + if (strncmp(abs_base_dir, filepath, len) != 0) + { + /* Error, return. */ + return FALSE; + } + if (filepath[len] == G_DIR_SEPARATOR) + { + len++; + } + part = g_strdup(&(filepath[len])); + if (strlen(part) == 0) + { + return FALSE; + } + parts = g_strsplit(part, G_DIR_SEPARATOR_S, -1); + if (parts[0] == NULL) + { + return FALSE; + } + + if (sidebar_get_directory_iter(prj, root, &iter)) + { + index = 0; + last_found = NULL; + model = gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.file_view)); + + while (parts[index] != NULL) + { + parent = iter; + if (gtk_tree_model_iter_children(model, &iter, &parent)) + { + gchar *current; + + found = NULL; + do + { + gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_NAME, &current, -1); + + if (g_strcmp0(current, parts[index]) == 0) + { + found = current; + last_found = current; + index++; + //parent = iter; + break; + } + }while (gtk_tree_model_iter_next(model, &iter)); + + /* Did we find the next match? */ + if (found == NULL) + { + /* No, abort. */ + break; + } + } + else + { + break; + } + } + + /* Did we find a full match? */ + if (parts[index] == NULL && found != NULL) + { + /* Yes. */ + search_result->iter_valid = TRUE; + search_result->iter = iter; + + search_result->parent_valid = TRUE; + search_result->parent = parent; + } + else if (parts[index+1] == NULL && + (last_found != NULL || parts[1] == NULL)) + { + /* Not a full match but everything but the last part + of the filepath. At least return the parent. */ + search_result->parent_valid = TRUE; + search_result->parent = parent; + } + } + + g_free(part); + g_free(abs_base_dir); + g_strfreev(parts); + + return TRUE; +} + + /* Remove all rows from the side bar tree with the given data id */ static void sidebar_remove_nodes_with_data_id(guint toremove, GtkTreeIter *start) { @@ -710,6 +950,12 @@ void sidebar_update (SIDEBAR_EVENT event, SIDEBAR_CONTEXT *context) } } break; + case SIDEBAR_CONTEXT_FILE_ADDED: + sidebar_add_file(context->project, context->directory, context->file); + break; + case SIDEBAR_CONTEXT_FILE_REMOVED: + sidebar_remove_file(context->project, context->directory, context->file); + break; } } @@ -1325,3 +1571,107 @@ void sidebar_toggle_selected_project_dir_expansion (void) gtk_tree_path_free(path); } } + + +/* Helper function to set context according to given parameters. */ +static void sidebar_set_context (SIDEBAR_CONTEXT *context, guint dataid, gpointer data) +{ + if (data != NULL) + { + switch (dataid) + { + case DATA_ID_WB_BOOKMARK: + memset(context, 0, sizeof(*context)); + context->wb_bookmark = data; + break; + case DATA_ID_PROJECT: + memset(context, 0, sizeof(*context)); + context->project = data; + break; + case DATA_ID_PRJ_BOOKMARK: + context->prj_bookmark = data; + context->directory = NULL; + context->subdir = NULL; + context->file = NULL; + break; + case DATA_ID_DIRECTORY: + context->directory = data; + context->subdir = NULL; + context->file = NULL; + break; + case DATA_ID_NO_DIRS: + /* Has not got any data. */ + break; + case DATA_ID_SUB_DIRECTORY: + context->subdir = data; + context->file = NULL; + break; + case DATA_ID_FILE: + context->file = data; + break; + } + } +} + + +/* Internal call foreach function. Traverses the whole sidebar. */ +void sidebar_call_foreach_int(SB_CALLFOREACH_CONTEXT *foreach_cntxt, + GtkTreeIter *iter) +{ + guint currentid; + gpointer current; + GtkTreeIter children; + + do + { + gtk_tree_model_get(foreach_cntxt->model, iter, FILEVIEW_COLUMN_DATA_ID, &currentid, -1); + gtk_tree_model_get(foreach_cntxt->model, iter, FILEVIEW_COLUMN_ASSIGNED_DATA_POINTER, &current, -1); + + sidebar_set_context(foreach_cntxt->context, currentid, current); + if (currentid == foreach_cntxt->dataid) + { + /* Found requested node. Call callback function. */ + foreach_cntxt->func(foreach_cntxt->context, foreach_cntxt->userdata); + } + + /* If the node has childs then check them to. */ + if (gtk_tree_model_iter_children (foreach_cntxt->model, &children, iter)) + { + sidebar_call_foreach_int(foreach_cntxt, &children); + } + }while (gtk_tree_model_iter_next(foreach_cntxt->model, iter)); +} + + +/** Call a callback function for each matching node. + * + * This function traverses the complete sidebar tree and calls func each time + * a node with dataid is found. The function is passed the sidebar context + * for the current position in hte tree and the given userdata. + * + * @param dataid Which nodes are of interest? + * @param func Callback function + * @param userdata Pointer to user data. Is transparently passed through + * on calling func. + * + **/ +void sidebar_call_foreach(guint dataid, + void (*func)(SIDEBAR_CONTEXT *, gpointer userdata), + gpointer userdata) +{ + GtkTreeIter iter; + GtkTreeModel *model; + SIDEBAR_CONTEXT context; + SB_CALLFOREACH_CONTEXT foreach_cntxt; + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(sidebar.file_view)); + if (gtk_tree_model_get_iter_first (model, &iter)) + { + foreach_cntxt.context = &context; + foreach_cntxt.model = model; + foreach_cntxt.dataid = dataid; + foreach_cntxt.func = func; + foreach_cntxt.userdata = userdata; + sidebar_call_foreach_int(&foreach_cntxt, &iter); + } +} Modified: workbench/src/sidebar.h 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -22,6 +22,18 @@ #include <gtk/gtk.h> #include "wb_project.h" +enum +{ + DATA_ID_UNSET = 0, + DATA_ID_WB_BOOKMARK, + DATA_ID_PROJECT, + DATA_ID_PRJ_BOOKMARK, + DATA_ID_DIRECTORY, + DATA_ID_NO_DIRS, + DATA_ID_SUB_DIRECTORY, + DATA_ID_FILE, +}; + typedef struct { WB_PROJECT *project; @@ -50,6 +62,8 @@ typedef enum SIDEBAR_CONTEXT_WB_BOOKMARK_REMOVED, SIDEBAR_CONTEXT_PRJ_BOOKMARK_ADDED, SIDEBAR_CONTEXT_PRJ_BOOKMARK_REMOVED, + SIDEBAR_CONTEXT_FILE_ADDED, + SIDEBAR_CONTEXT_FILE_REMOVED, }SIDEBAR_EVENT; void sidebar_init(void); @@ -76,4 +90,7 @@ GPtrArray *sidebar_get_selected_project_filelist (void); GPtrArray *sidebar_get_selected_directory_filelist (void); GPtrArray *sidebar_get_selected_subdir_filelist (void); +void sidebar_call_foreach(guint dataid, + void (func)(SIDEBAR_CONTEXT *, gpointer userdata), gpointer userdata); + #endif Modified: workbench/src/wb_monitor.c 267 lines changed, 267 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,267 @@ +/* + * Copyright 2018 LarsGit223 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* + * Code for file monitoring. + */ +#include <glib/gstdio.h> + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <geanyplugin.h> +#include "wb_globals.h" +#include "workbench.h" +#include "wb_monitor.h" +#include "utils.h" + +struct S_WB_MONITOR +{ + GHashTable *monitors; +}; + +typedef struct +{ + GFileMonitor *monitor; + WB_PROJECT *prj; + WB_PROJECT_DIR *dir; +}WB_MONITOR_ENTRY; + + +/** Create a new, empty WB_MONITOR. + * + * @return Address of the new WB_MONITOR + * + **/ +WB_MONITOR *wb_monitor_new(void) +{ + WB_MONITOR *monitor; + + monitor = g_new0(WB_MONITOR, 1); + + return monitor; +} + + +/* Create a new monitor entry */ +static WB_MONITOR_ENTRY *wb_monitor_entry_new (GFileMonitor *monitor, + WB_PROJECT *prj, WB_PROJECT_DIR *dir) +{ + WB_MONITOR_ENTRY *new; + + new = g_new0(WB_MONITOR_ENTRY, 1); + new->monitor = monitor; + new->prj = prj; + new->dir = dir; + + return new; +} + + +/* Free a monitor entry */ +static void wb_monitor_entry_free (gpointer data) +{ + WB_MONITOR_ENTRY *entry = data; + + if (data != NULL) + { + g_object_unref(entry->monitor); + g_free(entry); + } +} + + +/* Callback function for file monitoring. */ +static void wb_monitor_file_changed_cb(G_GNUC_UNUSED GFileMonitor *monitor, + G_GNUC_UNUSED GFile *file, + G_GNUC_UNUSED GFile *other_file, + GFileMonitorEvent event, + WB_MONITOR_ENTRY *entry) +{ + const gchar *event_string = NULL; + gchar *file_path, *other_file_path = NULL; + + g_return_if_fail(entry != NULL); + + g_message("%s: event: %d", G_STRFUNC, event); + + file_path = g_file_get_path (file); + if (other_file != NULL) + { + other_file_path = g_file_get_path (other_file); + } + switch (event) + { + case G_FILE_MONITOR_EVENT_CREATED: + event_string = "FILE_CREATED"; + workbench_process_add_file_event (wb_globals.opened_wb, + entry->prj, entry->dir, file_path); + break; + + case G_FILE_MONITOR_EVENT_DELETED: + event_string = "FILE_DELETED"; + workbench_process_remove_file_event (wb_globals.opened_wb, + entry->prj, entry->dir, file_path); + break; + + case G_FILE_MONITOR_EVENT_RENAMED: + event_string = "FILE_RENAMED"; + workbench_process_remove_file_event (wb_globals.opened_wb, + entry->prj, entry->dir, file_path); + workbench_process_add_file_event (wb_globals.opened_wb, + entry->prj, entry->dir, other_file_path); + break; + + case G_FILE_MONITOR_EVENT_MOVED_IN: + event_string = "FILE_MOVED_IN"; + workbench_process_add_file_event (wb_globals.opened_wb, + entry->prj, entry->dir, file_path); + break; + + case G_FILE_MONITOR_EVENT_MOVED_OUT: + event_string = "FILE_MOVED_OUT"; + workbench_process_remove_file_event (wb_globals.opened_wb, + entry->prj, entry->dir, file_path); + break; + + default: + break; + } + + if (event_string != NULL) + { + g_message("%s: Prj: \"%s\" Dir: \"%s\" %s: \"%s\"", G_STRFUNC, wb_project_get_name(entry->prj), + wb_project_dir_get_name(entry->dir), event_string, file_path); + } + + g_free(file_path); + g_free(other_file_path); +} + + +/** Add a new file monitor + * + * Add a new file monitor for dirpath. The monitor will only be created + * if the settings option "Enable live monitor" is set to on and if + * no file monitor exists for dirpath already. If monitor creation fails, + * that means g_file_monitor_directory returns NULL, then a message is + * output on the statusbar. + * + * @param monitor The global monitor management + * @param prj The project to which dirpath belongs + * @param dir The directory (WB_PROJECT_DIR) to which dirpath belongs + * @param dirpath The path of the directory + * + **/ +void wb_monitor_add_dir(WB_MONITOR *monitor, WB_PROJECT *prj, + WB_PROJECT_DIR *dir, const gchar *dirpath) +{ + GFileMonitor *newmon; + GFile *file; + GError *error = NULL; + WB_MONITOR_ENTRY *entry; + + g_return_if_fail(monitor != NULL); + g_return_if_fail(dir != NULL); + g_return_if_fail(dirpath != NULL); + + if (workbench_get_enable_live_update(wb_globals.opened_wb) == FALSE) + { + /* Return if the feature is disabled. */ + return; + } + + if (monitor->monitors == NULL) + { + monitor->monitors = g_hash_table_new_full + (g_str_hash, g_str_equal, g_free, wb_monitor_entry_free); + } + if (g_hash_table_contains(monitor->monitors, dirpath)) + { + /* A monitor for that path already exists, + do not create another one. */ + return; + } + + /* Setup file monitor for directory */ + file = g_file_new_for_path(dirpath); + newmon = g_file_monitor_directory + (file, G_FILE_MONITOR_WATCH_MOVES, NULL, &error); + if (newmon == NULL) + { + /* Create monitor failed. Report error. */ + ui_set_statusbar(TRUE, + _("Could not setup file monitoring for directory: \"%s\". Error: %s"), + dirpath, error->message); + g_error_free (error); + return; + } + else + { + /* Add file monitor to hash table. */ + entry = wb_monitor_entry_new(newmon, prj, dir); + g_hash_table_insert(monitor->monitors, (gpointer)g_strdup(dirpath), entry); + + g_signal_connect(newmon, "changed", + G_CALLBACK(wb_monitor_file_changed_cb), entry); + + /* ToDo: make rate limit configurable */ + g_file_monitor_set_rate_limit(newmon, 5 * 1000); + } + g_object_unref(file); +} + + +/** Remove a file monitor + * + * Remove the file monitor for dirpath. + * + * @param monitor The global monitor management + * @param dirpath The path of the directory + * + **/ +gboolean wb_monitor_remove_dir(WB_MONITOR *monitor, const gchar *dirpath) +{ + if (monitor == NULL || dirpath == NULL) + { + return FALSE; + } + + /* Free the entry. The hash table will call the destroy function + wb_monitor_entry_free which is doing the work for us. */ + return g_hash_table_remove(monitor->monitors, dirpath); +} + + +/** Free monitor management/all file monitors. + * + * @param monitor The global monitor management + * + **/ +void wb_monitor_free(WB_MONITOR *monitor) +{ + if (monitor != NULL) + { + if (monitor->monitors != NULL) + { + g_hash_table_unref(monitor->monitors); + monitor->monitors = NULL; + } + } +} Modified: workbench/src/wb_monitor.h 33 lines changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,33 @@ +/* + * Copyright 2018 LarsGit223 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __WB_MONITOR_H__ +#define __WB_MONITOR_H__ + +#include <glib.h> +#include "wb_project.h" + +typedef struct S_WB_MONITOR WB_MONITOR; + +WB_MONITOR *wb_monitor_new(void); +void wb_monitor_add_dir(WB_MONITOR *monitor, WB_PROJECT *prj, + WB_PROJECT_DIR *dir, const gchar *dirpath); +gboolean wb_monitor_remove_dir(WB_MONITOR *monitor, const gchar *dirpath); +void wb_monitor_free(WB_MONITOR *monitor); + +#endif Modified: workbench/src/wb_project.c 508 lines changed, 406 insertions(+), 102 deletions(-) =================================================================== @@ -29,6 +29,7 @@ #include <../../utils/src/filelist.h> #include "wb_globals.h" #include "wb_project.h" +#include "sidebar.h" #include "utils.h" extern GeanyData *geany_data; @@ -40,6 +41,13 @@ typedef enum WB_PROJECT_TAG_PREFS_NO, }WB_PROJECT_TAG_PREFS; +typedef struct +{ + WB_PROJECT_IDLE_ACTION_ID id; + gpointer param_a; + gpointer param_b; +}WB_PROJECT_IDLE_ACTION; + typedef struct { GKeyFile *kf; @@ -64,13 +72,21 @@ struct S_WB_PROJECT gchar *filename; gchar *name; gboolean modified; - GSList *s_idle_add_funcs; - GSList *s_idle_remove_funcs; + //GSList *s_idle_add_funcs; + //GSList *s_idle_remove_funcs; GSList *directories; /* list of WB_PROJECT_DIR; */ WB_PROJECT_TAG_PREFS generate_tag_prefs; GPtrArray *bookmarks; }; +typedef struct +{ + guint len; + const gchar *string; +}WB_PROJECT_TEMP_DATA; + +static GSList *s_idle_actions = NULL; +static void wb_project_dir_update_tags(WB_PROJECT_DIR *root); /** Set the projects modified marker. * @@ -212,26 +228,26 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) /* Clear idle queue */ -static void wb_project_clear_idle_queue(GSList **queue) +static void wb_project_clear_idle_queue(void) { - if (queue == NULL || *queue == NULL) + if (s_idle_actions == NULL) { return; } - g_slist_free_full(*queue, g_free); - *queue = NULL; + g_slist_free_full(s_idle_actions, g_free); + s_idle_actions = NULL; } /* Create a new project dir with base path "utf8_base_dir" */ -static WB_PROJECT_DIR *wb_project_dir_new(const gchar *utf8_base_dir) +static WB_PROJECT_DIR *wb_project_dir_new(WB_PROJECT *prj, const gchar *utf8_base_dir) { guint offset; if (utf8_base_dir == NULL) { - return NULL; + return NULL; } WB_PROJECT_DIR *dir = g_new0(WB_PROJECT_DIR, 1); dir->base_dir = g_strdup(utf8_base_dir); @@ -250,6 +266,7 @@ static WB_PROJECT_DIR *wb_project_dir_new(const gchar *utf8_base_dir) } dir->name = g_strdup(&(dir->base_dir[offset])); dir->is_prj_base_dir = FALSE; + return dir; } @@ -551,6 +568,200 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) } +/* Add a new file to the project directory and update the sidebar. */ +static void wb_project_dir_add_file_int(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) +{ + gboolean matches; + gchar **file_patterns = NULL; + SIDEBAR_CONTEXT context; + WB_MONITOR *monitor = NULL; + + if (root->file_patterns && root->file_patterns[0]) + { + file_patterns = root->file_patterns; + } + + matches = gp_filelist_filepath_matches_patterns(filepath, + file_patterns, root->ignored_dirs_patterns, root->ignored_file_patterns); + if (!matches) + { + /* Ignore it. */ + return; + } + + /* Update file table and counters. */ + g_hash_table_insert(root->file_table, g_strdup(filepath), NULL); + if (g_file_test(filepath, G_FILE_TEST_IS_DIR)) + { + root->subdir_count++; + monitor = workbench_get_monitor(wb_globals.opened_wb); + wb_monitor_add_dir(monitor, prj, root, filepath); + } + else if (g_file_test(filepath, G_FILE_TEST_IS_REGULAR)) + { + root->file_count++; + } + + /* Update sidebar. */ + memset(&context, 0, sizeof(context)); + context.project = prj; + context.directory = root; + context.file = (gchar *)filepath; + sidebar_update(SIDEBAR_CONTEXT_FILE_ADDED, &context); + + /* If the file is a directory we also have to manually add all files + contained in it. */ + if (monitor != NULL) + { + GSList *scanned, *elem = NULL; + + scanned = gp_filelist_scan_directory_full(&(root->file_count), &(root->subdir_count), + filepath, file_patterns, root->ignored_dirs_patterns, root->ignored_file_patterns, + FILELIST_FLAG_ADD_DIRS); + + foreach_slist(elem, scanned) + { + char *path = elem->data; + + if (path) + { + wb_project_dir_add_file(prj, root, path); + } + } + + g_slist_foreach(scanned, (GFunc) g_free, NULL); + g_slist_free(scanned); + } +} + +/** Add a new file to the project directory and update the sidebar. + * + * The file is only added if it matches the pattern settings. + * + * @param prj The project to add it to. + * @param root The directory to add it to. + * @param filepath The file to add. + * + **/ +void wb_project_dir_add_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) +{ + wb_project_dir_add_file_int(prj, root, filepath); + wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID_UPDATE_TAGS, + root, NULL); + +} + + +/* Check if the filepath is equal for the length of the directory path in px_temp */ +static gboolean wb_project_dir_remove_child (gpointer key, gpointer value, gpointer user_data) +{ + WB_PROJECT_TEMP_DATA *px_temp; + TMSourceFile *sf; + + px_temp = user_data; + if (strncmp(px_temp->string, key, px_temp->len) == 0) + { + /* We found a child of our removed directory. + Remove it from the hash table. This will also free + the tags. We do not need to update the sidebar as we + already deleted the parent directory/node. */ + sf = value; + if (sf != NULL) + { + tm_workspace_remove_source_file(sf); + } + return TRUE; + } + return FALSE; +} + + +/** Remove a file from the project directory and update the sidebar. + * + * If the file still exists, it is only removed if it matches the pattern settings. + * + * @param prj The project to remove it from. + * @param root The directory to remove it from. + * @param filepath The file to remove. + * + **/ +void wb_project_dir_remove_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) +{ + gboolean matches, was_dir; + gchar **file_patterns = NULL; + WB_MONITOR *monitor; + + if (root->file_patterns && root->file_patterns[0]) + { + file_patterns = root->file_patterns; + } + + if (g_file_test(filepath, G_FILE_TEST_EXISTS)) + { + matches = gp_filelist_filepath_matches_patterns(filepath, + file_patterns, root->ignored_dirs_patterns, root->ignored_file_patterns); + } + else + { + /* If the file does not exist any more, then always try to remove it. */ + matches = TRUE; + } + + if (matches) + { + SIDEBAR_CONTEXT context; + TMSourceFile *sf; + + /* Update file table and counters. */ + sf = g_hash_table_lookup (root->file_table, filepath); + if (sf != NULL) + { + tm_workspace_remove_source_file(sf); + } + g_hash_table_remove(root->file_table, filepath); + + /* If the file already has been deleted, we cannot determine if it + was a file or directory at this point. But the monitors will + help us out, see code at end of function. */ + + /* Update sidebar. */ + memset(&context, 0, sizeof(context)); + context.project = prj; + context.directory = root; + context.file = (gchar *)filepath; + sidebar_update(SIDEBAR_CONTEXT_FILE_REMOVED, &context); + } + + /* Remove the file monitor for filepath. This will only return TRUE + if there is a file monitor for filepath and that means that file- + path was a directory. So we can determine if filepath was a dir + or not even if it has been deleted. */ + monitor = workbench_get_monitor(wb_globals.opened_wb); + was_dir = wb_monitor_remove_dir(monitor, filepath); + if (was_dir) + { + WB_PROJECT_TEMP_DATA x_temp; + + x_temp.len = strlen(filepath); + x_temp.string = filepath; + g_hash_table_foreach_remove(root->file_table, + wb_project_dir_remove_child, &x_temp); + + if (root->subdir_count > 0) + { + root->subdir_count--; + } + } + else + { + if (root->file_count > 0) + { + root->file_count--; + } + } +} + + /* Stolen and modified version from Geany. The only difference is that Geany * first looks at shebang inside the file and then, if it fails, checks the * file extension. Opening every file is too expensive so instead check just @@ -631,6 +842,37 @@ static void wb_project_dir_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED g } +/* Update tags for new files */ +static void wb_project_dir_update_tags(WB_PROJECT_DIR *root) +{ + GHashTableIter iter; + gpointer key, value; + GPtrArray *source_files; + + source_files = g_ptr_array_new(); + g_hash_table_iter_init(&iter, root->file_table); + while (g_hash_table_iter_next(&iter, &key, &value)) + { + if (value == NULL) + { + TMSourceFile *sf; + gchar *utf8_path = key; + gchar *locale_path = utils_get_locale_from_utf8(utf8_path); + + sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); + if (sf && !document_find_by_filename(utf8_path)) + g_ptr_array_add(source_files, sf); + + g_hash_table_insert(root->file_table, g_strdup(utf8_path), sf); + g_free(locale_path); + } + } + + tm_workspace_add_source_files(source_files); + g_ptr_array_free(source_files, TRUE); +} + + /** Rescan/update the file list of a project dir. * * @param project The project to which directory belongs @@ -661,14 +903,14 @@ void wb_project_rescan(WB_PROJECT *prj) { GSList *elem = NULL; guint filenum = 0; + GHashTableIter iter; if (!prj) { return; } - wb_project_clear_idle_queue(&prj->s_idle_add_funcs); - wb_project_clear_idle_queue(&prj->s_idle_remove_funcs); + wb_project_clear_idle_queue(); foreach_slist(elem, prj->directories) { @@ -679,6 +921,37 @@ void wb_project_rescan(WB_PROJECT *prj) { g_slist_foreach(prj->directories, (GFunc)wb_project_dir_regenerate_tags, NULL); } + + /* Create file monitors for directories. */ + if (workbench_get_enable_live_update(wb_globals.opened_wb) == TRUE) + { + WB_MONITOR *monitor; + + monitor = workbench_get_monitor(wb_globals.opened_wb); + foreach_slist(elem, prj->directories) + { + gpointer path, value; + GHashTable *filehash; + gchar *abs_path; + + /* First add monitor for base dir */ + abs_path = get_combined_path(wb_project_get_filename(prj), + wb_project_dir_get_base_dir(elem->data)); + wb_monitor_add_dir(monitor, prj, elem->data, abs_path); + g_free(abs_path); + + /* Now add all dirs in file table */ + filehash = ((WB_PROJECT_DIR *)elem->data)->file_table; + g_hash_table_iter_init(&iter, filehash); + while (g_hash_table_iter_next (&iter, &path, &value)) + { + if (path != NULL && g_file_test(path, G_FILE_TEST_IS_DIR)) + { + wb_monitor_add_dir(monitor, prj, elem->data, path); + } + } + } + } } @@ -732,141 +1005,144 @@ gboolean wb_project_file_is_included(WB_PROJECT *prj, const gchar *filename) } -static gboolean add_tm_idle(gpointer foo) +/* Add single tm file. Only to be called on-idle! */ +static void wb_project_add_single_tm_file(WB_PROJECT *prj, const gchar *filename) { - WB_PROJECT *prj; - GSList *elem2 = NULL; - - prj = (WB_PROJECT *)foo; - if (prj == NULL || prj->s_idle_add_funcs == NULL) - { - return FALSE; - } + GSList *elem = NULL; - foreach_slist (elem2, prj->s_idle_add_funcs) + foreach_slist (elem, prj->directories) { - GSList *elem = NULL; - gchar *utf8_fname = elem2->data; + WB_PROJECT_DIR *dir = elem->data; + TMSourceFile *sf = g_hash_table_lookup(dir->file_table, filename); - foreach_slist (elem, prj->directories) + if (sf != NULL && !document_find_by_filename(filename)) { - WB_PROJECT_DIR *dir = elem->data; - TMSourceFile *sf = g_hash_table_lookup(dir->file_table, utf8_fname); - - if (sf != NULL && !document_find_by_filename(utf8_fname)) - { - tm_workspace_add_source_file(sf); - break; /* single file representation in TM is enough */ - } + tm_workspace_add_source_file(sf); + break; /* single file representation in TM is enough */ } } - - wb_project_clear_idle_queue(&(prj->s_idle_add_funcs)); - - return FALSE; } -/* This function gets called when document is being closed by Geany and we need - * to add the TMSourceFile from the tag manager because Geany removes it on - * document close. +/* This function gets called when document is being opened by Geany and we need + * to remove the TMSourceFile from the tag manager because Geany inserts + * it for the newly open tab. Even though tag manager would handle two identical + * files, the file inserted by the plugin isn't updated automatically in TM + * so any changes wouldn't be reflected in the tags array (e.g. removed function + * from source file would still be found in TM) * - * Additional problem: The tag removal in Geany happens after this function is called. - * To be sure, perform on idle after this happens (even though from my knowledge of TM - * this shouldn't probably matter). */ -void wb_project_add_single_tm_file(WB_PROJECT *prj, const gchar *filename) + * Additional problem: The document being opened may be caused + * by going to tag definition/declaration - tag processing is in progress + * when this function is called and if we remove the TmSourceFile now, line + * number for the searched tag won't be found. For this reason delay the tag + * TmSourceFile removal until idle */ +static void wb_project_remove_single_tm_file(WB_PROJECT *prj, const gchar *filename) { - if (prj == NULL) - { - return; - } + GSList *elem = NULL; - if (prj->s_idle_add_funcs == NULL) + foreach_slist (elem, prj->directories) { - plugin_idle_add(wb_globals.geany_plugin, (GSourceFunc)add_tm_idle, prj); - } + WB_PROJECT_DIR *dir = elem->data; + TMSourceFile *sf = g_hash_table_lookup(dir->file_table, filename); - prj->s_idle_add_funcs = g_slist_prepend(prj->s_idle_add_funcs, g_strdup(filename)); + if (sf != NULL) + { + tm_workspace_remove_source_file(sf); + } + } } -static gboolean remove_tm_idle(gpointer foo) +/* On-idle callback function. */ +static gboolean wb_project_on_idle_callback(gpointer foo) { - WB_PROJECT *prj; - GSList *elem2 = NULL; - - prj = (WB_PROJECT *)foo; - if (prj == NULL || prj->s_idle_remove_funcs == NULL) - { - return FALSE; - } + GSList *elem = NULL; + WB_PROJECT_IDLE_ACTION *action; - foreach_slist (elem2, prj->s_idle_remove_funcs) + foreach_slist (elem, s_idle_actions) { - - GSList *elem = NULL; - gchar *utf8_fname = elem2->data; - - foreach_slist (elem, prj->directories) + action = elem->data; + switch (action->id) { - WB_PROJECT_DIR *dir = elem->data; - TMSourceFile *sf = g_hash_table_lookup(dir->file_table, utf8_fname); + case WB_PROJECT_IDLE_ACTION_ID_ADD_SINGLE_TM_FILE: + if (action->param_a != NULL && action->param_b != NULL) + { + wb_project_add_single_tm_file + (action->param_a, action->param_b); + g_free(action->param_b); + } + break; - if (sf != NULL) - { - tm_workspace_remove_source_file(sf); - } + case WB_PROJECT_IDLE_ACTION_ID_REMOVE_SINGLE_TM_FILE: + if (action->param_a != NULL && action->param_b != NULL) + { + wb_project_remove_single_tm_file + (action->param_a, action->param_b); + g_free(action->param_b); + } + break; + + case WB_PROJECT_IDLE_ACTION_ID_UPDATE_TAGS: + if (action->param_a != NULL) + { + wb_project_dir_update_tags(action->param_a); + } + break; } } - wb_project_clear_idle_queue(&(prj->s_idle_remove_funcs)); + wb_project_clear_idle_queue(); + return FALSE; } -/* This function gets called when document is being opened by Geany and we need - * to remove the TMSourceFile from the tag manager because Geany inserts - * it for the newly open tab. Even though tag manager would handle two identical - * files, the file inserted by the plugin isn't updated automatically in TM - * so any changes wouldn't be reflected in the tags array (e.g. removed function - * from source file would still be found in TM) +/** Add a new idle action to the list. * - * Additional problem: The document being opened may be caused - * by going to tag definition/declaration - tag processing is in progress - * when this function is called and if we remove the TmSourceFile now, line - * number for the searched tag won't be found. For this reason delay the tag - * TmSourceFile removal until idle */ -void wb_project_remove_single_tm_file(WB_PROJECT *prj, const gchar *utf8_filename) + * The function allocates a new WB_PROJECT_IDLE_ACTION structure and fills + * in the values passed. On-idle genay will then call wb_project_on_idle_callback + * and that function will call the function related to the action ID + * and pass the relevant parameters to it. + * + * @param id The action to execute on-idle + * @param param_a Parameter A + * @param param_a Parameter B + * + **/ +void wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID id, gpointer param_a, gpointer param_b) { - if (prj == NULL) - { - return; - } + WB_PROJECT_IDLE_ACTION *action; - if (prj->s_idle_remove_funcs == NULL) + action = g_new0(WB_PROJECT_IDLE_ACTION, 1); + action->id = id; + action->param_a = param_a; + action->param_b = param_b; + + if (s_idle_actions == NULL) { - plugin_idle_add(wb_globals.geany_plugin, (GSourceFunc)remove_tm_idle, prj); + plugin_idle_add(wb_globals.geany_plugin, (GSourceFunc)wb_project_on_idle_callback, NULL); } - prj->s_idle_remove_funcs = g_slist_prepend(prj->s_idle_remove_funcs, g_strdup(utf8_filename)); + + s_idle_actions = g_slist_prepend(s_idle_actions, action); } /* Add a directory to the project */ static WB_PROJECT_DIR *wb_project_add_directory_int(WB_PROJECT *prj, const gchar *dirname, gboolean rescan) { - if (prj != NULL) - { - WB_PROJECT_DIR *new_dir = wb_project_dir_new(dirname); + if (prj != NULL) + { + WB_PROJECT_DIR *new_dir = wb_project_dir_new(prj, dirname); - if (prj->directories != NULL) - { + if (prj->directories != NULL) + { GSList *lst = prj->directories->next; lst = g_slist_prepend(lst, new_dir); lst = g_slist_sort(lst, (GCompareFunc)wb_project_dir_comparator); prj->directories->next = lst; - } - else - { + } + else + { prj->directories = g_slist_append(prj->directories, new_dir); } @@ -875,8 +1151,8 @@ static WB_PROJECT_DIR *wb_project_add_directory_int(WB_PROJECT *prj, const gchar wb_project_rescan(prj); } return new_dir; - } - return NULL; + } + return NULL; } @@ -921,7 +1197,7 @@ gboolean wb_project_remove_directory (WB_PROJECT *prj, WB_PROJECT_DIR *dir) wb_project_rescan(prj); prj->modified = TRUE; } - return FALSE; + return FALSE; } @@ -1498,3 +1774,31 @@ void wb_project_free(WB_PROJECT *prj) g_free(prj->name); g_free(prj); } + + +/** Check if dir is a valid reference to a directory of prj. + * + * @param prj The project to search in + * @param dir The directory to search for + * @return TRUE dir is a directory in prj + * FALSE dir was not found in prj + **/ +gboolean wb_project_is_valid_dir_reference(WB_PROJECT *prj, WB_PROJECT_DIR *dir) +{ + GSList *elem = NULL; + + if (prj == NULL) + { + return FALSE; + } + + foreach_slist(elem, prj->directories) + { + if (elem->data == dir) + { + return TRUE; + } + } + + return FALSE; +} Modified: workbench/src/wb_project.h 14 lines changed, 12 insertions(+), 2 deletions(-) =================================================================== @@ -21,6 +21,13 @@ #include <glib.h> +typedef enum +{ + WB_PROJECT_IDLE_ACTION_ID_ADD_SINGLE_TM_FILE, + WB_PROJECT_IDLE_ACTION_ID_REMOVE_SINGLE_TM_FILE, + WB_PROJECT_IDLE_ACTION_ID_UPDATE_TAGS, +}WB_PROJECT_IDLE_ACTION_ID; + typedef struct S_WB_PROJECT WB_PROJECT; typedef struct S_WB_PROJECT_DIR WB_PROJECT_DIR; @@ -38,8 +45,7 @@ gboolean wb_project_add_directory(WB_PROJECT *prj, const gchar *dirname); gboolean wb_project_remove_directory (WB_PROJECT *prj, WB_PROJECT_DIR *dir); void wb_project_rescan(WB_PROJECT *prj); gboolean wb_project_file_is_included(WB_PROJECT *prj, const gchar *filename); -void wb_project_add_single_tm_file(WB_PROJECT *prj, const gchar *filename); -void wb_project_remove_single_tm_file(WB_PROJECT *prj, const gchar *filename); +gboolean wb_project_is_valid_dir_reference(WB_PROJECT *prj, WB_PROJECT_DIR *dir); void wb_project_dir_set_is_prj_base_dir (WB_PROJECT_DIR *directory, gboolean value); gboolean wb_project_dir_get_is_prj_base_dir (WB_PROJECT_DIR *directory); @@ -55,6 +61,8 @@ gboolean wb_project_dir_set_ignored_file_patterns (WB_PROJECT_DIR *directory, gc guint wb_project_dir_rescan(WB_PROJECT *prj, WB_PROJECT_DIR *root); gchar *wb_project_dir_get_info (WB_PROJECT_DIR *dir); gboolean wb_project_dir_file_is_included(WB_PROJECT_DIR *dir, const gchar *filename); +void wb_project_dir_add_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath); +void wb_project_dir_remove_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath); gboolean wb_project_add_bookmark(WB_PROJECT *prj, const gchar *filename); gboolean wb_project_remove_bookmark(WB_PROJECT *prj, const gchar *filename); @@ -67,4 +75,6 @@ gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error); gchar *wb_project_get_info (WB_PROJECT *prj); +void wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID id, gpointer param_a, gpointer param_b); + #endif Modified: workbench/src/workbench.c 224 lines changed, 223 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,9 @@ #include <glib/gstdio.h> #include <geanyplugin.h> #include "workbench.h" +#include "sidebar.h" #include "wb_project.h" +#include "wb_monitor.h" #include "utils.h" typedef struct @@ -45,8 +47,10 @@ struct S_WORKBENCH gchar *name; gboolean modified; gboolean rescan_projects_on_open; + gboolean enable_live_update; GPtrArray *projects; GPtrArray *bookmarks; + WB_MONITOR *monitor; }; /* Create a new, empty workbench project entry */ @@ -81,12 +85,14 @@ WORKBENCH *workbench_new(void) { WORKBENCH *new_wb; - new_wb = g_new(WORKBENCH, 1); + new_wb = g_new0(WORKBENCH, 1); memset(new_wb, 0, sizeof(*new_wb)); new_wb->modified = FALSE; new_wb->rescan_projects_on_open = TRUE; + new_wb->enable_live_update = TRUE; new_wb->projects = g_ptr_array_new(); new_wb->bookmarks = g_ptr_array_new(); + new_wb->monitor = wb_monitor_new(); return new_wb; } @@ -117,6 +123,7 @@ void workbench_free(WORKBENCH *wb) } } + wb_monitor_free(wb->monitor); g_ptr_array_free (wb->projects, TRUE); g_free(wb); } @@ -209,6 +216,42 @@ gboolean workbench_get_rescan_projects_on_open(WORKBENCH *wb) } +/** Set the "Enable live update" option. + * + * @param wb The workbench + * @param value The value to set + * + **/ +void workbench_set_enable_live_update(WORKBENCH *wb, gboolean value) +{ + if (wb != NULL) + { + if (wb->enable_live_update != value) + { + wb->enable_live_update = value; + wb->modified = TRUE; + } + } +} + + +/** Get the "Enable live update" option. + * + * @param wb The workbench + * @return TRUE = use file monitoring for live update of the file list, + * FALSE = don't + * + **/ +gboolean workbench_get_enable_live_update(WORKBENCH *wb) +{ + if (wb != NULL) + { + return wb->enable_live_update; + } + return FALSE; +} + + /** Set the filename. * * @param wb The workbench @@ -256,6 +299,22 @@ const gchar *workbench_get_filename(WORKBENCH *wb) } +/** Get the monitor. + * + * @param wb The workbench + * @return Reference to the WB_MONITOR (can be NULL). + * + **/ +WB_MONITOR *workbench_get_monitor(WORKBENCH *wb) +{ + if (wb != NULL) + { + return wb->monitor; + } + return NULL; +} + + /** Get the name. * * @param wb The workbench @@ -590,6 +649,7 @@ gboolean workbench_save(WORKBENCH *wb, GError **error) g_key_file_set_string(kf, "General", "filetype", "workbench"); g_key_file_set_string(kf, "General", "version", "1.0"); g_key_file_set_boolean(kf, "General", "RescanProjectsOnOpen", wb->rescan_projects_on_open); + g_key_file_set_boolean(kf, "General", "EnableLiveUpdate", wb->enable_live_update); /* Save Workbench bookmarks as string list */ boomarks_size = workbench_get_bookmarks_count(wb); @@ -713,6 +773,16 @@ gboolean workbench_load(WORKBENCH *wb, const gchar *filename, GError **error) } workbench_set_filename(wb, filename); wb->rescan_projects_on_open = g_key_file_get_boolean(kf, "General", "RescanProjectsOnOpen", error); + if (g_key_file_has_key (kf, "General", "EnableLiveUpdate", error)) + { + wb->enable_live_update = g_key_file_get_boolean(kf, "General", "EnableLiveUpdate", error); + } + else + { + /* Not found. Might happen if the workbench was created with an older version of the plugin. + Initialize with TRUE. */ + wb->enable_live_update = TRUE; + } /* Load Workbench bookmarks from string list */ bookmarks_strings = g_key_file_get_string_list (kf, "General", "Bookmarks", NULL, error); @@ -801,3 +871,155 @@ gboolean workbench_load(WORKBENCH *wb, const gchar *filename, GError **error) return success; } + + +/* Check if the given pointers are still valid references. */ +static gboolean workbench_references_are_valid(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT_DIR *dir) +{ + guint index; + WB_PROJECT_ENTRY *entry; + + if (wb == NULL) + { + return FALSE; + } + + /* Try to find the project. */ + for (index = 0 ; index < wb->projects->len ; index++) + { + entry = g_ptr_array_index(wb->projects, index); + if (((WB_PROJECT_ENTRY *)entry)->project == prj) + { + break; + } + } + if (index >= wb->projects->len) + { + return FALSE; + } + + /* Project exists in this workbench, let the project validate + the directory. */ + return wb_project_is_valid_dir_reference(prj, dir); +} + + +/** Process the add file event. + * + * The function processes the add file event. The pointers are checked for + * validity and on success the task is passed on to the project dir. file can + * be the path of a regular file or a directory. + * + * @param wb The workbench + * @param prj The project + * @param dir The directory + * @param file The new file to add to project/directory + * + **/ +void workbench_process_add_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT_DIR *dir, const gchar *file) +{ + if (workbench_references_are_valid(wb, prj, dir) == FALSE) + { + /* Should not happen, log a message and return. */ + g_message("%s: invalid references: wb: %p, prj: %p, dir: %p", + G_STRFUNC, wb, prj, dir); + return; + } + + wb_project_dir_add_file(prj, dir, file); +} + + +/** Process the remove file event. + * + * The function processes the remove file event. The pointers are checked for + * validity and on success the task is passed on to the project dir. file can + * be the path of a regular file or a directory. + * + * @param wb The workbench + * @param prj The project + * @param dir The directory + * @param file The file to remove from project/directory + * + **/ +void workbench_process_remove_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT_DIR *dir, const gchar *file) +{ + if (workbench_references_are_valid(wb, prj, dir) == FALSE) + { + /* Should not happen, log a message and return. */ + g_message("%s: invalid references: wb: %p, prj: %p, dir: %p", + G_STRFUNC, wb, prj, dir); + return; + } + + wb_project_dir_remove_file(prj, dir, file); +} + + +/* Foreach callback function for creating file monitors. */ +static void workbench_enable_live_update_foreach_cb(SIDEBAR_CONTEXT *context, + gpointer userdata) +{ + gchar *dirpath = NULL; + gchar *abs_path = NULL; + WB_MONITOR *monitor; + + if (context->project != NULL && context->directory != NULL) + { + if (context->subdir != NULL) + { + dirpath = context->subdir; + } + else + { + abs_path = get_combined_path(wb_project_get_filename(context->project), + wb_project_dir_get_base_dir(context->directory)); + dirpath = abs_path; + } + } + + if (dirpath != NULL) + { + monitor = userdata; + wb_monitor_add_dir(monitor, context->project, context->directory, dirpath); + } + + g_free(abs_path); +} + + +/** Enable live update. + * + * The function enables live update of the workbench by creating file + * monitors for all directories in the sidebars file tree. + * + * @param wb The workbench + * + **/ +void workbench_enable_live_update(WORKBENCH *wb) +{ + if (wb != NULL) + { + sidebar_call_foreach(DATA_ID_DIRECTORY, + workbench_enable_live_update_foreach_cb, wb->monitor); + sidebar_call_foreach(DATA_ID_SUB_DIRECTORY, + workbench_enable_live_update_foreach_cb, wb->monitor); + } +} + + +/** Disable live update. + * + * The function disables live update of the workbench by freeing all + * file monitors. + * + * @param wb The workbench + * + **/ +void workbench_disable_live_update(WORKBENCH *wb) +{ + if (wb != NULL) + { + wb_monitor_free(wb->monitor); + } +} Modified: workbench/src/workbench.h 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -21,6 +21,7 @@ #include <glib.h> #include "wb_project.h" +#include "wb_monitor.h" typedef enum { @@ -37,8 +38,12 @@ void workbench_free(WORKBENCH *wb); gboolean workbench_is_empty(WORKBENCH *wb); guint workbench_get_project_count(WORKBENCH *wb); gboolean workbench_is_modified(WORKBENCH *wb); + void workbench_set_rescan_projects_on_open(WORKBENCH *wb, gboolean value); gboolean workbench_get_rescan_projects_on_open(WORKBENCH *wb); +void workbench_set_enable_live_update(WORKBENCH *wb, gboolean value); +gboolean workbench_get_enable_live_update(WORKBENCH *wb); + WB_PROJECT *workbench_get_project_at_index(WORKBENCH *wb, guint index); PROJECT_ENTRY_STATUS workbench_get_project_status_at_index(WORKBENCH *wb, guint index); PROJECT_ENTRY_STATUS workbench_get_project_status_by_address(WORKBENCH *wb, WB_PROJECT *address); @@ -49,6 +54,7 @@ WB_PROJECT *workbench_file_is_included (WORKBENCH *wb, const gchar *filename); void workbench_set_filename(WORKBENCH *wb, const gchar *filename); const gchar *workbench_get_filename(WORKBENCH *wb); gchar *workbench_get_name(WORKBENCH *wb); +WB_MONITOR *workbench_get_monitor(WORKBENCH *wb); gboolean workbench_save(WORKBENCH *wb, GError **error); gboolean workbench_load(WORKBENCH *wb, const gchar *filename, GError **error); @@ -58,4 +64,9 @@ gboolean workbench_remove_bookmark(WORKBENCH *wb, const gchar *filename); gchar *workbench_get_bookmark_at_index (WORKBENCH *wb, guint index); guint workbench_get_bookmarks_count(WORKBENCH *wb); +void workbench_process_add_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT_DIR *dir, const gchar *file); +void workbench_process_remove_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT_DIR *dir, const gchar *file); +void workbench_enable_live_update(WORKBENCH *wb); +void workbench_disable_live_update(WORKBENCH *wb); + #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] bc7b2e: utils: added new function "gp_filelist_filepath_matches_patterns()".
by LarsDW223 17 Feb '18

17 Feb '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Sat, 17 Feb 2018 17:28:01 UTC Commit: bc7b2e0970f894955f94810fd93edcd1064d38f1 https://github.com/geany/geany-plugins/commit/bc7b2e0970f894955f94810fd93ed… Log Message: ----------- utils: added new function "gp_filelist_filepath_matches_patterns()". Modified Paths: -------------- utils/src/filelist.c utils/src/filelist.h Modified: utils/src/filelist.c 70 lines changed, 70 insertions(+), 0 deletions(-) =================================================================== @@ -290,3 +290,73 @@ GSList *gp_filelist_scan_directory_full(guint *files, guint *folders, const gcha return params.filelist; } + + +/** Check if a filepath matches the given patterns. + * + * If the filepath belongs to a regular file, then TRUE will be returned if + * the filepath matches the patterns in file_patterns but does not match the + * patterns in ignored_file_patterns. + * + * If the filepath belongs to a directory, then TRUE will be returned if it + * does not match the patterns in ignored_dirs_patterns. + * + * @param filepath The file or dorectory path to check + * @param file_patterns + * File patterns for matching files (e.g. "*.c") or NULL + * for all files. + * @param ignored_dirs_patterns + * Patterns for ignored directories + * @param ignored_file_patterns + * Patterns for ignored files + * @return gboolean + * + **/ +gboolean gp_filelist_filepath_matches_patterns(const gchar *filepath, gchar **file_patterns, + gchar **ignored_dirs_patterns, gchar **ignored_file_patterns) +{ + gboolean match = FALSE; + GSList *file_patterns_list; + GSList *ignored_dirs_list; + GSList *ignored_file_list; + + if (!file_patterns || !file_patterns[0]) + { + const gchar *all_pattern[] = { "*", NULL }; + file_patterns_list = filelist_get_precompiled_patterns((gchar **)all_pattern); + } + else + { + file_patterns_list = filelist_get_precompiled_patterns(file_patterns); + } + + ignored_dirs_list = filelist_get_precompiled_patterns(ignored_dirs_patterns); + ignored_file_list = filelist_get_precompiled_patterns(ignored_file_patterns); + + if (g_file_test(filepath, G_FILE_TEST_IS_DIR)) + { + if (!filelist_patterns_match(ignored_dirs_list, filepath)) + { + match = TRUE; + } + } + else if (g_file_test(filepath, G_FILE_TEST_IS_REGULAR)) + { + if (filelist_patterns_match(file_patterns_list, filepath) && + !filelist_patterns_match(ignored_file_list, filepath)) + { + match = TRUE; + } + } + + g_slist_foreach(file_patterns_list, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(file_patterns_list); + + g_slist_foreach(ignored_dirs_list, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(ignored_dirs_list); + + g_slist_foreach(ignored_file_list, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(ignored_file_list); + + return match; +} Modified: utils/src/filelist.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -32,6 +32,8 @@ GSList *gp_filelist_scan_directory(guint *files, guint *folders, const gchar *se gchar **ignored_dirs_patterns, gchar **ignored_file_patterns); GSList *gp_filelist_scan_directory_full(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, gchar **ignored_dirs_patterns, gchar **ignored_file_patterns, guint flags); +gboolean gp_filelist_filepath_matches_patterns(const gchar *filepath, gchar **file_patterns, + gchar **ignored_dirs_patterns, gchar **ignored_file_patterns); G_END_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7460d3: Merge pull request #693 from b4n/scope-french-translation
by Frank Lanitz 16 Feb '18

16 Feb '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Fri, 16 Feb 2018 05:56:30 UTC Commit: 7460d36aca558a15cf1ad5d6dc6ea8028122b2ab https://github.com/geany/geany-plugins/commit/7460d36aca558a15cf1ad5d6dc6ea… Log Message: ----------- Merge pull request #693 from b4n/scope-french-translation French translation update (and translation setup fixes for the Scope plugin) Modified Paths: -------------- po/fr.po scope/data/scope.glade scope/src/break.c scope/src/debug.c scope/src/inspect.c scope/src/memory.c scope/src/menu.c scope/src/parse.c scope/src/plugme.c scope/src/prefs.c scope/src/program.c scope/src/scope.c scope/src/thread.c scope/src/utils.c scope/src/views.c Modified: po/fr.po 626 lines changed, 318 insertions(+), 308 deletions(-) =================================================================== @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany-Plugins 1.30\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-11 17:41+0100\n" -"PO-Revision-Date: 2017-03-05 16:25+0100\n" +"POT-Creation-Date: 2018-02-14 23:05-0600\n" +"PO-Revision-Date: 2018-02-15 23:00-0600\n" "Last-Translator: Colomban Wendling <ban(a)herbesfolles.org>\n" "Language-Team: French <geany-i18n(a)uvena.de>\n" "Language: fr\n" @@ -52,11 +52,12 @@ msgid "_Hide Message Window" msgstr "Cac_her la fenêtre de messages" #: ../addons/src/ao_tasks.c:412 ../debugger/src/stree.c:420 +#: ../scope/data/scope.glade.h:72 msgid "File" msgstr "Fichier" #: ../addons/src/ao_tasks.c:423 ../debugger/src/bptree.c:702 -#: ../debugger/src/stree.c:427 +#: ../debugger/src/stree.c:427 ../scope/data/scope.glade.h:73 msgid "Line" msgstr "Ligne" @@ -65,6 +66,7 @@ msgstr "Ligne" #. * untranslated. #: ../addons/src/ao_tasks.c:434 ../debugger/src/vtree.c:201 #: ../devhelp/devhelp/dh-link.c:287 ../latex/src/bibtexlabels.c:68 +#: ../scope/data/scope.glade.h:79 msgid "Type" msgstr "Type" @@ -290,11 +292,11 @@ msgstr "" #: ../addons/src/addons.c:664 msgid "Show a calltip when hovering over a color value" -msgstr "" +msgstr "Afficher une infobulle au survol d'une couleur" #: ../addons/src/addons.c:670 msgid "Open Color Chooser when double-clicking a color value" -msgstr "" +msgstr "Ouvrir le sélecteur de couleur lors du double-clic sur une couleur" #: ../autoclose/src/autoclose.c:49 #, fuzzy @@ -647,15 +649,17 @@ msgid "Various debuggers integration." msgstr "Intégration de divers débogueurs." #: ../debugger/src/plugin.c:132 ../debugger/src/keys.c:75 -#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:228 +#: ../scope/data/scope.glade.h:145 ../scope/src/scope.c:228 msgid "Debug" msgstr "Déboguage" #: ../debugger/src/vtree.c:170 ../debugger/src/envtree.c:424 +#: ../scope/data/scope.glade.h:88 msgid "Name" msgstr "Nom" #: ../debugger/src/vtree.c:193 ../debugger/src/envtree.c:429 +#: ../scope/data/scope.glade.h:89 msgid "Value" msgstr "Valeur" @@ -697,7 +701,7 @@ msgstr "Supprimer la variable ?" msgid "Location" msgstr "Emplacement" -#: ../debugger/src/bptree.c:685 +#: ../debugger/src/bptree.c:685 ../scope/data/scope.glade.h:83 msgid "Condition" msgstr "Condition" @@ -770,13 +774,15 @@ msgid "Thread %i" msgstr "Thread %i" #: ../debugger/src/stree.c:395 ../latex/src/bibtexlabels.c:46 +#: ../scope/data/scope.glade.h:75 msgid "Address" msgstr "Adresse" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. #: ../debugger/src/stree.c:413 ../devhelp/devhelp/dh-link.c:267 +#: ../scope/data/scope.glade.h:74 msgid "Function" msgstr "Fonction" @@ -1357,6 +1363,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Appeler le visionneur de documentation sur le symbole courant.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanydoc/src/geanydoc.c:159 ../geanyvc/src/geanyvc.c:429 msgid "Could not parse the output of command" @@ -1882,6 +1891,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Insère ou remplit des colonnes avec des nombres.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." @@ -2217,7 +2229,7 @@ msgstr "Numéros de pages séparés par des virgules ou des double-tirets" #: ../latex/src/bibtexlabels.c:121 msgid "Name of publisher" -msgstr "" +msgstr "Nom de l'éditeur" #: ../latex/src/bibtexlabels.c:122 msgid "School where thesis was written" @@ -2946,6 +2958,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Écrire et exécuter des scripts Lua pour des commandes personnalisées.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanylua/glspi_ver.h:19 msgid "Lua Script Plugin" @@ -4212,6 +4227,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Chiffrement GPG pour Geany.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanypg/src/geanypg.c:40 msgid "Hans Alves <alves.h88(a)gmail.com>" @@ -4476,6 +4494,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Gestion de projet alternative.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanyprj/src/geanyprj.c:228 msgid "Find a text in geanyprj's project" @@ -4499,7 +4520,7 @@ msgstr "Nouveau projet" msgid "C_reate" msgstr "C_réer" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:135 msgid "Name:" msgstr "Nom :" @@ -4613,6 +4634,9 @@ msgid "" "This plugins is currently not developed actively. Would you like to help by " "contributing to this plugin?" msgstr "" +"Interface pour différents systèmes de gestion de versions.\n" +"Ce plugin n'est pas développé activement en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanyvc/src/geanyvc.c:488 #, c-format @@ -5169,7 +5193,7 @@ msgstr "Impossible d'enregistrer le fichier de configuration : %s" #: ../git-changebar/src/gcb-plugin.c:1491 msgid "Undo Git hunk" -msgstr "" +msgstr "Annuler le hunk Git" #: ../git-changebar/src/gcb-plugin.c:1499 msgid "Go to the previous hunk" @@ -5181,7 +5205,7 @@ msgstr "Aller au hunk suivant" #: ../git-changebar/src/gcb-plugin.c:1503 msgid "Undo hunk at the cursor position" -msgstr "" +msgstr "Annuler le hunk au niveau du curseur" #: ../git-changebar/src/gcb-plugin.c:1651 ../pohelper/src/gph-plugin.c:1390 #: ../pohelper/src/gph-plugin.c:1725 @@ -5240,9 +5264,8 @@ msgid "Remove _Unique Lines" msgstr "Supprimer les lignes _uniques" #: ../lineoperations/src/lineoperations.c:260 -#, fuzzy msgid "Keep _Unique Lines" -msgstr "Supprimer les lignes _uniques" +msgstr "Garder les lignes _uniques" #: ../lineoperations/src/lineoperations.c:263 msgid "Remove _Empty Lines" @@ -5604,7 +5627,7 @@ msgstr "" "Désactive l'overlay qui affiche la partie actuellement visible de l'éditeur " "par dessus la vue d'ensemble." -#: ../overview/data/prefs.ui.h:15 ../scope/data/scope.glade.h:109 +#: ../overview/data/prefs.ui.h:15 ../scope/data/scope.glade.h:130 msgid "Options" msgstr "Options" @@ -5854,6 +5877,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Formate un fichier XML pour le rendre lisible par des humains.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #. put the menu into the Tools #: ../pretty-printer/src/PluginEntry.c:125 @@ -6156,24 +6182,21 @@ msgstr "Débo_guer" #: ../scope/data/scope.glade.h:2 msgid "_Setup Program" -msgstr "" +msgstr "_Configurer le programme" #: ../scope/data/scope.glade.h:3 msgid "Recent _Programs" -msgstr "_Programmes récents" +msgstr "Programmes _récents" #: ../scope/data/scope.glade.h:4 -#, fuzzy msgid "_Run/Continue" -msgstr "Exécute_r / continuer" +msgstr "_Exécuter / continuer" #: ../scope/data/scope.glade.h:5 -#, fuzzy msgid "Run to _Cursor" msgstr "Exécuter jusqu'au _curseur" #: ../scope/data/scope.glade.h:6 -#, fuzzy msgid "Run to _Source" msgstr "Exécuter jusqu'à la _source" @@ -6191,141 +6214,125 @@ msgstr "" #: ../scope/data/scope.glade.h:10 msgid "_Terminate" -msgstr "" +msgstr "_Terminer" #: ../scope/data/scope.glade.h:11 -#, fuzzy msgid "Toggle _Breakpoint" -msgstr "Basculer le point d'arrêt" +msgstr "Ajouter / enlever le point d'_arrêt" #: ../scope/data/scope.glade.h:12 -#, fuzzy msgid "_GDB Command" msgstr "Commande _GDB" #: ../scope/data/scope.glade.h:13 -#, fuzzy msgid "_More" -msgstr "_Plus" +msgstr "P_lus" #: ../scope/data/scope.glade.h:14 -#, fuzzy msgid "_Show Terminal" msgstr "Afficher le _terminal" #: ../scope/data/scope.glade.h:15 -#, fuzzy msgid "_Reset Markers" msgstr "_Réinitialiser les marqueurs" #: ../scope/data/scope.glade.h:16 -#, fuzzy msgid "_Cleanup Files" -msgstr "Nettoyer les fichiers" +msgstr "Nettoyer les fi_chiers" #: ../scope/data/scope.glade.h:17 msgid "_Feed" -msgstr "" +msgstr "_Insérer un caractère" #: ../scope/data/scope.glade.h:18 -#, fuzzy msgid "_Window" msgstr "_Fenêtre" #: ../scope/data/scope.glade.h:19 msgid "_Auto Show" -msgstr "" +msgstr "_Afficher automatiquement" #: ../scope/data/scope.glade.h:20 msgid "Auto _Hide" -msgstr "" +msgstr "_Cacher automatiquement" #: ../scope/data/scope.glade.h:21 msgid "Show on _Error" -msgstr "" +msgstr "Afficher lors d'une _erreur" #: ../scope/data/scope.glade.h:22 msgid "_Unsorted" -msgstr "" +msgstr "_Non trié" #: ../scope/data/scope.glade.h:23 msgid "_View Source" -msgstr "" +msgstr "_Voir la source" #: ../scope/data/scope.glade.h:24 -#, fuzzy msgid "S_ynchronize" msgstr "S_ynchroniser" #: ../scope/data/scope.glade.h:25 -#, fuzzy msgid "_Interrupt" msgstr "_Interrompre" #: ../scope/data/scope.glade.h:26 -#, fuzzy msgid "_Send Signal" msgstr "Envoyer un _signal" #: ../scope/data/scope.glade.h:27 msgid "S_elect on" -msgstr "" +msgstr "Sél_ectionner quand" #: ../scope/data/scope.glade.h:28 msgid "_Running" -msgstr "" +msgstr "_En cours d'exécution" #: ../scope/data/scope.glade.h:29 -#, fuzzy msgid "_Stopped" msgstr "_Arrêté" #: ../scope/data/scope.glade.h:30 msgid "_Exited" -msgstr "" +msgstr "_Terminé" #: ../scope/data/scope.glade.h:31 -#, fuzzy msgid "_Follow" -msgstr "Suivre" +msgstr "_Suivre" #: ../scope/data/scope.glade.h:32 -#, fuzzy msgid "_Columns" msgstr "_Colonnes" #: ../scope/data/scope.glade.h:33 -#, fuzzy msgid "Show _Group" msgstr "Afficher le _groupe" #: ../scope/data/scope.glade.h:34 msgid "Show _Core" -msgstr "" +msgstr "Afficher le _cœur" #: ../scope/data/scope.glade.h:35 msgid "Add _Break" -msgstr "" +msgstr "Ajouter un point d'_arrêt" #: ../scope/data/scope.glade.h:36 msgid "Add _Watch" msgstr "" #: ../scope/data/scope.glade.h:37 msgid "Apply on _Run" -msgstr "" +msgstr "Appliquer à l'_exécution" #: ../scope/data/scope.glade.h:38 msgid "_Show @entry" -msgstr "" +msgstr "Afficher @_entry" #: ../scope/data/scope.glade.h:39 -#, fuzzy msgid "Show _Address" -msgstr "Afficher l'adresse" +msgstr "Afficher l'_adresse" #: ../scope/data/scope.glade.h:40 -#, fuzzy msgid "_Modify" msgstr "_Modifier" @@ -6339,40 +6346,36 @@ msgid "_Inspect" msgstr "_Inspecter" #: ../scope/data/scope.glade.h:43 -#, fuzzy msgid "_8-bit mode" -msgstr "mode _8 bits" +msgstr "Mode _8 bits" #: ../scope/data/scope.glade.h:44 -#, fuzzy msgid "_Default" msgstr "Par _défaut" #: ../scope/data/scope.glade.h:45 -#, fuzzy msgid "_7 bit" msgstr "_7 bits" #: ../scope/data/scope.glade.h:46 msgid "_Locale" -msgstr "" +msgstr "_Locale" #: ../scope/data/scope.glade.h:47 msgid "_UTF-8" msgstr "_UTF-8" #: ../scope/data/scope.glade.h:48 -#, fuzzy msgid "_Show .names" -msgstr "Afficher le statut" +msgstr "Afficher les .noms" #: ../scope/data/scope.glade.h:49 msgid "R_ead" -msgstr "" +msgstr "Lir_e" #: ../scope/data/scope.glade.h:50 msgid "_Group by" -msgstr "" +msgstr "_Grouper par" #: ../scope/data/scope.glade.h:51 msgid "_1" @@ -6392,10 +6395,9 @@ msgstr "_8" #: ../scope/data/scope.glade.h:55 msgid "_Jump To" -msgstr "" +msgstr "_Aller à" #: ../scope/data/scope.glade.h:56 -#, fuzzy msgid "_Apply" msgstr "_Appliquer" @@ -6406,14 +6408,13 @@ msgstr "_Étendre" #: ../scope/data/scope.glade.h:59 msgid "_Natural" -msgstr "" +msgstr "_Naturel" #: ../scope/data/scope.glade.h:60 msgid "_Decimal" msgstr "_Décimal" #: ../scope/data/scope.glade.h:61 -#, fuzzy msgid "_Hex" msgstr "_Hexadécimal" @@ -6426,13 +6427,12 @@ msgid "_Binary" msgstr "_Binaire" #: ../scope/data/scope.glade.h:64 -#, fuzzy msgid "_Raw" msgstr "B_rut" #: ../scope/data/scope.glade.h:65 msgid "_Evaluate/Modify" -msgstr "" +msgstr "Évalu_er / modifier" #: ../scope/data/scope.glade.h:66 msgid "_Watch Expression" @@ -6441,315 +6441,350 @@ msgstr "" #: ../scope/data/scope.glade.h:67 #, fuzzy msgid "_Inspect Variable" -msgstr "_Inspecter les variables" +msgstr "_Inspecter la variable" #: ../scope/data/scope.glade.h:68 +msgid "Id" +msgstr "Id" + +#: ../scope/data/scope.glade.h:69 +msgid "Pid" +msgstr "Pid" + +#: ../scope/data/scope.glade.h:70 +msgid "Gid" +msgstr "Gid" + +#: ../scope/data/scope.glade.h:71 +msgid "State" +msgstr "Statut" + +#: ../scope/data/scope.glade.h:76 +msgid "Target Id" +msgstr "Id Cible" + +#: ../scope/data/scope.glade.h:77 +msgid "Core" +msgstr "Cœur" + +#: ../scope/data/scope.glade.h:78 msgid "Threads" msgstr "Threads" -#: ../scope/data/scope.glade.h:69 -#, fuzzy +#: ../scope/data/scope.glade.h:80 +msgid "Location or expr" +msgstr "Emplacement ou expression" + +#: ../scope/data/scope.glade.h:81 +msgid "Times" +msgstr "Fois" + +#: ../scope/data/scope.glade.h:82 +msgid "Ignore" +msgstr "Ignorer" + +#: ../scope/data/scope.glade.h:84 +msgid "Script" +msgstr "Script" + +#: ../scope/data/scope.glade.h:85 +msgid "#" +msgstr "#" + +#: ../scope/data/scope.glade.h:86 +msgid "Arguments" +msgstr "Arguments" + +#: ../scope/data/scope.glade.h:87 msgid "Stack" -msgstr "Pile" +msgstr "Stack" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:90 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:91 +msgid "Expression" +msgstr "Expression" + +#: ../scope/data/scope.glade.h:92 msgid "Watches" msgstr "" -#: ../scope/data/scope.glade.h:72 -#, fuzzy +#: ../scope/data/scope.glade.h:93 msgid "Memory" msgstr "Mémoire" -#: ../scope/data/scope.glade.h:73 -#, fuzzy +#: ../scope/data/scope.glade.h:94 msgid "Enter gdb command:" -msgstr "Insérer une commande GDB :" +msgstr "Commande GDB :" -#: ../scope/data/scope.glade.h:74 +#: ../scope/data/scope.glade.h:95 msgid "Convert _UTF-8 to locale" -msgstr "" +msgstr "Convertir l'_UTF-8 à la locale" -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:96 msgid "_Thread" msgstr "_Thread" -#: ../scope/data/scope.glade.h:76 -#, fuzzy +#: ../scope/data/scope.glade.h:97 msgid "_Group" msgstr "_Groupe" -#: ../scope/data/scope.glade.h:77 -#, fuzzy +# Ce n'est pas traduit intentionnellement car je n'ai pas trouvé de traduction +# commune, et le mot anglais est couramment utilisé. +# La "traduction" ici est pour changer le mnémonique qui entre en conflit avec +# "_Fermer" +#: ../scope/data/scope.glade.h:98 msgid "_Frame" -msgstr "Page" +msgstr "Fr_ame" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:99 msgid "Setup Program" -msgstr "" +msgstr "Configurer le programme" -#: ../scope/data/scope.glade.h:79 -#, fuzzy +#: ../scope/data/scope.glade.h:100 msgid "_Executable:" msgstr "_Exécutable :" -#: ../scope/data/scope.glade.h:80 -#, fuzzy +#: ../scope/data/scope.glade.h:101 msgid "_Arguments:" msgstr "_Arguments :" -#: ../scope/data/scope.glade.h:81 -#, fuzzy +#: ../scope/data/scope.glade.h:102 msgid "En_vironment:" -msgstr "En_vironnement :" +msgstr "Environne_ment :" -#: ../scope/data/scope.glade.h:82 -#, fuzzy +#: ../scope/data/scope.glade.h:103 msgid "_Working dir:" msgstr "Dossier de travail :" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:104 msgid "_Load script:" -msgstr "" +msgstr "_Sciprt de chargement :" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:105 msgid "Auto _run program/exit gdb" -msgstr "" +msgstr "_Démarrer le programme et quitter GDB automatiquement" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:106 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:107 msgid "_Temporary breakpoint on load at:" -msgstr "" +msgstr "Point d'arrêt _temporaire au chargement à :" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:108 #, fuzzy msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -"Supprimer tous les points d'arrêt, watches (?), inspects (?) et registres (?)" +"Supprimer tous les points d'arrêt, watches (?), inspects (?) et registres" -#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:521 -#, fuzzy +#: ../scope/data/scope.glade.h:109 ../scope/src/scope.c:521 msgid "Program" msgstr "Programme" -#: ../scope/data/scope.glade.h:89 +#: ../scope/data/scope.glade.h:110 msgid "Open on" -msgstr "" +msgstr "Ouvrir lors du" -#: ../scope/data/scope.glade.h:90 +#: ../scope/data/scope.glade.h:111 msgid "g_db load" -msgstr "" +msgstr "chargement de g_db" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:112 msgid "p_rogram start" -msgstr "" +msgstr "démarrage du p_rogramme" -#: ../scope/data/scope.glade.h:92 -#, fuzzy +#: ../scope/data/scope.glade.h:113 msgid "Update all _views" -msgstr "Mettre à jour toutes les _vues" +msgstr "Mettre à jour toutes les v_ues" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:114 #, fuzzy msgid "Panel" msgstr "Panneau" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:115 msgid "Default 8-bit text mode:" msgstr "Mode de texte 8-bit par défaut :" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:116 msgid "_7-bit \\nnn" -msgstr "" +msgstr "_7-bit \\nnn" -#: ../scope/data/scope.glade.h:96 -#, fuzzy +# Les 5 chaînes suivantes sont bizarres, car le plugin est mal fait : +# ils correspondent en gros à +# "Display member and argument names [as …]" +# avec des checkboxes pour "member" et "argument". +#: ../scope/data/scope.glade.h:117 msgid "Display" -msgstr "Affichage" +msgstr "Affichager les noms des" -#: ../scope/data/scope.glade.h:97 -#, fuzzy +#: ../scope/data/scope.glade.h:118 msgid "_member" -msgstr "_membre" +msgstr "_membres" -#: ../scope/data/scope.glade.h:98 -#, fuzzy +#: ../scope/data/scope.glade.h:119 msgid "and" -msgstr "et" +msgstr "et des" -#: ../scope/data/scope.glade.h:99 -#, fuzzy +#: ../scope/data/scope.glade.h:120 msgid "_argument" -msgstr "_argument" +msgstr "_arguments" -#: ../scope/data/scope.glade.h:100 -#, fuzzy +# ZWSP, voir plus haut +#: ../scope/data/scope.glade.h:121 msgid "names" -msgstr "noms" +msgstr "" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:122 msgid "Values" msgstr "Valeurs" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:123 +#, fuzzy msgid "E_xpand on apply" -msgstr "" +msgstr "Éten_dre lors de l'application" -#: ../scope/data/scope.glade.h:103 -#, fuzzy +#: ../scope/data/scope.glade.h:124 msgid "S_how" msgstr "Affic_her" -#: ../scope/data/scope.glade.h:104 -#, fuzzy +#: ../scope/data/scope.glade.h:125 msgid "children" msgstr "enfants" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:126 #, fuzzy msgid "Inspect" msgstr "Inspecter" -#: ../scope/data/scope.glade.h:106 -#, fuzzy +#: ../scope/data/scope.glade.h:127 msgid "Show =li_brary messages" msgstr "Afficher les messages =li_brary" -#: ../scope/data/scope.glade.h:107 -#, fuzzy +#: ../scope/data/scope.glade.h:128 msgid "Show _tooltips" -msgstr "Afficher les infobulles" +msgstr "Afficher les _infobulles" -#: ../scope/data/scope.glade.h:108 -#, fuzzy +#: ../scope/data/scope.glade.h:129 msgid "Others" msgstr "Autres" -#: ../scope/data/scope.glade.h:110 -#, fuzzy +#: ../scope/data/scope.glade.h:131 msgid "_Import" msgstr "_Importer" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:132 msgid "Enter assignment expression:" msgstr "" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:133 #, fuzzy msgid "Inspect" msgstr "Inspecter" -#: ../scope/data/scope.glade.h:113 -#, fuzzy +#: ../scope/data/scope.glade.h:134 msgid "Object:" msgstr "Objet :" -#: ../scope/data/scope.glade.h:115 -#, fuzzy +#: ../scope/data/scope.glade.h:136 msgid "-" msgstr "-" -#: ../scope/data/scope.glade.h:116 -#, fuzzy +#: ../scope/data/scope.glade.h:137 msgid "Frame:" -msgstr "Page :" +msgstr "Frame :" -#: ../scope/data/scope.glade.h:117 -#, fuzzy +#: ../scope/data/scope.glade.h:138 msgid "@" msgstr "@" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:139 +#, fuzzy msgid "_Apply on run" -msgstr "" +msgstr "_Appliquer à l'exécution" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:140 #, fuzzy msgid "Expand" -msgstr "Tout déplier" +msgstr "Étendre" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:141 #, fuzzy msgid "Start:" -msgstr "_Début :" +msgstr "Début :" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:142 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:143 msgid "_Expand on apply" msgstr "" -#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:521 -#, fuzzy +#: ../scope/data/scope.glade.h:144 ../scope/src/scope.c:521 msgid "Program Terminal" -msgstr "Terminal de déboguage" +msgstr "Terminal du programme" -#: ../scope/data/scope.glade.h:125 +#: ../scope/data/scope.glade.h:146 msgid "Registers" msgstr "Registres" -#: ../scope/src/break.c:97 +#: ../scope/src/break.c:101 #, fuzzy msgid "breakpoint" -msgstr "points d'arrêt" +msgstr "point d'arrêt" -#: ../scope/src/break.c:98 +#: ../scope/src/break.c:102 #, fuzzy msgid "hardware breakpoint" -msgstr "points d'arrêt matériels" +msgstr "point d'arrêt matériel" -#: ../scope/src/break.c:99 +#: ../scope/src/break.c:103 msgid "tracepoint" msgstr "" -#: ../scope/src/break.c:100 +#: ../scope/src/break.c:104 msgid "fast tracepoint" msgstr "" -#: ../scope/src/break.c:101 +#: ../scope/src/break.c:105 msgid "write watchpoint" msgstr "" -#: ../scope/src/break.c:104 +#: ../scope/src/break.c:108 msgid "access watchpoint" msgstr "" -#: ../scope/src/break.c:106 +#: ../scope/src/break.c:110 msgid "read watchpoint" msgstr "" -#: ../scope/src/break.c:108 +#: ../scope/src/break.c:112 msgid "catchpoint" msgstr "" -#: ../scope/src/break.c:135 ../scope/src/break.c:139 +#: ../scope/src/break.c:139 ../scope/src/break.c:143 msgid "CLI" msgstr "" -#: ../scope/src/break.c:136 +#: ../scope/src/break.c:140 msgid "unsupported MI" msgstr "" -#: ../scope/src/break.c:141 +#: ../scope/src/break.c:145 msgid "on load" msgstr "" -#: ../scope/src/break.c:142 -#, fuzzy +#: ../scope/src/break.c:146 msgid "Run to Cursor" msgstr "Exécuter jusqu'au curseur" -#: ../scope/src/break.c:1013 -#, fuzzy, c-format +#: ../scope/src/break.c:1017 +#, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" "\n" @@ -6759,31 +6794,29 @@ msgstr "" "\n" "Utilisez la liste de points d'arrêt pour supprimer le bon." -#: ../scope/src/break.c:1250 +#: ../scope/src/break.c:1254 #, c-format msgid ", %s" msgstr "" -#: ../scope/src/break.c:1276 +#: ../scope/src/break.c:1280 #, c-format msgid "func %s" msgstr "" -#: ../scope/src/break.c:1307 -#, fuzzy +#: ../scope/src/break.c:1311 msgid "Add Breakpoint" msgstr "Ajouter un point d'arrêt" -#: ../scope/src/break.c:1322 +#: ../scope/src/break.c:1326 msgid "Add Watchpoint" msgstr "" #: ../scope/src/conterm.c:109 msgid "Feed Terminal" -msgstr "" +msgstr "Envoyer au terminal" #: ../scope/src/conterm.c:109 -#, fuzzy msgid "Enter char # (0..255):" msgstr "Entrez le n° de caractère (0 à 255) :" @@ -6792,112 +6825,109 @@ msgstr "Entrez le n° de caractère (0 à 255) :" msgid "Scope: %s." msgstr "Portée : %s." -#: ../scope/src/debug.c:138 +#: ../scope/src/debug.c:142 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:362 +#: ../scope/src/debug.c:366 #, c-format msgid "GDB died unexpectedly with status %d." msgstr "GDB s'est terminé de façon inattendue avec le statut %d." -#: ../scope/src/debug.c:364 +#: ../scope/src/debug.c:368 msgid "Program terminated." msgstr "" -#: ../scope/src/debug.c:461 ../scope/src/utils.c:37 +#: ../scope/src/debug.c:465 ../scope/src/utils.c:41 #, c-format msgid "%s: %s." msgstr "%s : %s." -#: ../scope/src/debug.c:545 ../scope/src/thread.c:93 +#: ../scope/src/debug.c:549 ../scope/src/thread.c:97 #, c-format msgid "%s." msgstr "%s." -#: ../scope/src/inspect.c:66 +#: ../scope/src/inspect.c:70 msgid "..." msgstr "…" -#: ../scope/src/inspect.c:339 +#: ../scope/src/inspect.c:343 #, fuzzy msgid "invalid data" msgstr "données invalides" -#: ../scope/src/inspect.c:371 +#: ../scope/src/inspect.c:375 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:454 +#: ../scope/src/inspect.c:458 msgid "out of scope" msgstr "" -#: ../scope/src/inspect.c:627 +#: ../scope/src/inspect.c:631 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:292 +#: ../scope/src/memory.c:296 msgid "Read Memory" -msgstr "" +msgstr "Lire la mémoire" -#: ../scope/src/memory.c:396 +#: ../scope/src/memory.c:400 #, c-format msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:375 +#: ../scope/src/menu.c:379 msgid "Modify" -msgstr "" +msgstr "Modifier" -#: ../scope/src/menu.c:481 +#: ../scope/src/menu.c:485 +#, fuzzy msgid "Evaluate/modify" -msgstr "" +msgstr "Évaluer / modifier" -#: ../scope/src/menu.c:482 +#: ../scope/src/menu.c:486 msgid "Watch expression" msgstr "" -#: ../scope/src/menu.c:483 +#: ../scope/src/menu.c:487 #, fuzzy msgid "Inspect variable" msgstr "Inspecter la variable" -#: ../scope/src/parse.c:438 -#, fuzzy +#: ../scope/src/parse.c:442 msgid "Undefined GDB error." msgstr "Erreur GDB indéfinie." -#: ../scope/src/plugme.c:79 -#, fuzzy +#: ../scope/src/plugme.c:83 msgid "Select Folder" msgstr "Sélectionner un dossier" -#: ../scope/src/plugme.c:79 -#, fuzzy +#: ../scope/src/plugme.c:83 msgid "Select File" msgstr "Sélectionner un fichier" -#: ../scope/src/prefs.c:314 ../scope/src/utils.c:449 -#, fuzzy, c-format +#: ../scope/src/prefs.c:318 ../scope/src/utils.c:453 +#, c-format msgid "Scope: %s: %s." msgstr "Scope : %s : %s." -#: ../scope/src/prefs.c:319 -#, fuzzy +#: ../scope/src/prefs.c:323 msgid "Scope: created configuration file." msgstr "Scope : fichier de configuration créé." -#: ../scope/src/program.c:255 -#, c-format +#: ../scope/src/program.c:259 +#, c-format, fuzzy msgid "Loaded debug settings for %s." -msgstr "" +msgstr "Configurer les options de débogage pour %s." -#: ../scope/src/program.c:263 +#: ../scope/src/program.c:267 #, fuzzy, c-format msgid "Could not load debug settings file %s: %s." -msgstr "Impossible de charger le fichier « %s » : %s" +msgstr "Impossible de charger le fichier d'options de débogage %s : %s" -#: ../scope/src/program.c:383 +#: ../scope/src/program.c:387 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -6908,21 +6938,20 @@ msgstr "" "\n" "Continuer ?" -#: ../scope/src/program.c:419 +#: ../scope/src/program.c:423 #, fuzzy msgid "Delete all breakpoints, watches et cetera?" msgstr "Supprimer tous les points d'arrêt, watches (?), etc. ?" -#: ../scope/src/program.c:527 +#: ../scope/src/program.c:531 msgid "as _Name=value" -msgstr "" +msgstr "comme Nom=_valeur" -#: ../scope/src/program.c:528 +#: ../scope/src/program.c:532 msgid "as _Name = value" -msgstr "" +msgstr "comme Nom = _valeur" #: ../scope/src/scope.c:33 -#, fuzzy msgid "Scope Debugger" msgstr "Débogueur Scope" @@ -6932,49 +6961,43 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Interface relativement simple pour GDB.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../scope/src/scope.c:63 -#, fuzzy msgid "Setup program" msgstr "Configurer le programme" #: ../scope/src/scope.c:64 ../scope/src/scope.c:161 -#, fuzzy msgid "Run/continue" msgstr "Exécuter / continuer" #: ../scope/src/scope.c:66 ../scope/src/scope.c:163 -#, fuzzy msgid "Run to source" msgstr "Exécuter jusqu'à la source" #: ../scope/src/scope.c:70 ../scope/src/scope.c:167 -#, fuzzy msgid "Terminate" msgstr "Terminer" #: ../scope/src/scope.c:71 ../scope/src/scope.c:168 -#, fuzzy msgid "Toggle breakpoint" -msgstr "Ajouter / enlever un point d'arrêt" +msgstr "Ajouter ou enlever le point d'arrêt" #: ../scope/src/scope.c:73 ../scope/src/scope.c:76 -#, fuzzy msgid "GDB command" -msgstr "Commande de GDB" +msgstr "Commande GDB" #: ../scope/src/scope.c:74 -#, fuzzy msgid "Show terminal" msgstr "Afficher le terminal" #: ../scope/src/scope.c:228 -#, fuzzy msgid "Busy" msgstr "Occupé" #: ../scope/src/scope.c:228 -#, fuzzy msgid "Ready" msgstr "Prêt" @@ -6984,7 +7007,7 @@ msgstr "" #: ../scope/src/scope.c:229 msgid "Assem" -msgstr "" +msgstr "Assem" #: ../scope/src/scope.c:229 #, fuzzy @@ -7005,85 +7028,79 @@ msgid "Console" msgstr "Console" #: ../scope/src/scope.c:525 -#, fuzzy msgid "Debug Console" -msgstr "Console de déboguage" +msgstr "Console de débogage" -#: ../scope/src/thread.c:49 +#: ../scope/src/thread.c:53 #, c-format msgid "Thread group %s started." -msgstr "" +msgstr "Groupe de thread %s démarré." -#: ../scope/src/thread.c:64 +#: ../scope/src/thread.c:68 msgid "Thread group " -msgstr "" +msgstr "Groupe de thread " -#: ../scope/src/thread.c:84 +#: ../scope/src/thread.c:88 msgid " exited" -msgstr "" +msgstr " terminé" -#: ../scope/src/thread.c:87 +#: ../scope/src/thread.c:91 #, c-format msgid " with exit code %s" -msgstr "" +msgstr " avec le code de retour %s" -#: ../scope/src/thread.c:749 -#, fuzzy +#: ../scope/src/thread.c:753 msgid "Send Signal" msgstr "Envoyer un signal" -#: ../scope/src/thread.c:749 -#, fuzzy +#: ../scope/src/thread.c:753 msgid "Enter signal #:" msgstr "Saisissez le numéro de signal :" -#: ../scope/src/thread.c:789 +#: ../scope/src/thread.c:793 #, fuzzy msgid "Terminate Process" msgstr "Terminer le processus" -#: ../scope/src/thread.c:789 +#: ../scope/src/thread.c:793 #, fuzzy msgid "Enter exit code:" msgstr "Entrez le code de retour :" -#: ../scope/src/thread.c:892 +#: ../scope/src/thread.c:896 msgid "Running" msgstr "" -#: ../scope/src/thread.c:893 +#: ../scope/src/thread.c:897 #, fuzzy msgid "Stopped" msgstr "Stoppé" -#: ../scope/src/utils.c:45 -#, fuzzy, c-format +#: ../scope/src/utils.c:49 +#, c-format msgid "%s: %s" msgstr "%s : %s" -#: ../scope/src/utils.c:225 +#: ../scope/src/utils.c:229 #, fuzzy, c-format msgid "Scope: error reading [%s]." msgstr "Scope : erreur à la lecture [%s]." -#: ../scope/src/views.c:526 +#: ../scope/src/views.c:530 msgid "…" msgstr "…" -#: ../scope/src/views.c:549 -#, fuzzy +#: ../scope/src/views.c:553 msgid "_Send" msgstr "_Envoyer" -#: ../scope/src/views.c:549 -#, fuzzy +#: ../scope/src/views.c:553 msgid "_Busy" msgstr "_Occupé" -#: ../scope/src/views.c:558 -#, fuzzy +#: ../scope/src/views.c:562 msgid "GDB Command" -msgstr "Commande de GDB" +msgstr "Commande GDB" #: ../sendmail/src/sendmail.c:45 msgid "SendMail" @@ -7314,15 +7331,16 @@ msgid "_Directory to look for dictionary files:" msgstr "_Dossier où chercher les fichiers de dictionnaire :" #: ../spellcheck/src/scplugin.c:361 -#, fuzzy msgid "" "Read additional dictionary files from this directory. For now, this only " "works with hunspell dictionaries. With Enchant 2.0 or later, the " "dictionaries are searched in a subfolder called \"hunspell\". See the " "plugin's Help for details." msgstr "" "Lire les dictionnaires additionnels depuis ce dossier. Pour le moment cela " -"fonctionne uniquement pour les dictionnaires MySpell." +"fonctionne uniquement pour les dictionnaires hunspell. Avec Enchant 2.0 ou " +"plus récent, les dictionnaires sont cherchés dans un sous-dossier nommé " +"\"hunspell\". Consultez l'aide du plugin pour plus de détails." #: ../spellcheck/src/scplugin.c:394 msgid "Behavior" @@ -7393,6 +7411,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Déplacer une sélection vers la gauche ou la droite.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../shiftcolumn/src/shiftcolumn.c:357 ../shiftcolumn/src/shiftcolumn.c:378 msgid "Shift Left" @@ -7519,7 +7540,6 @@ msgid "Open _Terminal" msgstr "Ouvrir dans un _terminal" #: ../treebrowser/src/treebrowser.c:1235 -#, fuzzy msgid "Set as _Root" msgstr "Définir comme _racine" @@ -7532,14 +7552,12 @@ msgid "_Find in Files" msgstr "Rechercher dans les _fichiers" #: ../treebrowser/src/treebrowser.c:1252 -#, fuzzy msgid "N_ew Folder" -msgstr "Sélectionner un dossier" +msgstr "Nouveau _dossier" #: ../treebrowser/src/treebrowser.c:1256 -#, fuzzy msgid "_New File" -msgstr "NouveauFichier" +msgstr "_Nouveau fichier" #: ../treebrowser/src/treebrowser.c:1260 msgid "Rena_me" @@ -7556,32 +7574,26 @@ msgid "Clo_se Child Documents " msgstr "Fermer les documents enf_ants" #: ../treebrowser/src/treebrowser.c:1283 -#, fuzzy msgid "_Copy Full Path to Clipboard" msgstr "_Copier le chemin complet dans le presse-papier" #: ../treebrowser/src/treebrowser.c:1292 -#, fuzzy msgid "E_xpand All" -msgstr "Tout déplier" +msgstr "Tout _étendre" #: ../treebrowser/src/treebrowser.c:1296 -#, fuzzy msgid "Coll_apse All" msgstr "Tout re_plier" #: ../treebrowser/src/treebrowser.c:1303 -#, fuzzy msgid "Show Boo_kmarks" msgstr "Afficher les mar_que-pages" #: ../treebrowser/src/treebrowser.c:1308 -#, fuzzy msgid "Sho_w Hidden Files" msgstr "Aff_icher les fichiers cachés" #: ../treebrowser/src/treebrowser.c:1313 -#, fuzzy msgid "Show Tool_bars" msgstr "Afficher les _barres d'outils" @@ -7760,14 +7772,12 @@ msgid "Rename Object" msgstr "Renommer l'objet" #: ../treebrowser/src/treebrowser.c:2152 -#, fuzzy msgid "New File" -msgstr "NouveauFichier" +msgstr "Nouveau fichier" #: ../treebrowser/src/treebrowser.c:2154 -#, fuzzy msgid "New Folder" -msgstr "Sélectionner un dossier" +msgstr "Nouveau dossier" # Qu'est-ce que ça fait en pratique ? #: ../treebrowser/src/treebrowser.c:2158 @@ -8030,12 +8040,10 @@ msgid "Windows" msgstr "Fenêtres" #: ../workbench/src/dialogs.c:45 -#, fuzzy msgid "Create new file" -msgstr "Créer un _nouveau fichier" +msgstr "Créer un nouveau fichier" #: ../workbench/src/dialogs.c:80 -#, fuzzy msgid "Create new directory" msgstr "Créer un nouveau dossier" @@ -8201,7 +8209,9 @@ msgid "" "Could not create new file \"%s\":\n" "\n" "%s" -msgstr "Impossible de créer le nouveau fichier de plan de travail : %s" +msgstr "Impossible de créer le nouveau fichier « %s » :\n" +"\n" +"%s" #: ../workbench/src/popup_menu.c:616 msgid "_Add project..." @@ -8430,7 +8440,7 @@ msgstr "" #~ msgstr "Insère ou remplit des colonnes avec des nombres." #~ msgid "Write and run Lua scripts for custom commands." -#~ msgstr "Écrit et exécute des scripts Lua pour des commandes personnalisées." +#~ msgstr "Écrire et exécuter des scripts Lua pour des commandes personnalisées." #~ msgid "gpg encryption plugin for geany" #~ msgstr "Chiffrement GPG pour Geany" Modified: scope/data/scope.glade 56 lines changed, 28 insertions(+), 28 deletions(-) =================================================================== @@ -1591,7 +1591,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_id_column"> <property name="resizable">True</property> - <property name="title">Id</property> + <property name="title" translatable="yes">Id</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="thread_id"/> @@ -1604,7 +1604,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_pid_column"> <property name="resizable">True</property> - <property name="title">Pid</property> + <property name="title" translatable="yes">Pid</property> <property name="sort_column_id">3</property> <child> <object class="GtkCellRendererText" id="thread_pid"/> @@ -1617,7 +1617,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_group_id_column"> <property name="resizable">True</property> - <property name="title">Gid</property> + <property name="title" translatable="yes">Gid</property> <property name="sort_column_id">4</property> <child> <object class="GtkCellRendererText" id="thread_group_id"/> @@ -1630,7 +1630,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_state_column"> <property name="resizable">True</property> - <property name="title">State</property> + <property name="title" translatable="yes">State</property> <property name="sort_column_id">5</property> <child> <object class="GtkCellRendererText" id="thread_state"/> @@ -1643,7 +1643,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_base_name_column"> <property name="resizable">True</property> - <property name="title">File</property> + <property name="title" translatable="yes">File</property> <property name="expand">True</property> <property name="sort_column_id">1</property> <child> @@ -1657,7 +1657,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_line_column"> <property name="resizable">True</property> - <property name="title">Line</property> + <property name="title" translatable="yes">Line</property> <child> <object class="GtkCellRendererText" id="thread_line"/> <attributes> @@ -1669,7 +1669,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_func_column"> <property name="resizable">True</property> - <property name="title">Function</property> + <property name="title" translatable="yes">Function</property> <property name="expand">True</property> <property name="sort_column_id">7</property> <child> @@ -1683,7 +1683,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_addr_column"> <property name="resizable">True</property> - <property name="title">Address</property> + <property name="title" translatable="yes">Address</property> <property name="sort_column_id">8</property> <child> <object class="GtkCellRendererText" id="thread_addr"/> @@ -1696,7 +1696,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_target_id_column"> <property name="resizable">True</property> - <property name="title">Target Id</property> + <property name="title" translatable="yes">Target Id</property> <property name="expand">True</property> <property name="sort_column_id">9</property> <child> @@ -1710,7 +1710,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_core_column"> <property name="resizable">True</property> - <property name="title">Core</property> + <property name="title" translatable="yes">Core</property> <property name="sort_column_id">10</property> <child> <object class="GtkCellRendererText" id="thread_core"/> @@ -1752,7 +1752,7 @@ <child> <object class="GtkTreeViewColumn" id="break_type_column"> <property name="resizable">True</property> - <property name="title">Type</property> + <property name="title" translatable="yes">Type</property> <property name="sort_column_id">4</property> <child> <object class="GtkCellRendererText" id="break_type"/> @@ -1765,7 +1765,7 @@ <child> <object class="GtkTreeViewColumn" id="break_id_column"> <property name="resizable">True</property> - <property name="title">Id</property> + <property name="title" translatable="yes">Id</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="break_id"/> @@ -1790,7 +1790,7 @@ <child> <object class="GtkTreeViewColumn" id="break_display_column"> <property name="resizable">True</property> - <property name="title">Location or expr</property> + <property name="title" translatable="yes">Location or expr</property> <property name="expand">True</property> <property name="sort_column_id">15</property> <child> @@ -1804,7 +1804,7 @@ <child> <object class="GtkTreeViewColumn" id="break_addr_column"> <property name="resizable">True</property> - <property name="title">Address</property> + <property name="title" translatable="yes">Address</property> <property name="sort_column_id">8</property> <child> <object class="GtkCellRendererText" id="break_addr"/> @@ -1817,7 +1817,7 @@ <child> <object class="GtkTreeViewColumn" id="break_times_column"> <property name="resizable">True</property> - <property name="title">Times</property> + <property name="title" translatable="yes">Times</property> <property name="sort_column_id">9</property> <child> <object class="GtkCellRendererText" id="break_times"/> @@ -1830,7 +1830,7 @@ <child> <object class="GtkTreeViewColumn" id="break_ignore_column"> <property name="resizable">True</property> - <property name="title">Ignore</property> + <property name="title" translatable="yes">Ignore</property> <property name="sort_column_id">10</property> <child> <object class="GtkCellRendererText" id="break_ignore"/> @@ -1843,7 +1843,7 @@ <child> <object class="GtkTreeViewColumn" id="break_cond_column"> <property name="resizable">True</property> - <property name="title">Condition</property> + <property name="title" translatable="yes">Condition</property> <property name="expand">True</property> <property name="sort_column_id">11</property> <child> @@ -1857,7 +1857,7 @@ <child> <object class="GtkTreeViewColumn" id="break_script_column"> <property name="resizable">True</property> - <property name="title">Script</property> + <property name="title" translatable="yes">Script</property> <property name="expand">True</property> <property name="sort_column_id">12</property> <child> @@ -1898,7 +1898,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_id_column"> <property name="resizable">True</property> - <property name="title">#</property> + <property name="title" translatable="yes">#</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="stack_id"/> @@ -1911,7 +1911,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_base_name_column"> <property name="resizable">True</property> - <property name="title">File</property> + <property name="title" translatable="yes">File</property> <property name="expand">True</property> <property name="sort_column_id">1</property> <child> @@ -1925,7 +1925,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_line_column"> <property name="resizable">True</property> - <property name="title">Line</property> + <property name="title" translatable="yes">Line</property> <child> <object class="GtkCellRendererText" id="stack_line"/> <attributes> @@ -1937,7 +1937,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_func_column"> <property name="resizable">True</property> - <property name="title">Function</property> + <property name="title" translatable="yes">Function</property> <property name="expand">True</property> <property name="sort_column_id">4</property> <child> @@ -1951,7 +1951,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_args_column"> <property name="resizable">True</property> - <property name="title">Arguments</property> + <property name="title" translatable="yes">Arguments</property> <property name="expand">True</property> <property name="sort_column_id">5</property> <child> @@ -1965,7 +1965,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_addr_column"> <property name="resizable">True</property> - <property name="title">Address</property> + <property name="title" translatable="yes">Address</property> <property name="sort_column_id">6</property> <child> <object class="GtkCellRendererText" id="stack_addr"/> @@ -2018,7 +2018,7 @@ <child> <object class="GtkTreeViewColumn" id="local_name_column"> <property name="resizable">True</property> - <property name="title">Name</property> + <property name="title" translatable="yes">Name</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="local_name"/> @@ -2031,7 +2031,7 @@ <child> <object class="GtkTreeViewColumn" id="local_display_column"> <property name="resizable">True</property> - <property name="title">Value</property> + <property name="title" translatable="yes">Value</property> <property name="expand">True</property> <property name="sort_column_id">1</property> <child> @@ -2086,7 +2086,7 @@ <child> <object class="GtkTreeViewColumn" id="watch_expr_column"> <property name="resizable">True</property> - <property name="title">Expression</property> + <property name="title" translatable="yes">Expression</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="watch_expr"/> @@ -2099,7 +2099,7 @@ <child> <object class="GtkTreeViewColumn" id="watch_display_column"> <property name="resizable">True</property> - <property name="title">Value</property> + <property name="title" translatable="yes">Value</property> <property name="expand">True</property> <property name="sort_column_id">1</property> <child> Modified: scope/src/break.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <stdlib.h> #include <string.h> Modified: scope/src/debug.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <errno.h> #include <string.h> Modified: scope/src/inspect.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <stdlib.h> #include <string.h> Modified: scope/src/memory.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <stdlib.h> #include <string.h> Modified: scope/src/menu.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdlib.h> #include <string.h> #include <gdk/gdkkeysyms.h> Modified: scope/src/parse.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <stdlib.h> #include <string.h> Modified: scope/src/plugme.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <string.h> #include "geanyplugin.h" Modified: scope/src/prefs.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <errno.h> #include <string.h> Modified: scope/src/program.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <errno.h> #include <string.h> #include <unistd.h> Modified: scope/src/scope.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -166,7 +166,7 @@ static ToolItem toolbar_items[] = { STEP_OUT_KB, { "small_step_out_icon", "large_step_out_icon" }, NULL, N_("Step out") }, { TERMINATE_KB, { "small_terminate_icon", "large_terminate_icon" }, NULL, N_("Terminate") }, { BREAKPOINT_KB, { "small_breakpoint_icon", "large_breakpoint_icon", }, NULL, N_("Toggle breakpoint") }, - { -1, { NULL, NULL }, NULL } + { -1, { NULL, NULL }, NULL, NULL } }; static void on_toolbar_button_clicked(G_GNUC_UNUSED GtkToolButton *toolbutton, gpointer gdata) @@ -632,7 +632,7 @@ void plugin_init(G_GNUC_UNUSED GeanyData *gdata) GtkMenuItem *menu_item = GTK_MENU_ITEM(debug_menu_items[tool_item->index].widget); GtkToolItem *button = gtk_tool_button_new(NULL, gtk_menu_item_get_label(menu_item)); - gtk_widget_set_tooltip_text (GTK_WIDGET (button), tool_item->tooltip_text); + gtk_widget_set_tooltip_text (GTK_WIDGET (button), _(tool_item->tooltip_text)); gtk_tool_button_set_use_underline(GTK_TOOL_BUTTON(button), gtk_menu_item_get_use_underline(menu_item)); g_signal_connect(button, "clicked", G_CALLBACK(on_toolbar_button_clicked), Modified: scope/src/thread.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #define _WIN32_WINNT 0x0501 /* for DebugBreakProcess(), must be before any #include-s */ #include <ctype.h> Modified: scope/src/utils.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <errno.h> #include <limits.h> Modified: scope/src/views.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <string.h> #include <gdk/gdkkeysyms.h> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4f24b3: Update of the French translation
by Colomban Wendling 16 Feb '18

16 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 16 Feb 2018 05:00:37 UTC Commit: 4f24b357951cf23015017b648ef70310d1e56c64 https://github.com/geany/geany-plugins/commit/4f24b357951cf23015017b648ef70… Log Message: ----------- Update of the French translation Modified Paths: -------------- po/fr.po Modified: po/fr.po 626 lines changed, 318 insertions(+), 308 deletions(-) =================================================================== @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany-Plugins 1.30\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-11 17:41+0100\n" -"PO-Revision-Date: 2017-03-05 16:25+0100\n" +"POT-Creation-Date: 2018-02-14 23:05-0600\n" +"PO-Revision-Date: 2018-02-15 23:00-0600\n" "Last-Translator: Colomban Wendling <ban(a)herbesfolles.org>\n" "Language-Team: French <geany-i18n(a)uvena.de>\n" "Language: fr\n" @@ -52,11 +52,12 @@ msgid "_Hide Message Window" msgstr "Cac_her la fenêtre de messages" #: ../addons/src/ao_tasks.c:412 ../debugger/src/stree.c:420 +#: ../scope/data/scope.glade.h:72 msgid "File" msgstr "Fichier" #: ../addons/src/ao_tasks.c:423 ../debugger/src/bptree.c:702 -#: ../debugger/src/stree.c:427 +#: ../debugger/src/stree.c:427 ../scope/data/scope.glade.h:73 msgid "Line" msgstr "Ligne" @@ -65,6 +66,7 @@ msgstr "Ligne" #. * untranslated. #: ../addons/src/ao_tasks.c:434 ../debugger/src/vtree.c:201 #: ../devhelp/devhelp/dh-link.c:287 ../latex/src/bibtexlabels.c:68 +#: ../scope/data/scope.glade.h:79 msgid "Type" msgstr "Type" @@ -290,11 +292,11 @@ msgstr "" #: ../addons/src/addons.c:664 msgid "Show a calltip when hovering over a color value" -msgstr "" +msgstr "Afficher une infobulle au survol d'une couleur" #: ../addons/src/addons.c:670 msgid "Open Color Chooser when double-clicking a color value" -msgstr "" +msgstr "Ouvrir le sélecteur de couleur lors du double-clic sur une couleur" #: ../autoclose/src/autoclose.c:49 #, fuzzy @@ -647,15 +649,17 @@ msgid "Various debuggers integration." msgstr "Intégration de divers débogueurs." #: ../debugger/src/plugin.c:132 ../debugger/src/keys.c:75 -#: ../scope/data/scope.glade.h:124 ../scope/src/scope.c:228 +#: ../scope/data/scope.glade.h:145 ../scope/src/scope.c:228 msgid "Debug" msgstr "Déboguage" #: ../debugger/src/vtree.c:170 ../debugger/src/envtree.c:424 +#: ../scope/data/scope.glade.h:88 msgid "Name" msgstr "Nom" #: ../debugger/src/vtree.c:193 ../debugger/src/envtree.c:429 +#: ../scope/data/scope.glade.h:89 msgid "Value" msgstr "Valeur" @@ -697,7 +701,7 @@ msgstr "Supprimer la variable ?" msgid "Location" msgstr "Emplacement" -#: ../debugger/src/bptree.c:685 +#: ../debugger/src/bptree.c:685 ../scope/data/scope.glade.h:83 msgid "Condition" msgstr "Condition" @@ -770,13 +774,15 @@ msgid "Thread %i" msgstr "Thread %i" #: ../debugger/src/stree.c:395 ../latex/src/bibtexlabels.c:46 +#: ../scope/data/scope.glade.h:75 msgid "Address" msgstr "Adresse" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. #: ../debugger/src/stree.c:413 ../devhelp/devhelp/dh-link.c:267 +#: ../scope/data/scope.glade.h:74 msgid "Function" msgstr "Fonction" @@ -1357,6 +1363,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Appeler le visionneur de documentation sur le symbole courant.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanydoc/src/geanydoc.c:159 ../geanyvc/src/geanyvc.c:429 msgid "Could not parse the output of command" @@ -1882,6 +1891,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Insère ou remplit des colonnes avec des nombres.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanyinsertnum/src/insertnum.c:146 msgid "Counting..." @@ -2217,7 +2229,7 @@ msgstr "Numéros de pages séparés par des virgules ou des double-tirets" #: ../latex/src/bibtexlabels.c:121 msgid "Name of publisher" -msgstr "" +msgstr "Nom de l'éditeur" #: ../latex/src/bibtexlabels.c:122 msgid "School where thesis was written" @@ -2946,6 +2958,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Écrire et exécuter des scripts Lua pour des commandes personnalisées.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanylua/glspi_ver.h:19 msgid "Lua Script Plugin" @@ -4212,6 +4227,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Chiffrement GPG pour Geany.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanypg/src/geanypg.c:40 msgid "Hans Alves <alves.h88(a)gmail.com>" @@ -4476,6 +4494,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Gestion de projet alternative.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanyprj/src/geanyprj.c:228 msgid "Find a text in geanyprj's project" @@ -4499,7 +4520,7 @@ msgstr "Nouveau projet" msgid "C_reate" msgstr "C_réer" -#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:114 +#: ../geanyprj/src/menu.c:123 ../scope/data/scope.glade.h:135 msgid "Name:" msgstr "Nom :" @@ -4613,6 +4634,9 @@ msgid "" "This plugins is currently not developed actively. Would you like to help by " "contributing to this plugin?" msgstr "" +"Interface pour différents systèmes de gestion de versions.\n" +"Ce plugin n'est pas développé activement en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../geanyvc/src/geanyvc.c:488 #, c-format @@ -5169,7 +5193,7 @@ msgstr "Impossible d'enregistrer le fichier de configuration : %s" #: ../git-changebar/src/gcb-plugin.c:1491 msgid "Undo Git hunk" -msgstr "" +msgstr "Annuler le hunk Git" #: ../git-changebar/src/gcb-plugin.c:1499 msgid "Go to the previous hunk" @@ -5181,7 +5205,7 @@ msgstr "Aller au hunk suivant" #: ../git-changebar/src/gcb-plugin.c:1503 msgid "Undo hunk at the cursor position" -msgstr "" +msgstr "Annuler le hunk au niveau du curseur" #: ../git-changebar/src/gcb-plugin.c:1651 ../pohelper/src/gph-plugin.c:1390 #: ../pohelper/src/gph-plugin.c:1725 @@ -5240,9 +5264,8 @@ msgid "Remove _Unique Lines" msgstr "Supprimer les lignes _uniques" #: ../lineoperations/src/lineoperations.c:260 -#, fuzzy msgid "Keep _Unique Lines" -msgstr "Supprimer les lignes _uniques" +msgstr "Garder les lignes _uniques" #: ../lineoperations/src/lineoperations.c:263 msgid "Remove _Empty Lines" @@ -5604,7 +5627,7 @@ msgstr "" "Désactive l'overlay qui affiche la partie actuellement visible de l'éditeur " "par dessus la vue d'ensemble." -#: ../overview/data/prefs.ui.h:15 ../scope/data/scope.glade.h:109 +#: ../overview/data/prefs.ui.h:15 ../scope/data/scope.glade.h:130 msgid "Options" msgstr "Options" @@ -5854,6 +5877,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Formate un fichier XML pour le rendre lisible par des humains.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #. put the menu into the Tools #: ../pretty-printer/src/PluginEntry.c:125 @@ -6156,24 +6182,21 @@ msgstr "Débo_guer" #: ../scope/data/scope.glade.h:2 msgid "_Setup Program" -msgstr "" +msgstr "_Configurer le programme" #: ../scope/data/scope.glade.h:3 msgid "Recent _Programs" -msgstr "_Programmes récents" +msgstr "Programmes _récents" #: ../scope/data/scope.glade.h:4 -#, fuzzy msgid "_Run/Continue" -msgstr "Exécute_r / continuer" +msgstr "_Exécuter / continuer" #: ../scope/data/scope.glade.h:5 -#, fuzzy msgid "Run to _Cursor" msgstr "Exécuter jusqu'au _curseur" #: ../scope/data/scope.glade.h:6 -#, fuzzy msgid "Run to _Source" msgstr "Exécuter jusqu'à la _source" @@ -6191,141 +6214,125 @@ msgstr "" #: ../scope/data/scope.glade.h:10 msgid "_Terminate" -msgstr "" +msgstr "_Terminer" #: ../scope/data/scope.glade.h:11 -#, fuzzy msgid "Toggle _Breakpoint" -msgstr "Basculer le point d'arrêt" +msgstr "Ajouter / enlever le point d'_arrêt" #: ../scope/data/scope.glade.h:12 -#, fuzzy msgid "_GDB Command" msgstr "Commande _GDB" #: ../scope/data/scope.glade.h:13 -#, fuzzy msgid "_More" -msgstr "_Plus" +msgstr "P_lus" #: ../scope/data/scope.glade.h:14 -#, fuzzy msgid "_Show Terminal" msgstr "Afficher le _terminal" #: ../scope/data/scope.glade.h:15 -#, fuzzy msgid "_Reset Markers" msgstr "_Réinitialiser les marqueurs" #: ../scope/data/scope.glade.h:16 -#, fuzzy msgid "_Cleanup Files" -msgstr "Nettoyer les fichiers" +msgstr "Nettoyer les fi_chiers" #: ../scope/data/scope.glade.h:17 msgid "_Feed" -msgstr "" +msgstr "_Insérer un caractère" #: ../scope/data/scope.glade.h:18 -#, fuzzy msgid "_Window" msgstr "_Fenêtre" #: ../scope/data/scope.glade.h:19 msgid "_Auto Show" -msgstr "" +msgstr "_Afficher automatiquement" #: ../scope/data/scope.glade.h:20 msgid "Auto _Hide" -msgstr "" +msgstr "_Cacher automatiquement" #: ../scope/data/scope.glade.h:21 msgid "Show on _Error" -msgstr "" +msgstr "Afficher lors d'une _erreur" #: ../scope/data/scope.glade.h:22 msgid "_Unsorted" -msgstr "" +msgstr "_Non trié" #: ../scope/data/scope.glade.h:23 msgid "_View Source" -msgstr "" +msgstr "_Voir la source" #: ../scope/data/scope.glade.h:24 -#, fuzzy msgid "S_ynchronize" msgstr "S_ynchroniser" #: ../scope/data/scope.glade.h:25 -#, fuzzy msgid "_Interrupt" msgstr "_Interrompre" #: ../scope/data/scope.glade.h:26 -#, fuzzy msgid "_Send Signal" msgstr "Envoyer un _signal" #: ../scope/data/scope.glade.h:27 msgid "S_elect on" -msgstr "" +msgstr "Sél_ectionner quand" #: ../scope/data/scope.glade.h:28 msgid "_Running" -msgstr "" +msgstr "_En cours d'exécution" #: ../scope/data/scope.glade.h:29 -#, fuzzy msgid "_Stopped" msgstr "_Arrêté" #: ../scope/data/scope.glade.h:30 msgid "_Exited" -msgstr "" +msgstr "_Terminé" #: ../scope/data/scope.glade.h:31 -#, fuzzy msgid "_Follow" -msgstr "Suivre" +msgstr "_Suivre" #: ../scope/data/scope.glade.h:32 -#, fuzzy msgid "_Columns" msgstr "_Colonnes" #: ../scope/data/scope.glade.h:33 -#, fuzzy msgid "Show _Group" msgstr "Afficher le _groupe" #: ../scope/data/scope.glade.h:34 msgid "Show _Core" -msgstr "" +msgstr "Afficher le _cœur" #: ../scope/data/scope.glade.h:35 msgid "Add _Break" -msgstr "" +msgstr "Ajouter un point d'_arrêt" #: ../scope/data/scope.glade.h:36 msgid "Add _Watch" msgstr "" #: ../scope/data/scope.glade.h:37 msgid "Apply on _Run" -msgstr "" +msgstr "Appliquer à l'_exécution" #: ../scope/data/scope.glade.h:38 msgid "_Show @entry" -msgstr "" +msgstr "Afficher @_entry" #: ../scope/data/scope.glade.h:39 -#, fuzzy msgid "Show _Address" -msgstr "Afficher l'adresse" +msgstr "Afficher l'_adresse" #: ../scope/data/scope.glade.h:40 -#, fuzzy msgid "_Modify" msgstr "_Modifier" @@ -6339,40 +6346,36 @@ msgid "_Inspect" msgstr "_Inspecter" #: ../scope/data/scope.glade.h:43 -#, fuzzy msgid "_8-bit mode" -msgstr "mode _8 bits" +msgstr "Mode _8 bits" #: ../scope/data/scope.glade.h:44 -#, fuzzy msgid "_Default" msgstr "Par _défaut" #: ../scope/data/scope.glade.h:45 -#, fuzzy msgid "_7 bit" msgstr "_7 bits" #: ../scope/data/scope.glade.h:46 msgid "_Locale" -msgstr "" +msgstr "_Locale" #: ../scope/data/scope.glade.h:47 msgid "_UTF-8" msgstr "_UTF-8" #: ../scope/data/scope.glade.h:48 -#, fuzzy msgid "_Show .names" -msgstr "Afficher le statut" +msgstr "Afficher les .noms" #: ../scope/data/scope.glade.h:49 msgid "R_ead" -msgstr "" +msgstr "Lir_e" #: ../scope/data/scope.glade.h:50 msgid "_Group by" -msgstr "" +msgstr "_Grouper par" #: ../scope/data/scope.glade.h:51 msgid "_1" @@ -6392,10 +6395,9 @@ msgstr "_8" #: ../scope/data/scope.glade.h:55 msgid "_Jump To" -msgstr "" +msgstr "_Aller à" #: ../scope/data/scope.glade.h:56 -#, fuzzy msgid "_Apply" msgstr "_Appliquer" @@ -6406,14 +6408,13 @@ msgstr "_Étendre" #: ../scope/data/scope.glade.h:59 msgid "_Natural" -msgstr "" +msgstr "_Naturel" #: ../scope/data/scope.glade.h:60 msgid "_Decimal" msgstr "_Décimal" #: ../scope/data/scope.glade.h:61 -#, fuzzy msgid "_Hex" msgstr "_Hexadécimal" @@ -6426,13 +6427,12 @@ msgid "_Binary" msgstr "_Binaire" #: ../scope/data/scope.glade.h:64 -#, fuzzy msgid "_Raw" msgstr "B_rut" #: ../scope/data/scope.glade.h:65 msgid "_Evaluate/Modify" -msgstr "" +msgstr "Évalu_er / modifier" #: ../scope/data/scope.glade.h:66 msgid "_Watch Expression" @@ -6441,315 +6441,350 @@ msgstr "" #: ../scope/data/scope.glade.h:67 #, fuzzy msgid "_Inspect Variable" -msgstr "_Inspecter les variables" +msgstr "_Inspecter la variable" #: ../scope/data/scope.glade.h:68 +msgid "Id" +msgstr "Id" + +#: ../scope/data/scope.glade.h:69 +msgid "Pid" +msgstr "Pid" + +#: ../scope/data/scope.glade.h:70 +msgid "Gid" +msgstr "Gid" + +#: ../scope/data/scope.glade.h:71 +msgid "State" +msgstr "Statut" + +#: ../scope/data/scope.glade.h:76 +msgid "Target Id" +msgstr "Id Cible" + +#: ../scope/data/scope.glade.h:77 +msgid "Core" +msgstr "Cœur" + +#: ../scope/data/scope.glade.h:78 msgid "Threads" msgstr "Threads" -#: ../scope/data/scope.glade.h:69 -#, fuzzy +#: ../scope/data/scope.glade.h:80 +msgid "Location or expr" +msgstr "Emplacement ou expression" + +#: ../scope/data/scope.glade.h:81 +msgid "Times" +msgstr "Fois" + +#: ../scope/data/scope.glade.h:82 +msgid "Ignore" +msgstr "Ignorer" + +#: ../scope/data/scope.glade.h:84 +msgid "Script" +msgstr "Script" + +#: ../scope/data/scope.glade.h:85 +msgid "#" +msgstr "#" + +#: ../scope/data/scope.glade.h:86 +msgid "Arguments" +msgstr "Arguments" + +#: ../scope/data/scope.glade.h:87 msgid "Stack" -msgstr "Pile" +msgstr "Stack" -#: ../scope/data/scope.glade.h:70 +#: ../scope/data/scope.glade.h:90 msgid "Locals" msgstr "" -#: ../scope/data/scope.glade.h:71 +#: ../scope/data/scope.glade.h:91 +msgid "Expression" +msgstr "Expression" + +#: ../scope/data/scope.glade.h:92 msgid "Watches" msgstr "" -#: ../scope/data/scope.glade.h:72 -#, fuzzy +#: ../scope/data/scope.glade.h:93 msgid "Memory" msgstr "Mémoire" -#: ../scope/data/scope.glade.h:73 -#, fuzzy +#: ../scope/data/scope.glade.h:94 msgid "Enter gdb command:" -msgstr "Insérer une commande GDB :" +msgstr "Commande GDB :" -#: ../scope/data/scope.glade.h:74 +#: ../scope/data/scope.glade.h:95 msgid "Convert _UTF-8 to locale" -msgstr "" +msgstr "Convertir l'_UTF-8 à la locale" -#: ../scope/data/scope.glade.h:75 +#: ../scope/data/scope.glade.h:96 msgid "_Thread" msgstr "_Thread" -#: ../scope/data/scope.glade.h:76 -#, fuzzy +#: ../scope/data/scope.glade.h:97 msgid "_Group" msgstr "_Groupe" -#: ../scope/data/scope.glade.h:77 -#, fuzzy +# Ce n'est pas traduit intentionnellement car je n'ai pas trouvé de traduction +# commune, et le mot anglais est couramment utilisé. +# La "traduction" ici est pour changer le mnémonique qui entre en conflit avec +# "_Fermer" +#: ../scope/data/scope.glade.h:98 msgid "_Frame" -msgstr "Page" +msgstr "Fr_ame" -#: ../scope/data/scope.glade.h:78 +#: ../scope/data/scope.glade.h:99 msgid "Setup Program" -msgstr "" +msgstr "Configurer le programme" -#: ../scope/data/scope.glade.h:79 -#, fuzzy +#: ../scope/data/scope.glade.h:100 msgid "_Executable:" msgstr "_Exécutable :" -#: ../scope/data/scope.glade.h:80 -#, fuzzy +#: ../scope/data/scope.glade.h:101 msgid "_Arguments:" msgstr "_Arguments :" -#: ../scope/data/scope.glade.h:81 -#, fuzzy +#: ../scope/data/scope.glade.h:102 msgid "En_vironment:" -msgstr "En_vironnement :" +msgstr "Environne_ment :" -#: ../scope/data/scope.glade.h:82 -#, fuzzy +#: ../scope/data/scope.glade.h:103 msgid "_Working dir:" msgstr "Dossier de travail :" -#: ../scope/data/scope.glade.h:83 +#: ../scope/data/scope.glade.h:104 msgid "_Load script:" -msgstr "" +msgstr "_Sciprt de chargement :" -#: ../scope/data/scope.glade.h:84 +#: ../scope/data/scope.glade.h:105 msgid "Auto _run program/exit gdb" -msgstr "" +msgstr "_Démarrer le programme et quitter GDB automatiquement" -#: ../scope/data/scope.glade.h:85 +#: ../scope/data/scope.glade.h:106 msgid "_Non-stop mode" msgstr "" -#: ../scope/data/scope.glade.h:86 +#: ../scope/data/scope.glade.h:107 msgid "_Temporary breakpoint on load at:" -msgstr "" +msgstr "Point d'arrêt _temporaire au chargement à :" -#: ../scope/data/scope.glade.h:87 +#: ../scope/data/scope.glade.h:108 #, fuzzy msgid "_Delete all breakpoints, watches, inspects and registers" msgstr "" -"Supprimer tous les points d'arrêt, watches (?), inspects (?) et registres (?)" +"Supprimer tous les points d'arrêt, watches (?), inspects (?) et registres" -#: ../scope/data/scope.glade.h:88 ../scope/src/scope.c:521 -#, fuzzy +#: ../scope/data/scope.glade.h:109 ../scope/src/scope.c:521 msgid "Program" msgstr "Programme" -#: ../scope/data/scope.glade.h:89 +#: ../scope/data/scope.glade.h:110 msgid "Open on" -msgstr "" +msgstr "Ouvrir lors du" -#: ../scope/data/scope.glade.h:90 +#: ../scope/data/scope.glade.h:111 msgid "g_db load" -msgstr "" +msgstr "chargement de g_db" -#: ../scope/data/scope.glade.h:91 +#: ../scope/data/scope.glade.h:112 msgid "p_rogram start" -msgstr "" +msgstr "démarrage du p_rogramme" -#: ../scope/data/scope.glade.h:92 -#, fuzzy +#: ../scope/data/scope.glade.h:113 msgid "Update all _views" -msgstr "Mettre à jour toutes les _vues" +msgstr "Mettre à jour toutes les v_ues" -#: ../scope/data/scope.glade.h:93 +#: ../scope/data/scope.glade.h:114 #, fuzzy msgid "Panel" msgstr "Panneau" -#: ../scope/data/scope.glade.h:94 +#: ../scope/data/scope.glade.h:115 msgid "Default 8-bit text mode:" msgstr "Mode de texte 8-bit par défaut :" -#: ../scope/data/scope.glade.h:95 +#: ../scope/data/scope.glade.h:116 msgid "_7-bit \\nnn" -msgstr "" +msgstr "_7-bit \\nnn" -#: ../scope/data/scope.glade.h:96 -#, fuzzy +# Les 5 chaînes suivantes sont bizarres, car le plugin est mal fait : +# ils correspondent en gros à +# "Display member and argument names [as …]" +# avec des checkboxes pour "member" et "argument". +#: ../scope/data/scope.glade.h:117 msgid "Display" -msgstr "Affichage" +msgstr "Affichager les noms des" -#: ../scope/data/scope.glade.h:97 -#, fuzzy +#: ../scope/data/scope.glade.h:118 msgid "_member" -msgstr "_membre" +msgstr "_membres" -#: ../scope/data/scope.glade.h:98 -#, fuzzy +#: ../scope/data/scope.glade.h:119 msgid "and" -msgstr "et" +msgstr "et des" -#: ../scope/data/scope.glade.h:99 -#, fuzzy +#: ../scope/data/scope.glade.h:120 msgid "_argument" -msgstr "_argument" +msgstr "_arguments" -#: ../scope/data/scope.glade.h:100 -#, fuzzy +# ZWSP, voir plus haut +#: ../scope/data/scope.glade.h:121 msgid "names" -msgstr "noms" +msgstr "" -#: ../scope/data/scope.glade.h:101 +#: ../scope/data/scope.glade.h:122 msgid "Values" msgstr "Valeurs" -#: ../scope/data/scope.glade.h:102 +#: ../scope/data/scope.glade.h:123 +#, fuzzy msgid "E_xpand on apply" -msgstr "" +msgstr "Éten_dre lors de l'application" -#: ../scope/data/scope.glade.h:103 -#, fuzzy +#: ../scope/data/scope.glade.h:124 msgid "S_how" msgstr "Affic_her" -#: ../scope/data/scope.glade.h:104 -#, fuzzy +#: ../scope/data/scope.glade.h:125 msgid "children" msgstr "enfants" -#: ../scope/data/scope.glade.h:105 +#: ../scope/data/scope.glade.h:126 #, fuzzy msgid "Inspect" msgstr "Inspecter" -#: ../scope/data/scope.glade.h:106 -#, fuzzy +#: ../scope/data/scope.glade.h:127 msgid "Show =li_brary messages" msgstr "Afficher les messages =li_brary" -#: ../scope/data/scope.glade.h:107 -#, fuzzy +#: ../scope/data/scope.glade.h:128 msgid "Show _tooltips" -msgstr "Afficher les infobulles" +msgstr "Afficher les _infobulles" -#: ../scope/data/scope.glade.h:108 -#, fuzzy +#: ../scope/data/scope.glade.h:129 msgid "Others" msgstr "Autres" -#: ../scope/data/scope.glade.h:110 -#, fuzzy +#: ../scope/data/scope.glade.h:131 msgid "_Import" msgstr "_Importer" -#: ../scope/data/scope.glade.h:111 +#: ../scope/data/scope.glade.h:132 msgid "Enter assignment expression:" msgstr "" -#: ../scope/data/scope.glade.h:112 +#: ../scope/data/scope.glade.h:133 #, fuzzy msgid "Inspect" msgstr "Inspecter" -#: ../scope/data/scope.glade.h:113 -#, fuzzy +#: ../scope/data/scope.glade.h:134 msgid "Object:" msgstr "Objet :" -#: ../scope/data/scope.glade.h:115 -#, fuzzy +#: ../scope/data/scope.glade.h:136 msgid "-" msgstr "-" -#: ../scope/data/scope.glade.h:116 -#, fuzzy +#: ../scope/data/scope.glade.h:137 msgid "Frame:" -msgstr "Page :" +msgstr "Frame :" -#: ../scope/data/scope.glade.h:117 -#, fuzzy +#: ../scope/data/scope.glade.h:138 msgid "@" msgstr "@" -#: ../scope/data/scope.glade.h:118 +#: ../scope/data/scope.glade.h:139 +#, fuzzy msgid "_Apply on run" -msgstr "" +msgstr "_Appliquer à l'exécution" -#: ../scope/data/scope.glade.h:119 +#: ../scope/data/scope.glade.h:140 #, fuzzy msgid "Expand" -msgstr "Tout déplier" +msgstr "Étendre" -#: ../scope/data/scope.glade.h:120 +#: ../scope/data/scope.glade.h:141 #, fuzzy msgid "Start:" -msgstr "_Début :" +msgstr "Début :" -#: ../scope/data/scope.glade.h:121 +#: ../scope/data/scope.glade.h:142 msgid "Count:" msgstr "" -#: ../scope/data/scope.glade.h:122 +#: ../scope/data/scope.glade.h:143 msgid "_Expand on apply" msgstr "" -#: ../scope/data/scope.glade.h:123 ../scope/src/scope.c:521 -#, fuzzy +#: ../scope/data/scope.glade.h:144 ../scope/src/scope.c:521 msgid "Program Terminal" -msgstr "Terminal de déboguage" +msgstr "Terminal du programme" -#: ../scope/data/scope.glade.h:125 +#: ../scope/data/scope.glade.h:146 msgid "Registers" msgstr "Registres" -#: ../scope/src/break.c:97 +#: ../scope/src/break.c:101 #, fuzzy msgid "breakpoint" -msgstr "points d'arrêt" +msgstr "point d'arrêt" -#: ../scope/src/break.c:98 +#: ../scope/src/break.c:102 #, fuzzy msgid "hardware breakpoint" -msgstr "points d'arrêt matériels" +msgstr "point d'arrêt matériel" -#: ../scope/src/break.c:99 +#: ../scope/src/break.c:103 msgid "tracepoint" msgstr "" -#: ../scope/src/break.c:100 +#: ../scope/src/break.c:104 msgid "fast tracepoint" msgstr "" -#: ../scope/src/break.c:101 +#: ../scope/src/break.c:105 msgid "write watchpoint" msgstr "" -#: ../scope/src/break.c:104 +#: ../scope/src/break.c:108 msgid "access watchpoint" msgstr "" -#: ../scope/src/break.c:106 +#: ../scope/src/break.c:110 msgid "read watchpoint" msgstr "" -#: ../scope/src/break.c:108 +#: ../scope/src/break.c:112 msgid "catchpoint" msgstr "" -#: ../scope/src/break.c:135 ../scope/src/break.c:139 +#: ../scope/src/break.c:139 ../scope/src/break.c:143 msgid "CLI" msgstr "" -#: ../scope/src/break.c:136 +#: ../scope/src/break.c:140 msgid "unsupported MI" msgstr "" -#: ../scope/src/break.c:141 +#: ../scope/src/break.c:145 msgid "on load" msgstr "" -#: ../scope/src/break.c:142 -#, fuzzy +#: ../scope/src/break.c:146 msgid "Run to Cursor" msgstr "Exécuter jusqu'au curseur" -#: ../scope/src/break.c:1013 -#, fuzzy, c-format +#: ../scope/src/break.c:1017 +#, c-format msgid "" "There are two or more breakpoints at %s:%d.\n" "\n" @@ -6759,31 +6794,29 @@ msgstr "" "\n" "Utilisez la liste de points d'arrêt pour supprimer le bon." -#: ../scope/src/break.c:1250 +#: ../scope/src/break.c:1254 #, c-format msgid ", %s" msgstr "" -#: ../scope/src/break.c:1276 +#: ../scope/src/break.c:1280 #, c-format msgid "func %s" msgstr "" -#: ../scope/src/break.c:1307 -#, fuzzy +#: ../scope/src/break.c:1311 msgid "Add Breakpoint" msgstr "Ajouter un point d'arrêt" -#: ../scope/src/break.c:1322 +#: ../scope/src/break.c:1326 msgid "Add Watchpoint" msgstr "" #: ../scope/src/conterm.c:109 msgid "Feed Terminal" -msgstr "" +msgstr "Envoyer au terminal" #: ../scope/src/conterm.c:109 -#, fuzzy msgid "Enter char # (0..255):" msgstr "Entrez le n° de caractère (0 à 255) :" @@ -6792,112 +6825,109 @@ msgstr "Entrez le n° de caractère (0 à 255) :" msgid "Scope: %s." msgstr "Portée : %s." -#: ../scope/src/debug.c:138 +#: ../scope/src/debug.c:142 msgid "No breakpoints. Hanging." msgstr "" -#: ../scope/src/debug.c:362 +#: ../scope/src/debug.c:366 #, c-format msgid "GDB died unexpectedly with status %d." msgstr "GDB s'est terminé de façon inattendue avec le statut %d." -#: ../scope/src/debug.c:364 +#: ../scope/src/debug.c:368 msgid "Program terminated." msgstr "" -#: ../scope/src/debug.c:461 ../scope/src/utils.c:37 +#: ../scope/src/debug.c:465 ../scope/src/utils.c:41 #, c-format msgid "%s: %s." msgstr "%s : %s." -#: ../scope/src/debug.c:545 ../scope/src/thread.c:93 +#: ../scope/src/debug.c:549 ../scope/src/thread.c:97 #, c-format msgid "%s." msgstr "%s." -#: ../scope/src/inspect.c:66 +#: ../scope/src/inspect.c:70 msgid "..." msgstr "…" -#: ../scope/src/inspect.c:339 +#: ../scope/src/inspect.c:343 #, fuzzy msgid "invalid data" msgstr "données invalides" -#: ../scope/src/inspect.c:371 +#: ../scope/src/inspect.c:375 msgid "no children in range" msgstr "" -#: ../scope/src/inspect.c:454 +#: ../scope/src/inspect.c:458 msgid "out of scope" msgstr "" -#: ../scope/src/inspect.c:627 +#: ../scope/src/inspect.c:631 msgid "Duplicate inspect variable name." msgstr "" -#: ../scope/src/memory.c:292 +#: ../scope/src/memory.c:296 msgid "Read Memory" -msgstr "" +msgstr "Lire la mémoire" -#: ../scope/src/memory.c:396 +#: ../scope/src/memory.c:400 #, c-format msgid "Scope: pointer size > %d, Data disabled." msgstr "" -#: ../scope/src/menu.c:375 +#: ../scope/src/menu.c:379 msgid "Modify" -msgstr "" +msgstr "Modifier" -#: ../scope/src/menu.c:481 +#: ../scope/src/menu.c:485 +#, fuzzy msgid "Evaluate/modify" -msgstr "" +msgstr "Évaluer / modifier" -#: ../scope/src/menu.c:482 +#: ../scope/src/menu.c:486 msgid "Watch expression" msgstr "" -#: ../scope/src/menu.c:483 +#: ../scope/src/menu.c:487 #, fuzzy msgid "Inspect variable" msgstr "Inspecter la variable" -#: ../scope/src/parse.c:438 -#, fuzzy +#: ../scope/src/parse.c:442 msgid "Undefined GDB error." msgstr "Erreur GDB indéfinie." -#: ../scope/src/plugme.c:79 -#, fuzzy +#: ../scope/src/plugme.c:83 msgid "Select Folder" msgstr "Sélectionner un dossier" -#: ../scope/src/plugme.c:79 -#, fuzzy +#: ../scope/src/plugme.c:83 msgid "Select File" msgstr "Sélectionner un fichier" -#: ../scope/src/prefs.c:314 ../scope/src/utils.c:449 -#, fuzzy, c-format +#: ../scope/src/prefs.c:318 ../scope/src/utils.c:453 +#, c-format msgid "Scope: %s: %s." msgstr "Scope : %s : %s." -#: ../scope/src/prefs.c:319 -#, fuzzy +#: ../scope/src/prefs.c:323 msgid "Scope: created configuration file." msgstr "Scope : fichier de configuration créé." -#: ../scope/src/program.c:255 -#, c-format +#: ../scope/src/program.c:259 +#, c-format, fuzzy msgid "Loaded debug settings for %s." -msgstr "" +msgstr "Configurer les options de débogage pour %s." -#: ../scope/src/program.c:263 +#: ../scope/src/program.c:267 #, fuzzy, c-format msgid "Could not load debug settings file %s: %s." -msgstr "Impossible de charger le fichier « %s » : %s" +msgstr "Impossible de charger le fichier d'options de débogage %s : %s" -#: ../scope/src/program.c:383 +#: ../scope/src/program.c:387 #, fuzzy, c-format msgid "" "%s: %s.\n" @@ -6908,21 +6938,20 @@ msgstr "" "\n" "Continuer ?" -#: ../scope/src/program.c:419 +#: ../scope/src/program.c:423 #, fuzzy msgid "Delete all breakpoints, watches et cetera?" msgstr "Supprimer tous les points d'arrêt, watches (?), etc. ?" -#: ../scope/src/program.c:527 +#: ../scope/src/program.c:531 msgid "as _Name=value" -msgstr "" +msgstr "comme Nom=_valeur" -#: ../scope/src/program.c:528 +#: ../scope/src/program.c:532 msgid "as _Name = value" -msgstr "" +msgstr "comme Nom = _valeur" #: ../scope/src/scope.c:33 -#, fuzzy msgid "Scope Debugger" msgstr "Débogueur Scope" @@ -6932,49 +6961,43 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Interface relativement simple pour GDB.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../scope/src/scope.c:63 -#, fuzzy msgid "Setup program" msgstr "Configurer le programme" #: ../scope/src/scope.c:64 ../scope/src/scope.c:161 -#, fuzzy msgid "Run/continue" msgstr "Exécuter / continuer" #: ../scope/src/scope.c:66 ../scope/src/scope.c:163 -#, fuzzy msgid "Run to source" msgstr "Exécuter jusqu'à la source" #: ../scope/src/scope.c:70 ../scope/src/scope.c:167 -#, fuzzy msgid "Terminate" msgstr "Terminer" #: ../scope/src/scope.c:71 ../scope/src/scope.c:168 -#, fuzzy msgid "Toggle breakpoint" -msgstr "Ajouter / enlever un point d'arrêt" +msgstr "Ajouter ou enlever le point d'arrêt" #: ../scope/src/scope.c:73 ../scope/src/scope.c:76 -#, fuzzy msgid "GDB command" -msgstr "Commande de GDB" +msgstr "Commande GDB" #: ../scope/src/scope.c:74 -#, fuzzy msgid "Show terminal" msgstr "Afficher le terminal" #: ../scope/src/scope.c:228 -#, fuzzy msgid "Busy" msgstr "Occupé" #: ../scope/src/scope.c:228 -#, fuzzy msgid "Ready" msgstr "Prêt" @@ -6984,7 +7007,7 @@ msgstr "" #: ../scope/src/scope.c:229 msgid "Assem" -msgstr "" +msgstr "Assem" #: ../scope/src/scope.c:229 #, fuzzy @@ -7005,85 +7028,79 @@ msgid "Console" msgstr "Console" #: ../scope/src/scope.c:525 -#, fuzzy msgid "Debug Console" -msgstr "Console de déboguage" +msgstr "Console de débogage" -#: ../scope/src/thread.c:49 +#: ../scope/src/thread.c:53 #, c-format msgid "Thread group %s started." -msgstr "" +msgstr "Groupe de thread %s démarré." -#: ../scope/src/thread.c:64 +#: ../scope/src/thread.c:68 msgid "Thread group " -msgstr "" +msgstr "Groupe de thread " -#: ../scope/src/thread.c:84 +#: ../scope/src/thread.c:88 msgid " exited" -msgstr "" +msgstr " terminé" -#: ../scope/src/thread.c:87 +#: ../scope/src/thread.c:91 #, c-format msgid " with exit code %s" -msgstr "" +msgstr " avec le code de retour %s" -#: ../scope/src/thread.c:749 -#, fuzzy +#: ../scope/src/thread.c:753 msgid "Send Signal" msgstr "Envoyer un signal" -#: ../scope/src/thread.c:749 -#, fuzzy +#: ../scope/src/thread.c:753 msgid "Enter signal #:" msgstr "Saisissez le numéro de signal :" -#: ../scope/src/thread.c:789 +#: ../scope/src/thread.c:793 #, fuzzy msgid "Terminate Process" msgstr "Terminer le processus" -#: ../scope/src/thread.c:789 +#: ../scope/src/thread.c:793 #, fuzzy msgid "Enter exit code:" msgstr "Entrez le code de retour :" -#: ../scope/src/thread.c:892 +#: ../scope/src/thread.c:896 msgid "Running" msgstr "" -#: ../scope/src/thread.c:893 +#: ../scope/src/thread.c:897 #, fuzzy msgid "Stopped" msgstr "Stoppé" -#: ../scope/src/utils.c:45 -#, fuzzy, c-format +#: ../scope/src/utils.c:49 +#, c-format msgid "%s: %s" msgstr "%s : %s" -#: ../scope/src/utils.c:225 +#: ../scope/src/utils.c:229 #, fuzzy, c-format msgid "Scope: error reading [%s]." msgstr "Scope : erreur à la lecture [%s]." -#: ../scope/src/views.c:526 +#: ../scope/src/views.c:530 msgid "…" msgstr "…" -#: ../scope/src/views.c:549 -#, fuzzy +#: ../scope/src/views.c:553 msgid "_Send" msgstr "_Envoyer" -#: ../scope/src/views.c:549 -#, fuzzy +#: ../scope/src/views.c:553 msgid "_Busy" msgstr "_Occupé" -#: ../scope/src/views.c:558 -#, fuzzy +#: ../scope/src/views.c:562 msgid "GDB Command" -msgstr "Commande de GDB" +msgstr "Commande GDB" #: ../sendmail/src/sendmail.c:45 msgid "SendMail" @@ -7314,15 +7331,16 @@ msgid "_Directory to look for dictionary files:" msgstr "_Dossier où chercher les fichiers de dictionnaire :" #: ../spellcheck/src/scplugin.c:361 -#, fuzzy msgid "" "Read additional dictionary files from this directory. For now, this only " "works with hunspell dictionaries. With Enchant 2.0 or later, the " "dictionaries are searched in a subfolder called \"hunspell\". See the " "plugin's Help for details." msgstr "" "Lire les dictionnaires additionnels depuis ce dossier. Pour le moment cela " -"fonctionne uniquement pour les dictionnaires MySpell." +"fonctionne uniquement pour les dictionnaires hunspell. Avec Enchant 2.0 ou " +"plus récent, les dictionnaires sont cherchés dans un sous-dossier nommé " +"\"hunspell\". Consultez l'aide du plugin pour plus de détails." #: ../spellcheck/src/scplugin.c:394 msgid "Behavior" @@ -7393,6 +7411,9 @@ msgid "" "This plugin currently has no maintainer. Would you like to help by " "contributing to this plugin?" msgstr "" +"Déplacer une sélection vers la gauche ou la droite.\n" +"Ce plugin n'a pas de mainteneur en ce moment. Voudriez-vous aider en " +"contribuant à ce plugin ?" #: ../shiftcolumn/src/shiftcolumn.c:357 ../shiftcolumn/src/shiftcolumn.c:378 msgid "Shift Left" @@ -7519,7 +7540,6 @@ msgid "Open _Terminal" msgstr "Ouvrir dans un _terminal" #: ../treebrowser/src/treebrowser.c:1235 -#, fuzzy msgid "Set as _Root" msgstr "Définir comme _racine" @@ -7532,14 +7552,12 @@ msgid "_Find in Files" msgstr "Rechercher dans les _fichiers" #: ../treebrowser/src/treebrowser.c:1252 -#, fuzzy msgid "N_ew Folder" -msgstr "Sélectionner un dossier" +msgstr "Nouveau _dossier" #: ../treebrowser/src/treebrowser.c:1256 -#, fuzzy msgid "_New File" -msgstr "NouveauFichier" +msgstr "_Nouveau fichier" #: ../treebrowser/src/treebrowser.c:1260 msgid "Rena_me" @@ -7556,32 +7574,26 @@ msgid "Clo_se Child Documents " msgstr "Fermer les documents enf_ants" #: ../treebrowser/src/treebrowser.c:1283 -#, fuzzy msgid "_Copy Full Path to Clipboard" msgstr "_Copier le chemin complet dans le presse-papier" #: ../treebrowser/src/treebrowser.c:1292 -#, fuzzy msgid "E_xpand All" -msgstr "Tout déplier" +msgstr "Tout _étendre" #: ../treebrowser/src/treebrowser.c:1296 -#, fuzzy msgid "Coll_apse All" msgstr "Tout re_plier" #: ../treebrowser/src/treebrowser.c:1303 -#, fuzzy msgid "Show Boo_kmarks" msgstr "Afficher les mar_que-pages" #: ../treebrowser/src/treebrowser.c:1308 -#, fuzzy msgid "Sho_w Hidden Files" msgstr "Aff_icher les fichiers cachés" #: ../treebrowser/src/treebrowser.c:1313 -#, fuzzy msgid "Show Tool_bars" msgstr "Afficher les _barres d'outils" @@ -7760,14 +7772,12 @@ msgid "Rename Object" msgstr "Renommer l'objet" #: ../treebrowser/src/treebrowser.c:2152 -#, fuzzy msgid "New File" -msgstr "NouveauFichier" +msgstr "Nouveau fichier" #: ../treebrowser/src/treebrowser.c:2154 -#, fuzzy msgid "New Folder" -msgstr "Sélectionner un dossier" +msgstr "Nouveau dossier" # Qu'est-ce que ça fait en pratique ? #: ../treebrowser/src/treebrowser.c:2158 @@ -8030,12 +8040,10 @@ msgid "Windows" msgstr "Fenêtres" #: ../workbench/src/dialogs.c:45 -#, fuzzy msgid "Create new file" -msgstr "Créer un _nouveau fichier" +msgstr "Créer un nouveau fichier" #: ../workbench/src/dialogs.c:80 -#, fuzzy msgid "Create new directory" msgstr "Créer un nouveau dossier" @@ -8201,7 +8209,9 @@ msgid "" "Could not create new file \"%s\":\n" "\n" "%s" -msgstr "Impossible de créer le nouveau fichier de plan de travail : %s" +msgstr "Impossible de créer le nouveau fichier « %s » :\n" +"\n" +"%s" #: ../workbench/src/popup_menu.c:616 msgid "_Add project..." @@ -8430,7 +8440,7 @@ msgstr "" #~ msgstr "Insère ou remplit des colonnes avec des nombres." #~ msgid "Write and run Lua scripts for custom commands." -#~ msgstr "Écrit et exécute des scripts Lua pour des commandes personnalisées." +#~ msgstr "Écrire et exécuter des scripts Lua pour des commandes personnalisées." #~ msgid "gpg encryption plugin for geany" #~ msgstr "Chiffrement GPG pour Geany" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1771e3: scope: Add a missing initializer
by Colomban Wendling 16 Feb '18

16 Feb '18

1 0

[geany/geany-plugins] 480dcf: scope: Fix translation of several strings
by Colomban Wendling 16 Feb '18

16 Feb '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 16 Feb 2018 04:46:59 UTC Commit: 480dcf14f30c79a0c4e04ed0e6cf57ed6eb8f881 https://github.com/geany/geany-plugins/commit/480dcf14f30c79a0c4e04ed0e6cf5… Log Message: ----------- scope: Fix translation of several strings * Mark tree view columns as translatable. * Properly setup translation framework everywhere. Several strings were not actually translated because constants from config.h were missing. * Fix translating toolbar items tooltip. Modified Paths: -------------- scope/data/scope.glade scope/src/break.c scope/src/debug.c scope/src/inspect.c scope/src/memory.c scope/src/menu.c scope/src/parse.c scope/src/plugme.c scope/src/prefs.c scope/src/program.c scope/src/scope.c scope/src/thread.c scope/src/utils.c scope/src/views.c Modified: scope/data/scope.glade 56 lines changed, 28 insertions(+), 28 deletions(-) =================================================================== @@ -1591,7 +1591,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_id_column"> <property name="resizable">True</property> - <property name="title">Id</property> + <property name="title" translatable="yes">Id</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="thread_id"/> @@ -1604,7 +1604,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_pid_column"> <property name="resizable">True</property> - <property name="title">Pid</property> + <property name="title" translatable="yes">Pid</property> <property name="sort_column_id">3</property> <child> <object class="GtkCellRendererText" id="thread_pid"/> @@ -1617,7 +1617,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_group_id_column"> <property name="resizable">True</property> - <property name="title">Gid</property> + <property name="title" translatable="yes">Gid</property> <property name="sort_column_id">4</property> <child> <object class="GtkCellRendererText" id="thread_group_id"/> @@ -1630,7 +1630,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_state_column"> <property name="resizable">True</property> - <property name="title">State</property> + <property name="title" translatable="yes">State</property> <property name="sort_column_id">5</property> <child> <object class="GtkCellRendererText" id="thread_state"/> @@ -1643,7 +1643,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_base_name_column"> <property name="resizable">True</property> - <property name="title">File</property> + <property name="title" translatable="yes">File</property> <property name="expand">True</property> <property name="sort_column_id">1</property> <child> @@ -1657,7 +1657,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_line_column"> <property name="resizable">True</property> - <property name="title">Line</property> + <property name="title" translatable="yes">Line</property> <child> <object class="GtkCellRendererText" id="thread_line"/> <attributes> @@ -1669,7 +1669,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_func_column"> <property name="resizable">True</property> - <property name="title">Function</property> + <property name="title" translatable="yes">Function</property> <property name="expand">True</property> <property name="sort_column_id">7</property> <child> @@ -1683,7 +1683,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_addr_column"> <property name="resizable">True</property> - <property name="title">Address</property> + <property name="title" translatable="yes">Address</property> <property name="sort_column_id">8</property> <child> <object class="GtkCellRendererText" id="thread_addr"/> @@ -1696,7 +1696,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_target_id_column"> <property name="resizable">True</property> - <property name="title">Target Id</property> + <property name="title" translatable="yes">Target Id</property> <property name="expand">True</property> <property name="sort_column_id">9</property> <child> @@ -1710,7 +1710,7 @@ <child> <object class="GtkTreeViewColumn" id="thread_core_column"> <property name="resizable">True</property> - <property name="title">Core</property> + <property name="title" translatable="yes">Core</property> <property name="sort_column_id">10</property> <child> <object class="GtkCellRendererText" id="thread_core"/> @@ -1752,7 +1752,7 @@ <child> <object class="GtkTreeViewColumn" id="break_type_column"> <property name="resizable">True</property> - <property name="title">Type</property> + <property name="title" translatable="yes">Type</property> <property name="sort_column_id">4</property> <child> <object class="GtkCellRendererText" id="break_type"/> @@ -1765,7 +1765,7 @@ <child> <object class="GtkTreeViewColumn" id="break_id_column"> <property name="resizable">True</property> - <property name="title">Id</property> + <property name="title" translatable="yes">Id</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="break_id"/> @@ -1790,7 +1790,7 @@ <child> <object class="GtkTreeViewColumn" id="break_display_column"> <property name="resizable">True</property> - <property name="title">Location or expr</property> + <property name="title" translatable="yes">Location or expr</property> <property name="expand">True</property> <property name="sort_column_id">15</property> <child> @@ -1804,7 +1804,7 @@ <child> <object class="GtkTreeViewColumn" id="break_addr_column"> <property name="resizable">True</property> - <property name="title">Address</property> + <property name="title" translatable="yes">Address</property> <property name="sort_column_id">8</property> <child> <object class="GtkCellRendererText" id="break_addr"/> @@ -1817,7 +1817,7 @@ <child> <object class="GtkTreeViewColumn" id="break_times_column"> <property name="resizable">True</property> - <property name="title">Times</property> + <property name="title" translatable="yes">Times</property> <property name="sort_column_id">9</property> <child> <object class="GtkCellRendererText" id="break_times"/> @@ -1830,7 +1830,7 @@ <child> <object class="GtkTreeViewColumn" id="break_ignore_column"> <property name="resizable">True</property> - <property name="title">Ignore</property> + <property name="title" translatable="yes">Ignore</property> <property name="sort_column_id">10</property> <child> <object class="GtkCellRendererText" id="break_ignore"/> @@ -1843,7 +1843,7 @@ <child> <object class="GtkTreeViewColumn" id="break_cond_column"> <property name="resizable">True</property> - <property name="title">Condition</property> + <property name="title" translatable="yes">Condition</property> <property name="expand">True</property> <property name="sort_column_id">11</property> <child> @@ -1857,7 +1857,7 @@ <child> <object class="GtkTreeViewColumn" id="break_script_column"> <property name="resizable">True</property> - <property name="title">Script</property> + <property name="title" translatable="yes">Script</property> <property name="expand">True</property> <property name="sort_column_id">12</property> <child> @@ -1898,7 +1898,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_id_column"> <property name="resizable">True</property> - <property name="title">#</property> + <property name="title" translatable="yes">#</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="stack_id"/> @@ -1911,7 +1911,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_base_name_column"> <property name="resizable">True</property> - <property name="title">File</property> + <property name="title" translatable="yes">File</property> <property name="expand">True</property> <property name="sort_column_id">1</property> <child> @@ -1925,7 +1925,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_line_column"> <property name="resizable">True</property> - <property name="title">Line</property> + <property name="title" translatable="yes">Line</property> <child> <object class="GtkCellRendererText" id="stack_line"/> <attributes> @@ -1937,7 +1937,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_func_column"> <property name="resizable">True</property> - <property name="title">Function</property> + <property name="title" translatable="yes">Function</property> <property name="expand">True</property> <property name="sort_column_id">4</property> <child> @@ -1951,7 +1951,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_args_column"> <property name="resizable">True</property> - <property name="title">Arguments</property> + <property name="title" translatable="yes">Arguments</property> <property name="expand">True</property> <property name="sort_column_id">5</property> <child> @@ -1965,7 +1965,7 @@ <child> <object class="GtkTreeViewColumn" id="stack_addr_column"> <property name="resizable">True</property> - <property name="title">Address</property> + <property name="title" translatable="yes">Address</property> <property name="sort_column_id">6</property> <child> <object class="GtkCellRendererText" id="stack_addr"/> @@ -2018,7 +2018,7 @@ <child> <object class="GtkTreeViewColumn" id="local_name_column"> <property name="resizable">True</property> - <property name="title">Name</property> + <property name="title" translatable="yes">Name</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="local_name"/> @@ -2031,7 +2031,7 @@ <child> <object class="GtkTreeViewColumn" id="local_display_column"> <property name="resizable">True</property> - <property name="title">Value</property> + <property name="title" translatable="yes">Value</property> <property name="expand">True</property> <property name="sort_column_id">1</property> <child> @@ -2086,7 +2086,7 @@ <child> <object class="GtkTreeViewColumn" id="watch_expr_column"> <property name="resizable">True</property> - <property name="title">Expression</property> + <property name="title" translatable="yes">Expression</property> <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="watch_expr"/> @@ -2099,7 +2099,7 @@ <child> <object class="GtkTreeViewColumn" id="watch_display_column"> <property name="resizable">True</property> - <property name="title">Value</property> + <property name="title" translatable="yes">Value</property> <property name="expand">True</property> <property name="sort_column_id">1</property> <child> Modified: scope/src/break.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <stdlib.h> #include <string.h> Modified: scope/src/debug.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <errno.h> #include <string.h> Modified: scope/src/inspect.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <stdlib.h> #include <string.h> Modified: scope/src/memory.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <stdlib.h> #include <string.h> Modified: scope/src/menu.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdlib.h> #include <string.h> #include <gdk/gdkkeysyms.h> Modified: scope/src/parse.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <stdlib.h> #include <string.h> Modified: scope/src/plugme.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <string.h> #include "geanyplugin.h" Modified: scope/src/prefs.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <errno.h> #include <string.h> Modified: scope/src/program.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <errno.h> #include <string.h> #include <unistd.h> Modified: scope/src/scope.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -632,7 +632,7 @@ void plugin_init(G_GNUC_UNUSED GeanyData *gdata) GtkMenuItem *menu_item = GTK_MENU_ITEM(debug_menu_items[tool_item->index].widget); GtkToolItem *button = gtk_tool_button_new(NULL, gtk_menu_item_get_label(menu_item)); - gtk_widget_set_tooltip_text (GTK_WIDGET (button), tool_item->tooltip_text); + gtk_widget_set_tooltip_text (GTK_WIDGET (button), _(tool_item->tooltip_text)); gtk_tool_button_set_use_underline(GTK_TOOL_BUTTON(button), gtk_menu_item_get_use_underline(menu_item)); g_signal_connect(button, "clicked", G_CALLBACK(on_toolbar_button_clicked), Modified: scope/src/thread.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #define _WIN32_WINNT 0x0501 /* for DebugBreakProcess(), must be before any #include-s */ #include <ctype.h> Modified: scope/src/utils.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <errno.h> #include <limits.h> Modified: scope/src/views.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <ctype.h> #include <string.h> #include <gdk/gdkkeysyms.h> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits February 2018