Commits October 2009

commits@lists.geany.org

6 participants
121 discussions

SF.net SVN: geany:[4393] trunk
by ntrel＠users.sourceforge.net 30 Oct '09

30 Oct '09

Revision: 4393 http://geany.svn.sourceforge.net/geany/?rev=4393&view=rev Author: ntrel Date: 2009-10-30 14:09:46 +0000 (Fri, 30 Oct 2009) Log Message: ----------- Use typedef instead of pointer for widget_id function arguments. Modified Paths: -------------- trunk/ChangeLog trunk/src/stash.c trunk/src/stash.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-30 06:54:53 UTC (rev 4392) +++ trunk/ChangeLog 2009-10-30 14:09:46 UTC (rev 4393) @@ -1,3 +1,9 @@ +2009-10-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/stash.c, src/stash.h: + Use typedef instead of pointer for widget_id function arguments. + + 2009-10-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/pluginutils.c: Modified: trunk/src/stash.c =================================================================== --- trunk/src/stash.c 2009-10-30 06:54:53 UTC (rev 4392) +++ trunk/src/stash.c 2009-10-30 14:09:46 UTC (rev 4393) @@ -72,7 +72,7 @@ const gchar *key_name; gpointer default_value; GType widget_type; /* e.g. GTK_TYPE_TOGGLE_BUTTON */ - gpointer widget_id; /* can be GtkWidget or gchararray */ + GeanyWidgetID widget_id; /* (GtkWidget*) or (gchar*) */ gpointer fields; /* extra fields */ }; @@ -86,7 +86,7 @@ typedef struct EnumWidget { - gpointer widget_id; + GeanyWidgetID widget_id; gint enum_id; } EnumWidget; @@ -441,7 +441,7 @@ static GtkWidget * -get_widget(GtkWidget *owner, gpointer widget_id) +get_widget(GtkWidget *owner, GeanyWidgetID widget_id) { GtkWidget *widget = widget_id; @@ -588,7 +588,7 @@ static GeanyPrefEntry * add_widget_pref(GeanyPrefGroup *group, GType setting_type, gpointer setting, const gchar *key_name, gpointer default_value, - GType widget_type, gpointer widget_id) + GType widget_type, GeanyWidgetID widget_id) { GeanyPrefEntry *entry = add_pref(group, setting_type, setting, key_name, default_value); @@ -602,7 +602,7 @@ /* Used for GtkCheckButton or GtkToggleButton widgets. * @see stash_group_add_radio_buttons(). */ void stash_group_add_toggle_button(GeanyPrefGroup *group, gboolean *setting, - const gchar *key_name, gboolean default_value, gpointer widget_id) + const gchar *key_name, gboolean default_value, GeanyWidgetID widget_id) { add_widget_pref(group, G_TYPE_BOOLEAN, setting, key_name, GINT_TO_POINTER(default_value), GTK_TYPE_TOGGLE_BUTTON, widget_id); @@ -618,7 +618,7 @@ * @endcode */ void stash_group_add_radio_buttons(GeanyPrefGroup *group, gint *setting, const gchar *key_name, gint default_value, - gpointer widget_id, gint enum_id, ...) + GeanyWidgetID widget_id, gint enum_id, ...) { GeanyPrefEntry *entry = add_widget_pref(group, G_TYPE_INT, setting, key_name, GINT_TO_POINTER(default_value), @@ -663,7 +663,7 @@ void stash_group_add_spin_button_integer(GeanyPrefGroup *group, gint *setting, - const gchar *key_name, gint default_value, gpointer widget_id) + const gchar *key_name, gint default_value, GeanyWidgetID widget_id) { add_widget_pref(group, G_TYPE_INT, setting, key_name, GINT_TO_POINTER(default_value), GTK_TYPE_SPIN_BUTTON, widget_id); @@ -672,7 +672,7 @@ /* @see stash_group_add_combo_box_entry(). */ void stash_group_add_combo_box(GeanyPrefGroup *group, gint *setting, - const gchar *key_name, gint default_value, gpointer widget_id) + const gchar *key_name, gint default_value, GeanyWidgetID widget_id) { add_widget_pref(group, G_TYPE_INT, setting, key_name, GINT_TO_POINTER(default_value), GTK_TYPE_COMBO_BOX, widget_id); @@ -682,7 +682,7 @@ /* We could maybe also have something like stash_group_add_combo_box_entry_with_menu() * for the history list - or should that be stored as a separate setting? */ void stash_group_add_combo_box_entry(GeanyPrefGroup *group, gchar **setting, - const gchar *key_name, const gchar *default_value, gpointer widget_id) + const gchar *key_name, const gchar *default_value, GeanyWidgetID widget_id) { add_widget_pref(group, G_TYPE_STRING, setting, key_name, (gpointer)default_value, GTK_TYPE_COMBO_BOX_ENTRY, widget_id); @@ -690,7 +690,7 @@ void stash_group_add_entry(GeanyPrefGroup *group, gchar **setting, - const gchar *key_name, const gchar *default_value, gpointer widget_id) + const gchar *key_name, const gchar *default_value, GeanyWidgetID widget_id) { add_widget_pref(group, G_TYPE_STRING, setting, key_name, (gpointer)default_value, GTK_TYPE_ENTRY, widget_id); @@ -716,7 +716,7 @@ * @warning Currently only string GValue properties will be freed before setting; patch for * other types - see handle_widget_property(). */ void stash_group_add_widget_property(GeanyPrefGroup *group, gpointer setting, - const gchar *key_name, gpointer default_value, gpointer widget_id, + const gchar *key_name, gpointer default_value, GeanyWidgetID widget_id, const gchar *property_name, GType type) { if (!type) Modified: trunk/src/stash.h =================================================================== --- trunk/src/stash.h 2009-10-30 06:54:53 UTC (rev 4392) +++ trunk/src/stash.h 2009-10-30 14:09:46 UTC (rev 4393) @@ -29,7 +29,11 @@ typedef struct GeanyPrefGroup GeanyPrefGroup; +/* Can be (GtkWidget*) or (gchar*) depending on whether owner argument is used for + * stash_group_display/stash_group_update. */ +typedef gpointer GeanyWidgetID; + GeanyPrefGroup *stash_group_new(const gchar *name); void stash_group_set_write_once(GeanyPrefGroup *group, gboolean write_once); @@ -58,26 +62,26 @@ /* *** GTK-related functions *** */ void stash_group_add_toggle_button(GeanyPrefGroup *group, gboolean *setting, - const gchar *key_name, gboolean default_value, gpointer widget_id); + const gchar *key_name, gboolean default_value, GeanyWidgetID widget_id); void stash_group_add_radio_buttons(GeanyPrefGroup *group, gint *setting, const gchar *key_name, gint default_value, - gpointer widget_id, gint enum_id, ...) G_GNUC_NULL_TERMINATED; + GeanyWidgetID widget_id, gint enum_id, ...) G_GNUC_NULL_TERMINATED; void stash_group_add_spin_button_integer(GeanyPrefGroup *group, gint *setting, - const gchar *key_name, gint default_value, gpointer widget_id); + const gchar *key_name, gint default_value, GeanyWidgetID widget_id); void stash_group_add_combo_box(GeanyPrefGroup *group, gint *setting, - const gchar *key_name, gint default_value, gpointer widget_id); + const gchar *key_name, gint default_value, GeanyWidgetID widget_id); void stash_group_add_combo_box_entry(GeanyPrefGroup *group, gchar **setting, - const gchar *key_name, const gchar *default_value, gpointer widget_id); + const gchar *key_name, const gchar *default_value, GeanyWidgetID widget_id); void stash_group_add_entry(GeanyPrefGroup *group, gchar **setting, - const gchar *key_name, const gchar *default_value, gpointer widget_id); + const gchar *key_name, const gchar *default_value, GeanyWidgetID widget_id); void stash_group_add_widget_property(GeanyPrefGroup *group, gpointer setting, - const gchar *key_name, gpointer default_value, gpointer widget_id, + const gchar *key_name, gpointer default_value, GeanyWidgetID widget_id, const gchar *property_name, GType type); void stash_group_display(GeanyPrefGroup *group, GtkWidget *owner); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4392] trunk/po
by frlan＠users.sourceforge.net 30 Oct '09

30 Oct '09

Revision: 4392 http://geany.svn.sourceforge.net/geany/?rev=4392&view=rev Author: frlan Date: 2009-10-30 06:54:53 +0000 (Fri, 30 Oct 2009) Log Message: ----------- Update of Galician translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/gl.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-10-29 18:00:34 UTC (rev 4391) +++ trunk/po/ChangeLog 2009-10-30 06:54:53 UTC (rev 4392) @@ -1,3 +1,9 @@ +2009-10-30 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * gl.po: Update of Galician translation. Thanks to José Manuel + Castroagudín Silva. + + 2009-10-29 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * sl.po: Update of Slovenian translation. Thanks to Jože Klepec for providing. Modified: trunk/po/gl.po =================================================================== --- trunk/po/gl.po 2009-10-29 18:00:34 UTC (rev 4391) +++ trunk/po/gl.po 2009-10-30 06:54:53 UTC (rev 4392) @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-19 20:24+0200\n" -"PO-Revision-Date: 2009-10-19 00:17+0100\n" +"POT-Creation-Date: 2009-10-30 07:50+0100\n" +"PO-Revision-Date: 2009-10-30 03:03+0100\n" "Last-Translator: José Manuel Castroagudín Silva <chavescesures(a)gmail.com>\n" "Language-Team: Galician <proxecto(a)trasno.net>\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Un IDE rápido e lixeiro empregando GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:260 ../src/interface.c:1480 +#: ../geany.desktop.in.h:2 ../src/interface.c:280 ../src/interface.c:1618 msgid "Geany" msgstr "Geany" @@ -99,45 +99,45 @@ "gpl-2.0.txt para velo en liña." #. fall back to %d -#: ../src/build.c:582 +#: ../src/build.c:626 #, c-format msgid "failed to substitute %%p, no project active" msgstr "Produciuse un erro ao substituír %%p, non hai ningún proxecto activo" -#: ../src/build.c:620 +#: ../src/build.c:664 msgid "Process failed, no working directory" msgstr "Producíuse un erro, non hai ningún directorio de traballo" -#: ../src/build.c:646 +#: ../src/build.c:690 #, c-format msgid "%s (in directory: %s)" msgstr "%s (no directorio: %s)" -#: ../src/build.c:666 ../src/build.c:890 ../src/search.c:1412 +#: ../src/build.c:710 ../src/build.c:934 ../src/search.c:1412 #, c-format msgid "Process failed (%s)" msgstr "O proceso fallou (%s)" -#: ../src/build.c:736 +#: ../src/build.c:780 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Producíuse un erro ao cambiar o directorio de traballo a \"%s\"" -#: ../src/build.c:765 +#: ../src/build.c:809 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "" "Produciuse un erro ao executar \"%s\" (non se puido crear un script de " "inicio)" -#: ../src/build.c:819 +#: ../src/build.c:863 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Non se puido executar o ficheiro no ETV, probablemente porque conteña unha " "orde." -#: ../src/build.c:857 +#: ../src/build.c:901 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -146,107 +146,107 @@ "Non se puido atopar o terminal \"%s\" (comprobe a configuración de ruta para " "a ferramenta de terminal nas preferencias)" -#: ../src/build.c:1027 +#: ../src/build.c:1071 msgid "Compilation failed." msgstr "Fallou a compilación." -#: ../src/build.c:1041 +#: ../src/build.c:1085 msgid "Compilation finished successfully." msgstr "A compilación rematou correctamente." -#: ../src/build.c:1197 +#: ../src/build.c:1241 msgid "Custom Text" msgstr "Texto personalizado" -#: ../src/build.c:1198 +#: ../src/build.c:1242 msgid "Enter custom text here, all entered text is appended to the command." msgstr "" "Introduza texto personalizado aquí. Todo o texto introducido engadiráselle á " "orde." -#: ../src/build.c:1276 +#: ../src/build.c:1320 msgid "_Next Error" msgstr "Segui_nte erro" -#: ../src/build.c:1278 +#: ../src/build.c:1322 msgid "_Previous Error" msgstr "Erro _anterior" -#: ../src/build.c:1288 +#: ../src/build.c:1332 msgid "_Set Build Commands" msgstr "Definir as orde_s de compilación" -#: ../src/build.c:1554 ../src/toolbar.c:344 +#: ../src/build.c:1610 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Compilar o ficheiro actual" -#: ../src/build.c:1568 +#: ../src/build.c:1624 msgid "Build the current file with Make and the default target" msgstr "Construír o ficheiro actual con Make e o obxectivo predeterminado" -#: ../src/build.c:1570 +#: ../src/build.c:1626 msgid "Build the current file with Make and the specified target" msgstr "Construír o ficheiro actual con Make e o obxectivo especificado" -#: ../src/build.c:1572 +#: ../src/build.c:1628 msgid "Compile the current file with Make" msgstr "Compilar o ficheiro actual con Make" -#: ../src/build.c:1599 +#: ../src/build.c:1655 #, c-format msgid "Process could not be stopped (%s)." msgstr "O proceso non se puido deter (%s)." -#: ../src/build.c:1616 ../src/build.c:1628 +#: ../src/build.c:1672 ../src/build.c:1684 msgid "No more build errors." msgstr "Non hai máis erros de compilación." -#: ../src/build.c:1700 +#: ../src/build.c:1756 msgid "Item" msgstr "Elemento" -#: ../src/build.c:1701 ../src/symbols.c:636 +#: ../src/build.c:1757 ../src/symbols.c:639 msgid "Label" msgstr "Etiqueta" -#: ../src/build.c:1702 ../src/symbols.c:631 +#: ../src/build.c:1758 ../src/symbols.c:634 msgid "Command" msgstr "Orde" -#: ../src/build.c:1703 +#: ../src/build.c:1759 msgid "Working directory" msgstr "Directorio de traballo" -#: ../src/build.c:1704 +#: ../src/build.c:1760 msgid "Clear" msgstr "Limpar" -#: ../src/build.c:1806 ../src/build.c:1808 +#: ../src/build.c:1862 ../src/build.c:1864 #, c-format msgid "%s Commands" msgstr "Ordes para ficheiros %s" -#: ../src/build.c:1808 +#: ../src/build.c:1864 msgid "No Filetype" msgstr "sen tipo de ficheiro" -#: ../src/build.c:1816 ../src/build.c:1851 +#: ../src/build.c:1872 ../src/build.c:1907 msgid "Error Regular Expression:" msgstr "Expresión regular para os erros:" -#: ../src/build.c:1844 +#: ../src/build.c:1900 msgid "Non-Filetype Commands" msgstr "Ordes para os ficheiros sen tipo de ficheiro" -#: ../src/build.c:1874 +#: ../src/build.c:1930 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "Nota: o elemento 2 abre un diálogo e engade a resposta á orde." -#: ../src/build.c:1883 +#: ../src/build.c:1939 msgid "Execute Commands" msgstr "Ordes para executar" -#: ../src/build.c:1894 +#: ../src/build.c:1950 #, c-format msgid "" "%d, %e, %f, %p are substituted in command and directory fields, see manual " @@ -255,109 +255,109 @@ "%d, %e, %f, %p substitúense nos campos de orde e directorio. Vexa o manual " "para coñecer os detalles." -#: ../src/build.c:2046 +#: ../src/build.c:2102 msgid "Set Build Commands" msgstr "Definir as ordes de compilación" -#: ../src/build.c:2310 ../src/build.c:2494 +#: ../src/build.c:2368 ../src/build.c:2553 msgid "_Execute" msgstr "_Executar" -#: ../src/build.c:2491 +#: ../src/build.c:2550 msgid "_Make" msgstr "_Make" #. build the code with make custom -#: ../src/build.c:2492 ../src/build.c:2545 +#: ../src/build.c:2551 ../src/build.c:2604 msgid "Make Custom _Target" msgstr "Make cun obxec_tivo personalizado" #. build the code with make object -#: ../src/build.c:2493 ../src/build.c:2553 +#: ../src/build.c:2552 ../src/build.c:2612 msgid "Make _Object" msgstr "Make (_obxecto)" #. build the code -#: ../src/build.c:2525 ../src/interface.c:967 +#: ../src/build.c:2584 ../src/interface.c:1069 msgid "_Build" msgstr "Constr_uír" #. build the code with make all -#: ../src/build.c:2537 +#: ../src/build.c:2596 msgid "_Make All" msgstr "Lanzar un _make all" #. arguments -#: ../src/build.c:2565 +#: ../src/build.c:2624 msgid "_Set Build Menu Commands" msgstr "Configurar a_s ordes do menú Construír" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:153 msgid "Do you really want to quit?" msgstr "Está seguro de que desexa saír?" -#: ../src/callbacks.c:471 ../src/document.c:2914 ../src/interface.c:331 +#: ../src/callbacks.c:481 ../src/document.c:2923 ../src/interface.c:351 #: ../src/sidebar.c:580 msgid "_Reload" msgstr "_Recargar" -#: ../src/callbacks.c:472 +#: ../src/callbacks.c:482 msgid "Any unsaved changes will be lost." msgstr "Perderase calquera cambio non gardado." -#: ../src/callbacks.c:473 +#: ../src/callbacks.c:483 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Está seguro de que recargar '%s'?" -#: ../src/callbacks.c:1260 ../src/keybindings.c:398 +#: ../src/callbacks.c:1270 ../src/keybindings.c:420 msgid "Go to Line" msgstr "Ir Á Liña" -#: ../src/callbacks.c:1260 +#: ../src/callbacks.c:1270 msgid "Enter the line you want to go to:" msgstr "Introduza a liña á que quere ir:" -#: ../src/callbacks.c:1357 ../src/callbacks.c:1382 +#: ../src/callbacks.c:1367 ../src/callbacks.c:1392 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Por favor configure o tipo de ficheiro do ficheiro actual antes de usar esta " "función." -#: ../src/callbacks.c:1494 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1504 ../src/ui_utils.c:544 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1496 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1506 ../src/ui_utils.c:545 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1498 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1508 ../src/ui_utils.c:546 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1500 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1510 ../src/ui_utils.c:555 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1502 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1512 ../src/ui_utils.c:556 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.aaaa hh:mm:ss" -#: ../src/callbacks.c:1504 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1514 ../src/ui_utils.c:557 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1506 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1516 ../src/ui_utils.c:566 msgid "_Use Custom Date Format" msgstr "_Usar un formato de data personalizado" -#: ../src/callbacks.c:1510 +#: ../src/callbacks.c:1520 msgid "Custom Date Format" msgstr "Formato de data personalizado" -#: ../src/callbacks.c:1511 +#: ../src/callbacks.c:1521 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -365,22 +365,22 @@ "Introduza aquí un formato de data e hora personalizado. Pode usar calquera " "modificador de conversión que se poida usar coa función strftime de ANSI C." -#: ../src/callbacks.c:1529 +#: ../src/callbacks.c:1539 msgid "Date format string could not be converted (possibly too long)." msgstr "" "A cadea de formato de data non se puido converter (posiblemente sexa moi " "longa)." -#: ../src/callbacks.c:1751 ../src/callbacks.c:1761 +#: ../src/callbacks.c:1753 ../src/callbacks.c:1763 msgid "No more message items." msgstr "Non hai máis elementos de mensaxe." #. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1651 +#: ../src/dialogs.c:140 ../src/prefs.c:1660 msgid "Open File" msgstr "Abrir ficheiro" -#: ../src/dialogs.c:144 ../src/interface.c:682 +#: ../src/dialogs.c:144 ../src/interface.c:784 msgid "_View" msgstr "_Ver" @@ -396,7 +396,7 @@ msgid "Detect by file extension" msgstr "Detectar pola extensión do ficheiro" -#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5122 +#: ../src/dialogs.c:196 ../src/interface.c:3648 ../src/interface.c:5166 msgid "Detect from file" msgstr "Detectar dende ficheiro" @@ -520,12 +520,12 @@ #: ../src/dialogs.c:1023 ../src/dialogs.c:1024 ../src/dialogs.c:1025 #: ../src/dialogs.c:1031 ../src/dialogs.c:1032 ../src/dialogs.c:1033 -#: ../src/symbols.c:1692 ../src/symbols.c:1713 ../src/symbols.c:1765 -#: ../src/ui_utils.c:216 +#: ../src/symbols.c:1691 ../src/symbols.c:1712 ../src/symbols.c:1764 +#: ../src/ui_utils.c:218 msgid "unknown" msgstr "descoñecido" -#: ../src/dialogs.c:1038 ../src/symbols.c:779 +#: ../src/dialogs.c:1038 ../src/symbols.c:782 msgid "Properties" msgstr "Propiedades" @@ -554,7 +554,7 @@ msgstr "Codificación:" #. BOM = byte order mark -#: ../src/dialogs.c:1137 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1137 ../src/ui_utils.c:221 msgid "(with BOM)" msgstr "(con marca de orde de bytes)" @@ -616,7 +616,7 @@ msgid "New file \"%s\" opened." msgstr "Abriuse o novo ficheiro \"%s\"." -#: ../src/document.c:941 ../src/document.c:1451 +#: ../src/document.c:941 ../src/document.c:1456 #, c-format msgid "Could not open file %s (%s)" msgstr "Non se puido abrir o ficheiro %s (%s)" @@ -650,30 +650,30 @@ "O ficheiro \"%s\" non parece un ficheiro de texto, ou ben a codificación do " "ficheiro non é compatíbel." -#: ../src/document.c:1150 +#: ../src/document.c:1155 msgid "Spaces" msgstr "Espazos" -#: ../src/document.c:1153 +#: ../src/document.c:1158 msgid "Tabs" msgstr "Tabulacións" -#: ../src/document.c:1156 +#: ../src/document.c:1161 msgid "Tabs and Spaces" msgstr "Tabulacións e espazos" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1161 +#: ../src/document.c:1166 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Estabelecendo o modo de indentación %s para %s" -#: ../src/document.c:1214 +#: ../src/document.c:1219 msgid "Invalid filename" msgstr "O nome do ficheiro non é válido" -#: ../src/document.c:1329 +#: ../src/document.c:1334 #, c-format msgid "File %s reloaded." msgstr "Recargouse o ficheiro %s." @@ -681,20 +681,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1334 +#: ../src/document.c:1339 #, c-format msgid "File %s opened(%d%s)." msgstr "Abriuse o ficheiro %s (%d%s)." -#: ../src/document.c:1336 +#: ../src/document.c:1341 msgid ", read-only" msgstr ", só lectura" -#: ../src/document.c:1546 +#: ../src/document.c:1551 msgid "Error renaming file." msgstr "Erro ao renomear o ficheiro." -#: ../src/document.c:1621 +#: ../src/document.c:1626 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -703,7 +703,7 @@ "Produciuse un erro mentres se convirtía o ficheiro de UTF-8 a \"%s\". O " "ficheiro queda sen gardar." -#: ../src/document.c:1643 +#: ../src/document.c:1648 #, c-format msgid "" "Error message: %s\n" @@ -712,52 +712,52 @@ "Mensaxe de erro: %s\n" "O erro produciuse en \"%s\" (liña: %d, columna: %d)." -#: ../src/document.c:1648 +#: ../src/document.c:1653 #, c-format msgid "Error message: %s." msgstr "Mensaxe de erro: %s" -#: ../src/document.c:1751 ../src/document.c:1814 +#: ../src/document.c:1756 ../src/document.c:1819 msgid "Error saving file." msgstr "Produciuse un erro ao gardar o ficheiro." -#: ../src/document.c:1813 +#: ../src/document.c:1818 #, c-format msgid "Error saving file (%s)." msgstr "Produciuse un erro ao gardar o ficheiro (%s)." -#: ../src/document.c:1838 +#: ../src/document.c:1843 #, c-format msgid "File %s saved." msgstr "Gardouse o ficheiro %s." -#: ../src/document.c:1906 ../src/document.c:1963 ../src/document.c:1971 +#: ../src/document.c:1911 ../src/document.c:1968 ../src/document.c:1976 #, c-format msgid "\"%s\" was not found." msgstr "Non se atopou \"%s\"." -#: ../src/document.c:1971 +#: ../src/document.c:1976 msgid "Wrap search and find again?" msgstr "Buscar ciclicamente e buscar de novo?" -#: ../src/document.c:2050 ../src/search.c:1085 ../src/search.c:1659 +#: ../src/document.c:2055 ../src/search.c:1085 ../src/search.c:1659 #: ../src/search.c:1660 #, c-format msgid "No matches found for \"%s\"." msgstr "Non se atoparon coincidencias para \"%s\"." -#: ../src/document.c:2061 ../src/document.c:2070 +#: ../src/document.c:2066 ../src/document.c:2075 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: substituiuse %d ocorrencia de \"%s\" por \"%s\"." msgstr[1] "%s: substituiuse %d ocorrencias de \"%s\" por \"%s\"." -#: ../src/document.c:2915 +#: ../src/document.c:2924 msgid "Do you want to reload it?" msgstr "Quere recargalo?" -#: ../src/document.c:2916 +#: ../src/document.c:2925 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -766,20 +766,20 @@ "O ficheiro '%s' no disco é máis recente que\n" "o búfer actual." -#: ../src/document.c:2937 +#: ../src/document.c:2946 msgid "Try to resave the file?" msgstr "Tentar volver a gardar o ficheiro?" -#: ../src/document.c:2938 +#: ../src/document.c:2947 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "O ficheiro \"%s\" non se atopou no disco!" -#: ../src/editor.c:4320 +#: ../src/editor.c:4357 msgid "Enter Tab Width" msgstr "Introduza o largo da tabulación" -#: ../src/editor.c:4321 +#: ../src/editor.c:4358 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Introduza a cantidade de espazos que deberían substituírse por un caracter " @@ -930,8 +930,8 @@ msgid "%s file" msgstr "Ficheiro %s" -#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3501 -#: ../src/interface.c:5041 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3567 +#: ../src/interface.c:5109 msgid "None" msgstr "Ningún" @@ -992,7 +992,7 @@ msgid "All files" msgstr "Todos os ficheiros" -#: ../src/filetypes.c:1469 +#: ../src/filetypes.c:1470 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expresión regular errónea para o tipo de ficheiro %s: %s" @@ -1001,465 +1001,517 @@ msgid "untitled" msgstr "Sen título" -#: ../src/interface.c:274 +#: ../src/interface.c:294 msgid "_File" msgstr "_Ficheiro" -#: ../src/interface.c:285 +#: ../src/interface.c:305 msgid "New (with _Template)" msgstr "Novo (con _modelo)" -#: ../src/interface.c:302 ../src/interface.c:1944 +#: ../src/interface.c:322 ../src/interface.c:2086 msgid "Open Selected F_ile" msgstr "Abrir o f_icheiro seleccionado" -#: ../src/interface.c:306 +#: ../src/interface.c:326 msgid "Recent _Files" msgstr "_Ficheiros recentes" -#: ../src/interface.c:323 +#: ../src/interface.c:343 msgid "Save A_ll" msgstr "Gardar _todos" -#: ../src/interface.c:339 +#: ../src/interface.c:359 msgid "R_eload As" msgstr "R_ecargar como" -#: ../src/interface.c:350 ../src/interface.c:528 ../src/interface.c:582 -#: ../src/interface.c:596 ../src/interface.c:842 ../src/interface.c:852 -#: ../src/interface.c:2022 ../src/interface.c:2076 ../src/interface.c:2090 +#: ../src/interface.c:370 ../src/interface.c:556 ../src/interface.c:676 +#: ../src/interface.c:690 ../src/interface.c:944 ../src/interface.c:954 +#: ../src/interface.c:2154 ../src/interface.c:2168 msgid "invisible" msgstr "invisible" -#: ../src/interface.c:367 +#: ../src/interface.c:387 msgid "Page Set_up" msgstr "Config_uración da páxina" -#: ../src/interface.c:384 ../src/notebook.c:213 +#: ../src/interface.c:404 ../src/notebook.c:213 msgid "Close Ot_her Documents" msgstr "Pec_har os outros documentos" -#: ../src/interface.c:392 ../src/notebook.c:218 +#: ../src/interface.c:412 ../src/notebook.c:218 msgid "C_lose All" msgstr "P_echar todos" -#: ../src/interface.c:409 +#: ../src/interface.c:429 msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:459 ../src/interface.c:1953 +#: ../src/interface.c:479 ../src/interface.c:2095 msgid "_Format" msgstr "_Formato" -#: ../src/interface.c:466 ../src/interface.c:1960 +#: ../src/interface.c:486 ../src/keybindings.c:364 +msgid "_Reflow Lines/Block" +msgstr "_Refacer o fluxo de liñas/bloque" + +#: ../src/interface.c:490 msgid "T_oggle Case of Selection" msgstr "Intercambiar a capitalizaci_ón da selección" -#: ../src/interface.c:475 ../src/interface.c:1969 +#: ../src/interface.c:494 ../src/keybindings.c:270 +msgid "_Transpose Current Line" +msgstr "_Traspor a liña actual" + +#: ../src/interface.c:503 msgid "_Comment Line(s)" msgstr "_Comentar liña(s)" -#: ../src/interface.c:479 ../src/interface.c:1973 +#: ../src/interface.c:507 msgid "U_ncomment Line(s)" msgstr "Descome_ntar liña(s)" -#: ../src/interface.c:483 ../src/interface.c:1977 +#: ../src/interface.c:511 msgid "_Toggle Line Commentation" msgstr "In_tercambiar o comentado de liña" -#: ../src/interface.c:487 ../src/interface.c:1981 -msgid "Du_plicate Line or Selection" -msgstr "Du_plicar liña ou selección" - -#: ../src/interface.c:496 ../src/interface.c:1990 +#: ../src/interface.c:520 msgid "_Increase Indent" msgstr "Aumentar a sangr_ía" -#: ../src/interface.c:504 ../src/interface.c:1998 +#: ../src/interface.c:528 msgid "_Decrease Indent" msgstr "_Diminuír a sangría" -#: ../src/interface.c:517 ../src/interface.c:2011 +#: ../src/interface.c:536 ../src/keybindings.c:354 +msgid "_Smart Line Indent" +msgstr "_Sangría intelixente de liñas" + +#: ../src/interface.c:545 msgid "_Send Selection to Terminal" msgstr "Enviar a _selección á terminal" -#: ../src/interface.c:521 ../src/interface.c:2015 +#: ../src/interface.c:549 msgid "_Send Selection to" msgstr "Enviar a _selección a" -#: ../src/interface.c:536 ../src/interface.c:2030 +#: ../src/interface.c:559 ../src/interface.c:2099 +msgid "_Commands" +msgstr "_Ordes" + +#: ../src/interface.c:566 ../src/keybindings.c:311 +msgid "Cut current line(s)" +msgstr "Cortar a(s) liña(s) actual(is)" + +#: ../src/interface.c:574 ../src/keybindings.c:308 +msgid "Copy current line(s)" +msgstr "Copiar a(s) liña(s) actual(is)" + +#: ../src/interface.c:582 ../src/keybindings.c:263 +msgid "Delete current line(s)" +msgstr "Borrar a(s) liña(s) actual(is)" + +#: ../src/interface.c:586 ../src/keybindings.c:260 +msgid "Duplicate line or selection" +msgstr "Duplicar a liña ou a selección" + +#: ../src/interface.c:595 ../src/keybindings.c:321 +msgid "Select current line(s)" +msgstr "Seleccionar a(s) liña(s) actual(is)" + +#: ../src/interface.c:599 ../src/keybindings.c:324 +msgid "Select current paragraph" +msgstr "Seleccionar o parágrafo actual" + +#: ../src/interface.c:608 ../src/keybindings.c:373 +msgid "Insert alternative white space" +msgstr "Inserir espazo en branco alternativo" + +#: ../src/interface.c:617 ../src/keybindings.c:429 +msgid "Go to next marker" +msgstr "Ir ao seguinte marcador" + +#: ../src/interface.c:621 ../src/keybindings.c:432 +msgid "Go to previous marker" +msgstr "Ir ao anterior marcador" + +#: ../src/interface.c:630 ../src/interface.c:2108 msgid "I_nsert Comments" msgstr "I_nserir comentarios" -#: ../src/interface.c:547 ../src/interface.c:2041 +#: ../src/interface.c:641 ../src/interface.c:2119 msgid "Insert _ChangeLog Entry" msgstr "Inserir entrada de rexistro de _cambios" -#: ../src/interface.c:551 ../src/interface.c:2045 +#: ../src/interface.c:645 ../src/interface.c:2123 msgid "Insert File _Header" msgstr "Inserir _cabeceira de ficheiro" -#: ../src/interface.c:555 ../src/interface.c:2049 +#: ../src/interface.c:649 ../src/interface.c:2127 msgid "Insert _Function Description" msgstr "Inserir descrición de _función" -#: ../src/interface.c:559 ../src/interface.c:2053 +#: ../src/interface.c:653 ../src/interface.c:2131 msgid "Insert _Multiline Comment" msgstr "Inserir comentario _multiliña" -#: ../src/interface.c:563 ../src/interface.c:2057 +#: ../src/interface.c:657 ../src/interface.c:2135 msgid "Insert _GPL Notice" msgstr "Inserir texto da _GPL" -#: ../src/interface.c:567 ../src/interface.c:2061 +#: ../src/interface.c:661 ../src/interface.c:2139 msgid "Insert _BSD License Notice" msgstr "Insertar texto da licenza _BSD" -#: ../src/interface.c:571 ../src/interface.c:2065 +#: ../src/interface.c:665 ../src/interface.c:2143 msgid "Insert Dat_e" msgstr "Inserir D_ata" -#: ../src/interface.c:585 ../src/interface.c:2079 +#: ../src/interface.c:679 ../src/interface.c:2157 msgid "_Insert \"include <...>\"" msgstr "_Inserir \"include <...>\"" -#: ../src/interface.c:604 +#: ../src/interface.c:698 msgid "Preference_s" msgstr "Preferencia_s" -#: ../src/interface.c:612 +#: ../src/interface.c:706 ../src/keybindings.c:382 +msgid "P_lugin Preferences" +msgstr "Preferencias dos p_lugins" + +#: ../src/interface.c:714 msgid "_Search" msgstr "Bu_scar" -#: ../src/interface.c:623 +#: ../src/interface.c:725 msgid "Find _Next" msgstr "Buscar _seguinte" -#: ../src/interface.c:627 +#: ../src/interface.c:729 msgid "Find _Previous" msgstr "Buscar _anterior" -#: ../src/interface.c:631 +#: ../src/interface.c:733 msgid "Find in F_iles" msgstr "Buscar en f_icheiros" -#: ../src/interface.c:635 ../src/search.c:524 +#: ../src/interface.c:737 ../src/search.c:524 msgid "_Replace" msgstr "Substituí_r" -#: ../src/interface.c:648 +#: ../src/interface.c:750 msgid "Find _Selected" msgstr "Buscar a _selección" -#: ../src/interface.c:652 +#: ../src/interface.c:754 msgid "Find Pre_vious Selected" msgstr "Buscar a selección pre_via" -#: ../src/interface.c:661 +#: ../src/interface.c:763 msgid "Next _Message" msgstr "Seguinte _mensaxe" -#: ../src/interface.c:665 +#: ../src/interface.c:767 msgid "Pr_evious Message" msgstr "Ant_erior mensaxe" -#: ../src/interface.c:674 ../src/interface.c:2131 +#: ../src/interface.c:776 ../src/interface.c:2209 msgid "_Go to Line" msgstr "_Ir á liña" -#: ../src/interface.c:689 +#: ../src/interface.c:791 msgid "Change _Font" msgstr "Cambiar tipo de _letra" -#: ../src/interface.c:702 +#: ../src/interface.c:804 msgid "To_ggle All Additional Widgets" msgstr "Intercambiar todos os wid_gets adicionais" -#: ../src/interface.c:706 +#: ../src/interface.c:808 msgid "Full_screen" msgstr "_Pantalla completa" -#: ../src/interface.c:710 +#: ../src/interface.c:812 msgid "Show Message _Window" msgstr "Mostrar a _xanela de mensaxes" -#: ../src/interface.c:715 +#: ../src/interface.c:817 msgid "Show _Toolbar" msgstr "Mostrar barra de ferramen_tas" -#: ../src/interface.c:720 +#: ../src/interface.c:822 msgid "Show Side_bar" msgstr "Mostrar _barra lateral" -#: ../src/interface.c:725 ../src/interface.c:3917 ../src/keybindings.c:252 +#: ../src/interface.c:827 ../src/interface.c:3983 ../src/keybindings.c:253 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:732 +#: ../src/interface.c:834 msgid "Show _Markers Margin" msgstr "Mostrar a marxe de _marcadores" -#: ../src/interface.c:737 +#: ../src/interface.c:839 msgid "Show _Line Numbers" msgstr "Mostrar números de _liña" -#: ../src/interface.c:742 +#: ../src/interface.c:844 msgid "Show _White Space" msgstr "Mostrar espazos en _branco" -#: ../src/interface.c:746 +#: ../src/interface.c:848 msgid "Show Line _Endings" msgstr "Mostrar finais d_e liña" -#: ../src/interface.c:750 +#: ../src/interface.c:852 msgid "Show _Indentation Guides" msgstr "Mostrar as gu_ías de sangría" -#: ../src/interface.c:771 +#: ../src/interface.c:873 msgid "_Document" msgstr "_Documento" -#: ../src/interface.c:778 +#: ../src/interface.c:880 msgid "_Line Wrapping" msgstr "Axuste de _liñas longas" -#: ../src/interface.c:783 +#: ../src/interface.c:885 msgid "Line _Breaking" msgstr "_Salto de liña" -#: ../src/interface.c:787 +#: ../src/interface.c:889 msgid "_Auto-indentation" msgstr "Sangría _automática" -#: ../src/interface.c:792 +#: ../src/interface.c:894 msgid "In_dent Type" msgstr "T_ipo de sangría" -#: ../src/interface.c:799 ../src/interface.c:3540 ../src/interface.c:5080 +#: ../src/interface.c:901 ../src/interface.c:3606 ../src/interface.c:5148 msgid "_Tabs" msgstr "_Tabulacións" -#: ../src/interface.c:805 ../src/interface.c:3531 ../src/interface.c:5071 +#: ../src/interface.c:907 ../src/interface.c:3597 ../src/interface.c:5139 msgid "_Spaces" msgstr "E_spazos" -#: ../src/interface.c:811 ../src/interface.c:3549 ../src/interface.c:5089 +#: ../src/interface.c:913 ../src/interface.c:3615 ../src/interface.c:5157 msgid "T_abs and Spaces" msgstr "T_abulacións e espazos" -#: ../src/interface.c:822 +#: ../src/interface.c:924 msgid "Read _Only" msgstr "S_ó lectura" -#: ../src/interface.c:826 +#: ../src/interface.c:928 msgid "_Write Unicode BOM" msgstr "_Escribir o BOM (marca de orde de bytes) unicode" -#: ../src/interface.c:835 +#: ../src/interface.c:937 msgid "Set File_type" msgstr "Configurar o _tipo de ficheiro" -#: ../src/interface.c:845 +#: ../src/interface.c:947 msgid "Set _Encoding" msgstr "Configurar a codificación de caract_eres" -#: ../src/interface.c:855 +#: ../src/interface.c:957 msgid "Set Line E_ndings" msgstr "Configurar os finais d_e liña" -#: ../src/interface.c:862 +#: ../src/interface.c:964 msgid "Convert and Set to _CR/LF (Win)" msgstr "Converter e configurar a _CR/LF (Win)" -#: ../src/interface.c:868 +#: ../src/interface.c:970 msgid "Convert and Set to _LF (Unix)" msgstr "Converter e configurar a _LF (Unix)" -#: ../src/interface.c:874 +#: ../src/interface.c:976 msgid "Convert and Set to CR (_Mac)" msgstr "Converter e configurar a CR (_Mac)" -#: ../src/interface.c:885 +#: ../src/interface.c:987 msgid "_Strip Trailing Spaces" msgstr "Quitar e_spazos do final" -#: ../src/interface.c:889 +#: ../src/interface.c:991 msgid "_Replace Tabs by Spaces" msgstr "Substituí_r tabulacións por espazos" -#: ../src/interface.c:893 +#: ../src/interface.c:995 msgid "Replace Spaces b_y Tabs" msgstr "Substituír espazos por _tabulacións" -#: ../src/interface.c:902 +#: ../src/interface.c:1004 msgid "_Fold All" msgstr "_Contraer todo" -#: ../src/interface.c:906 +#: ../src/interface.c:1008 msgid "_Unfold All" msgstr "_Expandir todo" -#: ../src/interface.c:915 +#: ../src/interface.c:1017 msgid "Remove _Markers" msgstr "Eliminar _marcadores" -#: ../src/interface.c:919 +#: ../src/interface.c:1021 msgid "Remove Error _Indicators" msgstr "Eliminar _indicadores de erro" -#: ../src/interface.c:923 +#: ../src/interface.c:1025 msgid "_Project" msgstr "_Proxecto" -#: ../src/interface.c:930 +#: ../src/interface.c:1032 msgid "_New" msgstr "_Novo" -#: ../src/interface.c:938 +#: ../src/interface.c:1040 msgid "_Open" msgstr "_Abrir" -#: ../src/interface.c:946 +#: ../src/interface.c:1048 msgid "_Recent Projects" msgstr "Proxectos _recentes" -#: ../src/interface.c:950 +#: ../src/interface.c:1052 msgid "_Close" msgstr "Pe_char" -#: ../src/interface.c:971 +#: ../src/interface.c:1073 msgid "_Tools" msgstr "Ferramen_tas" -#: ../src/interface.c:978 +#: ../src/interface.c:1080 msgid "_Reload Configuration" msgstr "_Recargar a configuración" -#: ../src/interface.c:986 +#: ../src/interface.c:1088 msgid "C_onfiguration Files" msgstr "Ficheiros de c_onfiguración" -#: ../src/interface.c:999 +#: ../src/interface.c:1101 msgid "_Color Chooser" msgstr "Selector de _cor" -#: ../src/interface.c:1007 +#: ../src/interface.c:1109 msgid "_Word Count" msgstr "Contar pala_bras" -#: ../src/interface.c:1011 +#: ../src/interface.c:1113 msgid "Load Ta_gs" msgstr "Car_gar etiquetas" -#: ../src/interface.c:1015 ../src/interface.c:1022 +#: ../src/interface.c:1117 ../src/interface.c:1124 msgid "_Help" msgstr "A_xuda" -#: ../src/interface.c:1030 +#: ../src/interface.c:1132 msgid "_Website" msgstr "Sitio _web" -#: ../src/interface.c:1034 +#: ../src/interface.c:1136 msgid "_Keyboard Shortcuts" msgstr "Atallos de t_eclado" -#: ../src/interface.c:1038 +#: ../src/interface.c:1140 msgid "_Debug Messages" msgstr "Mensaxes de _depuración" -#: ../src/interface.c:1077 ../src/sidebar.c:121 +#: ../src/interface.c:1179 ../src/sidebar.c:121 msgid "Symbols" msgstr "Símbolos" -#: ../src/interface.c:1091 +#: ../src/interface.c:1193 msgid "Documents" msgstr "Documentos" -#: ../src/interface.c:1127 +#: ../src/interface.c:1229 msgid "Status" msgstr "Estado" -#: ../src/interface.c:1141 +#: ../src/interface.c:1243 msgid "Compiler" msgstr "Compilador" -#: ../src/interface.c:1156 +#: ../src/interface.c:1258 msgid "Messages" msgstr "Mensaxes" -#: ../src/interface.c:1169 +#: ../src/interface.c:1271 msgid "Scribble" msgstr "Anotacións" -#: ../src/interface.c:1731 ../src/interface.c:3286 +#: ../src/interface.c:1889 ../src/interface.c:3352 msgid "Images _and Text" msgstr "Im_axes e texto" -#: ../src/interface.c:1736 ../src/interface.c:3318 +#: ../src/interface.c:1894 ../src/interface.c:3384 msgid "_Images Only" msgstr "Só _imaxes" -#: ../src/interface.c:1741 ../src/interface.c:3310 +#: ../src/interface.c:1899 ../src/interface.c:3376 msgid "_Text Only" msgstr "Só _texto" -#: ../src/interface.c:1752 ../src/interface.c:3302 +#: ../src/interface.c:1910 ../src/interface.c:3368 msgid "_Large Icons" msgstr "Iconas _grandes" -#: ../src/interface.c:1757 ../src/interface.c:3294 +#: ../src/interface.c:1915 ../src/interface.c:3360 msgid "_Small Icons" msgstr "Iconas _pequenas" -#: ../src/interface.c:1762 ../src/interface.c:3326 +#: ../src/interface.c:1920 ../src/interface.c:3392 msgid "_Very Small Icons" msgstr "Iconas _moi pequenas" -#: ../src/interface.c:1773 +#: ../src/interface.c:1931 msgid "_Customize Toolbar" msgstr "Personalizar a _barra de ferramentas" -#: ../src/interface.c:1781 +#: ../src/interface.c:1939 msgid "_Hide Toolbar" msgstr "O_cultar a barra de ferramentas" -#: ../src/interface.c:2098 +#: ../src/interface.c:2176 msgid "Find _Usage" msgstr "_Uso da busca" -#: ../src/interface.c:2106 +#: ../src/interface.c:2184 msgid "Find _Document Usage" msgstr "Uso da busca en _documentos" -#: ../src/interface.c:2114 +#: ../src/interface.c:2192 msgid "Go to _Tag Definition" msgstr "Ir á definición da e_tiqueta" -#: ../src/interface.c:2118 +#: ../src/interface.c:2196 msgid "Go to T_ag Declaration" msgstr "Ir á declaración da etiquet_a" -#: ../src/interface.c:2122 +#: ../src/interface.c:2200 msgid "Conte_xt Action" msgstr "Acción do conte_xto" -#: ../src/interface.c:2667 ../src/keybindings.c:359 +#: ../src/interface.c:2712 ../src/keybindings.c:379 msgid "Preferences" msgstr "Preferencias" -#: ../src/interface.c:2703 +#: ../src/interface.c:2748 msgid "Load files from the last session" msgstr "Cargar os ficheiros da última sesión" -#: ../src/interface.c:2706 +#: ../src/interface.c:2751 msgid "Opens at startup the files from the last session" msgstr "Abre os ficheiros da última sesión ao iniciar" -#: ../src/interface.c:2708 +#: ../src/interface.c:2753 msgid "Load virtual terminal support" msgstr "Cargar a compatibilidade co terminal virtual" -#: ../src/interface.c:2710 +#: ../src/interface.c:2755 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1467,39 +1519,39 @@ "Debe o emulador de terminal virtual (ETV) cargarse ao inicio? Desactíveo se " "non o precisa" -#: ../src/interface.c:2712 +#: ../src/interface.c:2757 msgid "Enable plugin support" msgstr "Activar compatibilidade con plugins" -#: ../src/interface.c:2716 +#: ../src/interface.c:2761 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:2735 +#: ../src/interface.c:2780 msgid "Save window position and geometry" msgstr "Gardar a posición e tamaño da xanela" -#: ../src/interface.c:2738 +#: ../src/interface.c:2783 msgid "Saves the window position and geometry and restores it at the start" msgstr "Garda a posición e xeometría da xanela e restáuraas ao inicio" -#: ../src/interface.c:2740 +#: ../src/interface.c:2785 msgid "Confirm exit" msgstr "Confirmar a saída" -#: ../src/interface.c:2743 +#: ../src/interface.c:2788 msgid "Shows a confirmation dialog on exit" msgstr "Mostra un diálogo de confirmación ao saír" -#: ../src/interface.c:2745 +#: ../src/interface.c:2790 msgid "Shutdown" msgstr "Apagar" -#: ../src/interface.c:2766 +#: ../src/interface.c:2811 msgid "Startup path:" msgstr "Ruta de inicio:" -#: ../src/interface.c:2778 +#: ../src/interface.c:2823 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1507,19 +1559,19 @@ "Ruta na que comezar ao abrir ou gardar ficheiros. Debe ser unha ruta " "absoluta. Déixeo en branco para usar o directorio de traballo actual." -#: ../src/interface.c:2791 +#: ../src/interface.c:2836 msgid "Project files:" msgstr "Ficheiros de proxecto:" -#: ../src/interface.c:2803 +#: ../src/interface.c:2848 msgid "Path to start in when opening project files" msgstr "Ruta na que comezar ao abrir ficheiros de proxecto" -#: ../src/interface.c:2816 +#: ../src/interface.c:2861 msgid "Extra plugin path:" msgstr "Ruta adicional para plugins:" -#: ../src/interface.c:2828 +#: ../src/interface.c:2873 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1529,19 +1581,19 @@ "directorio de configuración. Adicionalmente buscaranse plugins na ruta " "introducida aquí. Déixeo en branco para deshabilitar." -#: ../src/interface.c:2841 +#: ../src/interface.c:2886 msgid "Paths" msgstr "Rutas" -#: ../src/interface.c:2846 +#: ../src/interface.c:2891 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:2868 +#: ../src/interface.c:2913 msgid "Beep on errors or when compilation has finished" msgstr "Emitir un ton nos erros ou cando remate a compilación" -#: ../src/interface.c:2871 +#: ../src/interface.c:2916 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1549,11 +1601,11 @@ "Débese emitir un ton se ocorre un erro ou cando remate o proceso de " "compilación?" -#: ../src/interface.c:2873 +#: ../src/interface.c:2918 msgid "Switch to status message list at new message" msgstr "Cambiar á lista de mensaxes de estado en cada nova mensaxe" -#: ../src/interface.c:2876 +#: ../src/interface.c:2921 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1561,11 +1613,11 @@ "Cambiar ao separador de mensaxes de estado (na xanela do caderno de abaixo) " "se chega unha nova mensaxe de estado" -#: ../src/interface.c:2878 +#: ../src/interface.c:2923 msgid "Suppress status messages in the status bar" msgstr "Eliminar as mensaxes do inicio da barra de estado" -#: ../src/interface.c:2881 +#: ../src/interface.c:2926 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1573,11 +1625,11 @@ "Elimina todas as mensaxes da barra de estado. As mensaxes aínda se mostrarán " "na xanela de mensaxes de estado." -#: ../src/interface.c:2883 +#: ../src/interface.c:2928 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Enfocar automaticamente os widgets (o foco segue ao rato)" -#: ../src/interface.c:2886 +#: ../src/interface.c:2931 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1587,15 +1639,15 @@ "co widget proncipal do editor, as anotacións, a busca na barra de " "ferramentas e o ETV." -#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 +#: ../src/interface.c:2933 ../src/interface.c:3280 ../src/interface.c:4188 msgid "Miscellaneous" msgstr "Miscelánea" -#: ../src/interface.c:2908 +#: ../src/interface.c:2953 msgid "Always wrap search and hide the Find dialog" msgstr "Procurar sempre ciclicamente e ocultar o diálogo de procura" -#: ../src/interface.c:2911 +#: ../src/interface.c:2956 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1603,11 +1655,11 @@ "Procurar sempre ciclicamente no documento e ocultar o diálogo de procura " "despois de premer en procurar seguinte ou anterior" -#: ../src/interface.c:2913 +#: ../src/interface.c:2958 msgid "Use the current word under the cursor for Find dialogs" msgstr "Usar a palabra actual baixo o cursor para os diálogos de busca" -#: ../src/interface.c:2916 +#: ../src/interface.c:2961 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1615,19 +1667,19 @@ "Usar a palabra baixo o cursor cando se abren os diálogos de buscar, buscar " "en ficheiros ou Substiruír e non hai nada seleccionado" -#: ../src/interface.c:2918 +#: ../src/interface.c:2963 msgid "Use the current file's directory for Find in Files" msgstr "Usar o directorio do ficheiro actual para buscar en ficheiros" -#: ../src/interface.c:2922 +#: ../src/interface.c:2967 msgid "Search" msgstr "Busca" -#: ../src/interface.c:2941 +#: ../src/interface.c:2986 msgid "Use project-based session files" msgstr "Usar ficheiros de sesión baseados no proxecto" -#: ../src/interface.c:2944 +#: ../src/interface.c:2989 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1635,11 +1687,11 @@ "Débense gardar os ficheiros de sesión dun proxecto e abrilos cando se reabra " "o proxecto?" -#: ../src/interface.c:2946 +#: ../src/interface.c:2991 msgid "Store project file inside the project base directory" msgstr "Gardar o ficheiro de proxecto dentro do directorio base do proxecto" -#: ../src/interface.c:2949 +#: ../src/interface.c:2994 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1651,75 +1703,89 @@ "nun directorio por riba do directorio base. Aínda así pode cambiar a ruta do " "ficheiro de proxecto no diálogo de novo proxecto." -#: ../src/interface.c:2951 +#: ../src/interface.c:2996 msgid "Projects" msgstr "Proxectos" -#: ../src/interface.c:2956 +#: ../src/interface.c:3001 msgid "Miscellaneous" msgstr "Miscelánea" -#: ../src/interface.c:2960 +#: ../src/interface.c:3005 msgid "General" msgstr "Xeral" -#: ../src/interface.c:2983 +#: ../src/interface.c:3028 msgid "Show symbol list" msgstr "Mostrar a lista de símbolos" -#: ../src/interface.c:2986 +#: ../src/interface.c:3031 msgid "Toggle the symbol list on and off" msgstr "Activar ou desactivar a lista de símbolos" -#: ../src/interface.c:2988 +#: ../src/interface.c:3033 msgid "Show documents list" msgstr "Mostrar a lista de documentos" -#: ../src/interface.c:2991 +#: ../src/interface.c:3036 msgid "Toggle the documents list on and off" msgstr "Activar ou desactivar a lista de documentos" -#: ../src/interface.c:2993 +#: ../src/interface.c:3042 +msgid "Position:" +msgstr "Posición:" + +#: ../src/interface.c:3046 ../src/interface.c:3161 ../src/interface.c:3215 +#: ../src/interface.c:3233 ../src/interface.c:3251 +msgid "Left" +msgstr "Left" + +#: ../src/interface.c:3053 ../src/interface.c:3169 ../src/interface.c:3216 +#: ../src/interface.c:3234 ../src/interface.c:3252 +msgid "Right" +msgstr "Right" + +#: ../src/interface.c:3059 msgid "Sidebar" msgstr "Barra lateral" -#: ../src/interface.c:3014 +#: ../src/interface.c:3080 msgid "Symbol list:" msgstr "Lista de símbolos:" -#: ../src/interface.c:3021 ../src/interface.c:3136 +#: ../src/interface.c:3087 ../src/interface.c:3202 msgid "Message window:" msgstr "Xanela de mensaxes." -#: ../src/interface.c:3028 ../src/interface.c:3172 +#: ../src/interface.c:3094 ../src/interface.c:3238 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3040 +#: ../src/interface.c:3106 msgid "Sets the font for the message window" msgstr "Configura o tipo de letra para a xanela de mensaxes" -#: ../src/interface.c:3048 +#: ../src/interface.c:3114 msgid "Sets the font for the symbol list" msgstr "Configura o tipo de letra para a lista de símbolos" -#: ../src/interface.c:3056 +#: ../src/interface.c:3122 msgid "Sets the editor font" msgstr "Configura o tipo de letra do editor" -#: ../src/interface.c:3058 +#: ../src/interface.c:3124 msgid "Fonts" msgstr "Tipos de letra" -#: ../src/interface.c:3077 +#: ../src/interface.c:3143 msgid "Show editor tabs" msgstr "Mostrar os separadores do editor" -#: ../src/interface.c:3081 +#: ../src/interface.c:3147 msgid "Show close buttons" msgstr "Mostrar botóns de pechar" -#: ../src/interface.c:3084 +#: ../src/interface.c:3150 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1727,113 +1793,103 @@ "Amosa un pequeno botón cunha cruz no separador do ficheiro para pechar " "ficheiros facilmente premendo nel (require reiniciar Geany)" -#: ../src/interface.c:3090 +#: ../src/interface.c:3156 msgid "Placement of new file tabs:" msgstr "Situación de novos separadores de ficheiro:" -#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 -#: ../src/interface.c:3185 -msgid "Left" -msgstr "Left" - -#: ../src/interface.c:3098 +#: ../src/interface.c:3164 msgid "File tabs will be placed on the left of the notebook" msgstr "Os separadores de ficheiros colocaranse á esquerda do caderno" -#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 -#: ../src/interface.c:3186 -msgid "Right" -msgstr "Right" - -#: ../src/interface.c:3106 +#: ../src/interface.c:3172 msgid "File tabs will be placed on the right of the notebook" msgstr "Os separadores de ficheiros colocaranse á dereita do caderno" -#: ../src/interface.c:3110 +#: ../src/interface.c:3176 msgid "Double-clicking hides all additional widgets" msgstr "Premer dúas veces oculta todos os widgets adicionais" -#: ../src/interface.c:3113 +#: ../src/interface.c:3179 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Chama á orde de Ver -> Intercambiar todos os widgets adicionais" -#: ../src/interface.c:3115 +#: ../src/interface.c:3181 msgid "Editor tabs" msgstr "Separadores do editor" -#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +#: ../src/interface.c:3217 ../src/interface.c:3235 ../src/interface.c:3253 msgid "Top" msgstr "Arriba" -#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +#: ../src/interface.c:3218 ../src/interface.c:3236 ../src/interface.c:3254 msgid "Bottom" msgstr "Abaixo" -#: ../src/interface.c:3154 +#: ../src/interface.c:3220 msgid "Sidebar:" msgstr "Barra lateral:" -#: ../src/interface.c:3190 +#: ../src/interface.c:3256 msgid "Tab positions" msgstr "Posicións dos separadores" -#: ../src/interface.c:3209 +#: ../src/interface.c:3275 msgid "Show status bar" msgstr "Mostrar a barra de estado" -#: ../src/interface.c:3212 +#: ../src/interface.c:3278 msgid "Whether to show the status bar at the bottom of the main window" msgstr "" "Indica se a barra de estado na parte inferior da xanela principal debería " "ser visíbel." -#: ../src/interface.c:3219 +#: ../src/interface.c:3285 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3242 +#: ../src/interface.c:3308 msgid "Show T_oolbar" msgstr "M_ostrar a barra de ferramentas" -#: ../src/interface.c:3246 +#: ../src/interface.c:3312 msgid "_Append Toolbar to the Menu" msgstr "Engadir _a barra de ferramentas ao menú" -#: ../src/interface.c:3249 +#: ../src/interface.c:3315 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Empaquetar a barra de ferramentas ao menú principal para aforrar espazo " "vertical" -#: ../src/interface.c:3251 +#: ../src/interface.c:3317 msgid "Toolbar" msgstr "Barra de ferramentas" -#: ../src/interface.c:3272 +#: ../src/interface.c:3338 msgid "Icon style:" msgstr "Estilo das iconas:" -#: ../src/interface.c:3279 +#: ../src/interface.c:3345 msgid "Icon size:" msgstr "Tamaño das iconas:" -#: ../src/interface.c:3334 +#: ../src/interface.c:3400 msgid "Appearance" msgstr "Aparencia" -#: ../src/interface.c:3359 ../src/toolbar.c:882 +#: ../src/interface.c:3425 ../src/toolbar.c:883 msgid "Customize Toolbar" msgstr "Personalizar a barra de ferramentas" -#: ../src/interface.c:3363 +#: ../src/interface.c:3429 msgid "Toolbar" msgstr "Barra de ferramentas" -#: ../src/interface.c:3390 +#: ../src/interface.c:3456 msgid "Line wrapping" msgstr "Axuste de liñas longas" -#: ../src/interface.c:3393 +#: ../src/interface.c:3459 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1843,11 +1899,11 @@ "axuste de liñas ten un custe alto de rendemento para documentos grandes así " "que debería desactivarse en equipos lentos." -#: ../src/interface.c:3395 +#: ../src/interface.c:3461 msgid "Enable \"smart\" home key" msgstr "Activar a tecla de inicio \"intelixente\"" -#: ../src/interface.c:3398 +#: ../src/interface.c:3464 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1861,11 +1917,11 @@ "deshabilitada, a tecla de inicio levará o cursor ao inicio da liña actual, " "da igual a súa posición actual." -#: ../src/interface.c:3400 +#: ../src/interface.c:3466 msgid "Disable Drag and Drop" msgstr "Desactivar arrastrar e soltar" -#: ../src/interface.c:3403 +#: ../src/interface.c:3469 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1874,19 +1930,19 @@ "non se poida arrastrar e soltar ningunha selección dentro ou fora da xanela " "do editor" -#: ../src/interface.c:3405 +#: ../src/interface.c:3471 msgid "Enable folding" msgstr "Activar o pregado" -#: ../src/interface.c:3408 +#: ../src/interface.c:3474 msgid "Whether to enable folding the code" msgstr "Indica se se activa o pregado de código" -#: ../src/interface.c:3410 +#: ../src/interface.c:3476 msgid "Fold/unfold all children of a fold point" msgstr "Pregar ou despregar todos os fillos dun punto de pregado" -#: ../src/interface.c:3413 +#: ../src/interface.c:3479 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1895,11 +1951,11 @@ "de maiúsculas ao premer nun símbolo de encoller fará que se use o " "comportamento contrario." -#: ../src/interface.c:3415 +#: ../src/interface.c:3481 msgid "Use indicators to show compile errors" msgstr "Usar indicadores para mostrar erros ao compilar" -#: ../src/interface.c:3418 +#: ../src/interface.c:3484 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1907,24 +1963,24 @@ "Débense usar indicadores (un subliñado ondeante) para resaltar as liñas nas " "que o compilador atopou un aviso ou un erro?" -#: ../src/interface.c:3420 +#: ../src/interface.c:3486 msgid "Newline strips trailing spaces" msgstr "As novas liñas eliminan os caracteres sobrantes " -#: ../src/interface.c:3423 +#: ../src/interface.c:3489 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Permitir ás novas liñas eliminar os caracteres sobrantes da liña anterior" -#: ../src/interface.c:3429 +#: ../src/interface.c:3495 msgid "Line breaking column:" msgstr "Columna de rotura de liña:" -#: ../src/interface.c:3443 +#: ../src/interface.c:3509 msgid "Comment toggle marker:" msgstr "Marca de intercambio de comentarios:" -#: ../src/interface.c:3450 +#: ../src/interface.c:3516 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1932,68 +1988,68 @@ "Unha cadea que se engade ao intercambiar un comentario de liña nun ficheiro " "fonte. Úsase para marcar o comentario como intercambiado." -#: ../src/interface.c:3452 +#: ../src/interface.c:3518 msgid "Features" msgstr "Características" -#: ../src/interface.c:3457 +#: ../src/interface.c:3523 msgid "Features" msgstr "Características" -#: ../src/interface.c:3489 ../src/interface.c:5029 +#: ../src/interface.c:3555 ../src/interface.c:5097 msgid "Auto-indent mode:" msgstr "Modo de sangría automática:" -#: ../src/interface.c:3502 ../src/interface.c:5042 +#: ../src/interface.c:3568 ../src/interface.c:5110 msgid "Basic" msgstr "Basic" -#: ../src/interface.c:3503 ../src/interface.c:5043 +#: ../src/interface.c:3569 ../src/interface.c:5111 msgid "Current chars" msgstr "Caracteres actuais" -#: ../src/interface.c:3504 ../src/interface.c:5044 +#: ../src/interface.c:3570 ../src/interface.c:5112 msgid "Match braces" msgstr "Parénteses correspondentes" -#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5046 +#: ../src/interface.c:3572 ../src/interface.c:3923 ../src/interface.c:5114 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3513 ../src/interface.c:5053 +#: ../src/interface.c:3579 ../src/interface.c:5121 msgid "Width:" msgstr "Largura:" -#: ../src/interface.c:3526 ../src/interface.c:5066 +#: ../src/interface.c:3592 ../src/interface.c:5134 msgid "The width in chars of a single indent" msgstr "A largura en caracteres dun sangrado simple" -#: ../src/interface.c:3536 ../src/interface.c:5076 +#: ../src/interface.c:3602 ../src/interface.c:5144 msgid "Use spaces when inserting indentation" msgstr "Usar espazos ao inserir sangrados" -#: ../src/interface.c:3545 ../src/interface.c:5085 +#: ../src/interface.c:3611 ../src/interface.c:5153 msgid "Use one tab per indent" msgstr "Usar unha tabulación por sangrado" -#: ../src/interface.c:3554 ../src/interface.c:5094 +#: ../src/interface.c:3620 ../src/interface.c:5162 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Usar espazos se o sangrado total é menor que a largura da tabulación. Se " "non, usar ambos." -#: ../src/interface.c:3569 ../src/interface.c:5109 +#: ../src/interface.c:3635 ../src/interface.c:5184 msgid "Hard tab width:" msgstr "Largura fixada dos separadores:" -#: ../src/interface.c:3577 ../src/interface.c:5117 +#: ../src/interface.c:3643 ../src/interface.c:5192 msgid "The width of a tab when Tabs & Spaces is set for a document" msgstr "" "A largura dunha tabulación cando se configura tabuladores e espazos para un " "documento" -#: ../src/interface.c:3587 ../src/interface.c:5127 +#: ../src/interface.c:3653 ../src/interface.c:5171 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2001,30 +2057,30 @@ "Débese detectar o tipo de sangrado a partir do contido do ficheiro cando se " "abre?" -#: ../src/interface.c:3589 +#: ../src/interface.c:3655 msgid "Tab key indents" msgstr "Sangría da tecla de tabulación" -#: ../src/interface.c:3592 +#: ../src/interface.c:3658 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Premendo tabulador ou maiúsculas+tabulador aumenta un reduce o sangrado no " "canto de inserir un carácter de tabulación" -#: ../src/interface.c:3594 +#: ../src/interface.c:3660 msgid "Indentation" msgstr "Sangría" -#: ../src/interface.c:3599 ../src/interface.c:5129 +#: ../src/interface.c:3665 ../src/interface.c:5197 msgid "Indentation" msgstr "Sangría" -#: ../src/interface.c:3622 +#: ../src/interface.c:3688 msgid "Snippet completion" msgstr "Completado de recortes de código" -#: ../src/interface.c:3625 +#: ../src/interface.c:3691 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2032,20 +2088,20 @@ "Teclear unha secuencia corta de caracteres definida e completala para formar " "unha cadea máis complexa premendo só unha tecla" -#: ../src/interface.c:3627 +#: ../src/interface.c:3693 msgid "XML tag autocompletion" msgstr "Completado automático de etiquetas XML" -#: ../src/interface.c:3630 +#: ../src/interface.c:3696 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Completado e cerrado automático de etiquetas XML (inclúe as etiquetas HTML)" -#: ../src/interface.c:3632 +#: ../src/interface.c:3698 msgid "Automatic continuation of multi-line comments" msgstr "Continuación automática de comentarios de varias liñas" -#: ../src/interface.c:3635 +#: ../src/interface.c:3701 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2053,11 +2109,11 @@ "Continuar automaticamente comentarios de varias liñas en linguaxes como C, C+" "+ e Java cando se introduce unha liña nova dentro dun deses comentarios" -#: ../src/interface.c:3637 +#: ../src/interface.c:3703 msgid "Autocomplete symbols" msgstr "Completado automático de símbolos" -#: ../src/interface.c:3640 +#: ../src/interface.c:3706 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2065,27 +2121,27 @@ "Completado automático de símbolos coñecidos en ficheiros abertos (nomes de " "funcións, variables globais, ...)" -#: ../src/interface.c:3642 +#: ../src/interface.c:3708 msgid "Autocomplete all words in document" msgstr "Completar automaticamente todas as palabras do documento" -#: ../src/interface.c:3646 +#: ../src/interface.c:3712 msgid "Drop rest of word on completion" msgstr "Eliminar o resto da palabra cando se complete" -#: ../src/interface.c:3656 +#: ../src/interface.c:3722 msgid "Max. symbol name suggestions:" msgstr "Número máximo de suxestións de nomes de símbolos:" -#: ../src/interface.c:3663 +#: ../src/interface.c:3729 msgid "Completion list height:" msgstr "Altura da lista de completado:" -#: ../src/interface.c:3670 +#: ../src/interface.c:3736 msgid "Characters to type for autocompletion:" msgstr "Caracteres a teclear para o completado automático:" -#: ../src/interface.c:3683 +#: ../src/interface.c:3749 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" @@ -2093,117 +2149,117 @@ "A cantidade de caracteres necesarios para mostrar a lista de autocompletado " "de símbolos" -#: ../src/interface.c:3692 +#: ../src/interface.c:3758 msgid "Display height in rows for the autocompletion list" msgstr "Altura en filas do visor para a lista de autocompletado" -#: ../src/interface.c:3701 +#: ../src/interface.c:3767 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Número máximo de entradas a mostrar na lista de autocompletado" -#: ../src/interface.c:3704 +#: ../src/interface.c:3770 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:3724 +#: ../src/interface.c:3790 msgid "Parenthesis ( )" msgstr "Parénteses ()" -#: ../src/interface.c:3729 +#: ../src/interface.c:3795 msgid "Auto-close parenthesis when typing an opening one" msgstr "Cerrar automaticamente os parénteses cando se teclea un de apertura" -#: ../src/interface.c:3731 +#: ../src/interface.c:3797 msgid "Single quotes ' '" msgstr "Comiñas simples ' '" -#: ../src/interface.c:3736 +#: ../src/interface.c:3802 msgid "Auto-close simple quote when typing an opening one" msgstr "" "Cerrar automaticamente as comiñas simples cando se teclea unha de apertura" -#: ../src/interface.c:3738 +#: ../src/interface.c:3804 msgid "Curly brackets { }" msgstr "Chaves { }" -#: ../src/interface.c:3743 +#: ../src/interface.c:3809 msgid "Auto-close curly bracket when typing an opening one" msgstr "Cerrar automaticamente as chaves cando se teclea unha de apertura" -#: ../src/interface.c:3745 +#: ../src/interface.c:3811 msgid "Square brackets [ ]" msgstr "Corchetes [ ]" -#: ../src/interface.c:3750 +#: ../src/interface.c:3816 msgid "Auto-close square-bracket when typing an opening one" msgstr "Cerrar automaticamente os corchetes cando se teclea un de apertura" -#: ../src/interface.c:3752 +#: ../src/interface.c:3818 msgid "Double quotes \" \"" msgstr "Comiñas dobres \" \"" -#: ../src/interface.c:3757 +#: ../src/interface.c:3823 msgid "Auto-close double quote when typing an opening one" msgstr "" "Cerrar automaticamente as comiñas dobres cando se teclea unha de apertura" -#: ../src/interface.c:3759 +#: ../src/interface.c:3825 msgid "Auto-close quotes and brackets" msgstr "Cerrar automaticamente comiñas e parénteses" -#: ../src/interface.c:3764 +#: ../src/interface.c:3830 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:3787 +#: ../src/interface.c:3853 msgid "Invert syntax highlighting colors" msgstr "Inverter as cores do resaltado de sintaxe" -#: ../src/interface.c:3790 +#: ../src/interface.c:3856 msgid "Invert all colors, by default using white text on a black background" msgstr "" "Inverter todas as cores, usando texto branco sobre fondo negro de xeito " "predeterminado" -#: ../src/interface.c:3792 +#: ../src/interface.c:3858 msgid "Show indentation guides" msgstr "Mostrar guías de sangría" -#: ../src/interface.c:3795 +#: ../src/interface.c:3861 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Mostrar unhas pequenas liñas de puntos para axudalo a usar o sangrado " "correcto" -#: ../src/interface.c:3797 +#: ../src/interface.c:3863 msgid "Show white space" msgstr "Mostrar espazos en branco" -#: ../src/interface.c:3800 +#: ../src/interface.c:3866 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marcar os espazos con puntos e as tabulacións con frechas" -#: ../src/interface.c:3802 +#: ../src/interface.c:3868 msgid "Show line endings" msgstr "Mostrar remates de liña" -#: ../src/interface.c:3805 +#: ../src/interface.c:3871 msgid "Shows the line ending character" msgstr "Mostra o carácter de fin de liña" -#: ../src/interface.c:3807 +#: ../src/interface.c:3873 msgid "Show line numbers" msgstr "Mostrar números de liña" -#: ../src/interface.c:3810 +#: ../src/interface.c:3876 msgid "Shows or hides the Line Number margin" msgstr "Mostra ou oculta a marxe cos números de liña" -#: ../src/interface.c:3812 +#: ../src/interface.c:3878 msgid "Show markers margin" msgstr "Mostrar a marxe de marcadores" -#: ../src/interface.c:3815 +#: ../src/interface.c:3881 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2211,37 +2267,37 @@ "Mostra ou oculta a pequena marxe á dereita dos números de liña, que se usa " "para marcar liñas" -#: ../src/interface.c:3817 +#: ../src/interface.c:3883 msgid "Stop scrolling at last line" msgstr "Parar o desprazamento na última liña" -#: ../src/interface.c:3820 +#: ../src/interface.c:3886 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Débese parar o desprazamento da páxina pasada a última liña dun documento?" -#: ../src/interface.c:3822 +#: ../src/interface.c:3888 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:3843 +#: ../src/interface.c:3909 msgid "Long line marker:" msgstr "Marcador de liña longa:" -#: ../src/interface.c:3850 +#: ../src/interface.c:3916 msgid "Long line marker color:" msgstr "Cor do marcador de liña longa:" -#: ../src/interface.c:3869 +#: ../src/interface.c:3935 msgid "Sets the color of the long line marker" msgstr "Configura a cor da marca de liña longa" -#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:741 +#: ../src/interface.c:3936 ../src/toolbar.c:70 ../src/tools.c:717 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Selector de cores" -#: ../src/interface.c:3878 +#: ../src/interface.c:3944 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2251,11 +2307,11 @@ "marcar as liñas longas, ou actúa como un consello para saltar de liña. " "Configure este valor a maior que 0 para especificar onde debería aparecer." -#: ../src/interface.c:3888 +#: ../src/interface.c:3954 msgid "Line" msgstr "Liña" -#: ../src/interface.c:3891 +#: ../src/interface.c:3957 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2263,11 +2319,11 @@ "Imprime unha liña vertical na xanela do editor na posición do cursor (vexa " "abaixo)" -#: ../src/interface.c:3895 +#: ../src/interface.c:3961 msgid "Background" msgstr "Fondo" -#: ../src/interface.c:3898 +#: ../src/interface.c:3964 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2277,62 +2333,51 @@ "embaixo) cambiada á cor configurada embaixo, (recomendado se usa fontes " "proporcionais)" -#: ../src/interface.c:3902 +#: ../src/interface.c:3968 msgid "Disabled" msgstr "Desactivado" -#: ../src/interface.c:3908 +#: ../src/interface.c:3974 msgid "Long line marker" msgstr "Marcador de liña longa" -#: ../src/interface.c:3913 +#: ../src/interface.c:3979 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:3944 +#: ../src/interface.c:4010 msgid "Open new documents from the command-line" msgstr "Abrir documentos novos dende a liña de ordes" -#: ../src/interface.c:3947 +#: ../src/interface.c:4013 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "Comezar un ficheiro novo para cada nome de ficheiro da liña de ordes que non " "exista" -#: ../src/interface.c:3961 +#: ../src/interface.c:4027 msgid "Default end of line characters:" msgstr "Caracteres predeterminados de fin de liña:" -#: ../src/interface.c:3968 +#: ../src/interface.c:4034 msgid "New files" msgstr "Ficheiros novos" -#: ../src/interface.c:3994 -msgid "Sets the default encoding for newly created files" -msgstr "" -"Configura a codificación predeterminada para os novos ficheiros creados" - -#: ../src/interface.c:4000 +#: ../src/interface.c:4057 msgid "Default encoding (new files):" msgstr "Codificación predeterminada (ficheiros novos):" -#: ../src/interface.c:4007 -msgid "Default encoding (existing non-Unicode files):" +#: ../src/interface.c:4065 +msgid "Sets the default encoding for newly created files" msgstr "" -"Codificación predeterminada (ficheiros existentes que non estean en Unicode):" +"Configura a codificación predeterminada para os novos ficheiros creados" -#: ../src/interface.c:4019 -msgid "Sets the default encoding for opening existing non-Unicode files" -msgstr "" -"Configura a codificación predeterminada para abrir ficheiros existentes que " -"non estean en Unicode" - -#: ../src/interface.c:4025 +#: ../src/interface.c:4071 msgid "Use fixed encoding when opening non-Unicode files" msgstr "" "Usar unha codificación fixada ao abrir ficheiros que non estean en Unicode" -#: ../src/interface.c:4030 +#: ../src/interface.c:4074 msgid "" "This option disables the automatic detection of the file encoding when " "opening non-Unicode files and opens the file with the specified encoding " @@ -2342,52 +2387,63 @@ "abrir ficheiros que non estean en Unicode e abre o ficheiro coa codificación " "especificada (normalmente non se necesita)" -#: ../src/interface.c:4032 +#: ../src/interface.c:4080 +msgid "Default encoding (existing non-Unicode files):" +msgstr "" +"Codificación predeterminada (ficheiros existentes que non estean en Unicode):" + +#: ../src/interface.c:4088 +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "" +"Configura a codificación predeterminada para abrir ficheiros existentes que " +"non estean en Unicode" + +#: ../src/interface.c:4094 msgid "Encodings" msgstr "Codificacións" -#: ../src/interface.c:4051 +#: ../src/interface.c:4113 msgid "Ensure new line at file end" msgstr "Asegurar unha nova liña ao final do ficheiro" -#: ../src/interface.c:4054 +#: ../src/interface.c:4116 msgid "Ensures that at the end of the file is a new line" msgstr "Asegura que ao final do ficheiro haberá unha liña nova" -#: ../src/interface.c:4056 +#: ../src/interface.c:4118 msgid "Strip trailing spaces and tabs" msgstr "Eliminar espazos e tabulacións sobrantes" -#: ../src/interface.c:4059 +#: ../src/interface.c:4121 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Elimina espazos e tabulacións ao final dos ficheiros" -#: ../src/interface.c:4061 ../src/keybindings.c:482 +#: ../src/interface.c:4123 ../src/keybindings.c:506 msgid "Replace tabs by space" msgstr "Substituír tabulacións por espazos" -#: ../src/interface.c:4064 +#: ../src/interface.c:4126 msgid "Replaces all tabs in document by spaces" msgstr "Substitúe todas as tabulacións no documento por espazos" -#: ../src/interface.c:4066 +#: ../src/interface.c:4128 msgid "Saving files" msgstr "Gardando ficheiros" -#: ../src/interface.c:4091 +#: ../src/interface.c:4153 msgid "Recent files list length:" msgstr "Lonxitude da lista de ficheiros recentes:" -#: ../src/interface.c:4105 +#: ../src/interface.c:4167 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Especifica o número de ficheiros que se gardan na lista de ficheiros recentes" -#: ../src/interface.c:4109 +#: ../src/interface.c:4171 msgid "Disk check timeout:" msgstr "Límite de tempo para a comprobación de disco:" -#: ../src/interface.c:4122 +#: ../src/interface.c:4184 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2395,19 +2451,19 @@ "Cada canto tempo se debe comprobar se houbo cambios nos ficheiros dos " "documentos no disco, en segundos. Un cero desactiva a comprobación." -#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1034 +#: ../src/interface.c:4193 ../src/symbols.c:593 ../plugins/filebrowser.c:1031 msgid "Files" msgstr "Ficheiros" -#: ../src/interface.c:4164 +#: ../src/interface.c:4226 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4171 +#: ../src/interface.c:4233 msgid "Browser:" msgstr "Navegador:" -#: ../src/interface.c:4183 +#: ../src/interface.c:4245 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2415,23 +2471,23 @@ "Un emulador de terminal como xterm, gnome-terminal ou konsole (debe aceptar " "o argumento \"-e\")" -#: ../src/interface.c:4190 +#: ../src/interface.c:4252 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Ruta (e posibelmente argumentos adicionais) ao seu navegador favorito" -#: ../src/interface.c:4212 +#: ../src/interface.c:4274 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4235 +#: ../src/interface.c:4297 msgid "Tool paths" msgstr "Ruta de ferramentas" -#: ../src/interface.c:4256 +#: ../src/interface.c:4318 msgid "Context action:" msgstr "Acción de contexto:" -#: ../src/interface.c:4267 +#: ../src/interface.c:4329 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2442,67 +2498,67 @@ "con %s. Pode aparecer en calquera lugar na orde especificada e substituirase " "despois da execución." -#: ../src/interface.c:4280 +#: ../src/interface.c:4342 msgid "Commands" msgstr "Ordes" -#: ../src/interface.c:4285 ../src/keybindings.c:516 +#: ../src/interface.c:4347 ../src/keybindings.c:540 msgid "Tools" msgstr "Ferramentas" -#: ../src/interface.c:4319 +#: ../src/interface.c:4381 msgid "email address of the developer" msgstr "Enderezo de correo do desenvolvedor" -#: ../src/interface.c:4326 +#: ../src/interface.c:4388 msgid "Initials of the developer name" msgstr "Iniciais do nome do desenvolvedor" -#: ../src/interface.c:4328 +#: ../src/interface.c:4390 msgid "Initial version:" msgstr "Versión inicial:" -#: ../src/interface.c:4340 +#: ../src/interface.c:4402 msgid "Version number, which a new file initially has" msgstr "O número de versión que un ficheiro ten inicialmente" -#: ../src/interface.c:4347 +#: ../src/interface.c:4409 msgid "Company name" msgstr "Nome da empresa" -#: ../src/interface.c:4349 +#: ../src/interface.c:4411 msgid "Developer:" msgstr "Desenvolvedor:" -#: ../src/interface.c:4356 +#: ../src/interface.c:4418 msgid "Company:" msgstr "Empresa:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4425 msgid "Mail address:" msgstr "Enderezo de correo:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4432 msgid "Initials:" msgstr "Iniciais:" -#: ../src/interface.c:4382 +#: ../src/interface.c:4444 msgid "The name of the developer" msgstr "O nome do desenvolvedor" -#: ../src/interface.c:4384 +#: ../src/interface.c:4446 msgid "Year:" msgstr "Ano:" -#: ../src/interface.c:4391 +#: ../src/interface.c:4453 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4398 +#: ../src/interface.c:4460 msgid "Date & Time:" msgstr "Data e Hora:" -#: ../src/interface.c:4410 +#: ../src/interface.c:4472 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2511,7 +2567,7 @@ "especificador de conversión que poida ser usado coa función strftime de ANSI " "C." -#: ../src/interface.c:4417 +#: ../src/interface.c:4479 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2520,7 +2576,7 @@ "especificador de conversión que poida ser usado coa función strftime de ANSI " "C." -#: ../src/interface.c:4424 +#: ../src/interface.c:4486 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2529,63 +2585,63 @@ "especificador de conversión que poida ser usado coa función strftime de ANSI " "C." -#: ../src/interface.c:4426 +#: ../src/interface.c:4488 msgid "Template data" msgstr "Datos do modelo" -#: ../src/interface.c:4431 +#: ../src/interface.c:4493 msgid "Templates" msgstr "Modelos" -#: ../src/interface.c:4469 +#: ../src/interface.c:4531 msgid "C_hange" msgstr "_Cambiar" -#: ../src/interface.c:4473 +#: ../src/interface.c:4535 msgid "Keyboard shortcuts" msgstr "Atallos de teclado" -#: ../src/interface.c:4478 +#: ../src/interface.c:4540 msgid "Keybindings" msgstr "Asignacións de teclas" -#: ../src/interface.c:4501 +#: ../src/interface.c:4563 msgid "Command:" msgstr "Orde:" -#: ../src/interface.c:4508 +#: ../src/interface.c:4570 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Ruta á orde para imprimir ficheiros (use %f para usar o nome do ficheiro)" -#: ../src/interface.c:4518 +#: ../src/interface.c:4580 msgid "Use an external command for printing" msgstr "Usar unha orde externa para imprimir" -#: ../src/interface.c:4538 ../src/printing.c:381 +#: ../src/interface.c:4600 ../src/printing.c:381 msgid "Print line numbers" msgstr "Imprimir números de liña" -#: ../src/interface.c:4541 ../src/printing.c:383 +#: ../src/interface.c:4603 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Engadir números de liña á páxina impresa" -#: ../src/interface.c:4543 ../src/printing.c:386 +#: ../src/interface.c:4605 ../src/printing.c:386 msgid "Print page numbers" msgstr "Imprimir números de páxina" -#: ../src/interface.c:4546 ../src/printing.c:388 +#: ../src/interface.c:4608 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Engadir números de páxina ao final de cada páxina. Ocupa 2 liñas da páxina." -#: ../src/interface.c:4548 ../src/printing.c:391 +#: ../src/interface.c:4610 ../src/printing.c:391 msgid "Print page header" msgstr "Imprimir a cabeceira da páxina" -#: ../src/interface.c:4551 ../src/printing.c:393 +#: ../src/interface.c:4613 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2593,19 +2649,19 @@ "Engadir unha pequena cabeceira a cada páxina co número de páxina, o nome do " "ficheiro e a data actual (vexa abaixo). Ocupa 3 liñas da páxina." -#: ../src/interface.c:4568 ../src/printing.c:409 +#: ../src/interface.c:4630 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Usar o nome base do ficheiro impreso" -#: ../src/interface.c:4571 +#: ../src/interface.c:4633 msgid "Print only the basename (without the path) of the printed file" msgstr "Imprimir só o nome base (sen a ruta) do ficheiro impreso" -#: ../src/interface.c:4577 ../src/printing.c:417 +#: ../src/interface.c:4639 ../src/printing.c:417 msgid "Date format:" msgstr "Formato da data:" -#: ../src/interface.c:4584 ../src/printing.c:423 +#: ../src/interface.c:4646 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2615,544 +2671,520 @@ "cada páxina. Pode usar calquera especificador de conversión que poida ser " "usado coa función strftime de ANSI C." -#: ../src/interface.c:4587 +#: ../src/interface.c:4649 msgid "Use native GTK printing" msgstr "Usar o sistema de impresión nativo de GTK" -#: ../src/interface.c:4593 +#: ../src/interface.c:4655 msgid "Printing" msgstr "Impresión" -#: ../src/interface.c:5012 +#: ../src/interface.c:5080 msgid "Project Properties" msgstr "Propiedades do proxecto" -#: ../src/keybindings.c:221 ../src/plugins.c:1106 +#: ../src/keybindings.c:222 ../src/plugins.c:1108 msgid "File" msgstr "Ficheiro" -#: ../src/keybindings.c:224 +#: ../src/keybindings.c:225 msgid "New" msgstr "Novo" -#: ../src/keybindings.c:226 +#: ../src/keybindings.c:227 msgid "Open" msgstr "Abrir" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:230 msgid "Open selected file" msgstr "Abrir o ficheiro seleccionado" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:232 msgid "Save" msgstr "Gardar" -#: ../src/keybindings.c:233 +#: ../src/keybindings.c:234 msgid "Save as" msgstr "Gardar como" -#: ../src/keybindings.c:235 +#: ../src/keybindings.c:236 msgid "Save all" msgstr "Gardar todos" -#: ../src/keybindings.c:238 +#: ../src/keybindings.c:239 msgid "Print" msgstr "Imprimir" -#: ../src/keybindings.c:240 +#: ../src/keybindings.c:241 msgid "Close" msgstr "Pechar" -#: ../src/keybindings.c:242 +#: ../src/keybindings.c:243 msgid "Close all" msgstr "Pechar todo" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:246 msgid "Reload file" msgstr "Recargar o ficheiro" -#: ../src/keybindings.c:247 ../src/project.c:520 +#: ../src/keybindings.c:248 ../src/project.c:522 msgid "Project" msgstr "Proxecto" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:251 msgid "Project properties" msgstr "Propiedades do proxecto" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:256 msgid "Undo" msgstr "Desfacer" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:258 msgid "Redo" msgstr "Refacer" -#: ../src/keybindings.c:259 -msgid "Duplicate line or selection" -msgstr "Duplicar a liña ou a selección" - -#: ../src/keybindings.c:262 -msgid "Delete current line(s)" -msgstr "Borrar a(s) liña(s) actual(is)" - -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:267 msgid "Delete to line end" msgstr "Borrar ata o final da liña" -#: ../src/keybindings.c:267 -msgid "Transpose current line" -msgstr "Traspor a liña actual" - -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:273 msgid "Scroll to current line" msgstr "Ir á liña actual" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:275 msgid "Scroll up the view by one line" msgstr "Desprazar a vista arriba unha liña" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:277 msgid "Scroll down the view by one line" msgstr "Desprazar a vista abaixo unha liña" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:279 msgid "Complete snippet" msgstr "Completar fragmentos" -#: ../src/keybindings.c:277 +#: ../src/keybindings.c:281 msgid "Move cursor in snippet" msgstr "Mover o cursor no fragmento" -#: ../src/keybindings.c:279 +#: ../src/keybindings.c:283 msgid "Suppress snippet completion" msgstr "Suprimir o completado de fragmento" -#: ../src/keybindings.c:281 +#: ../src/keybindings.c:285 msgid "Context Action" msgstr "Acción de contexto" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:287 msgid "Complete word" msgstr "Completar palabra" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:289 msgid "Show calltip" msgstr "Mostrar suxestións da función" -#: ../src/keybindings.c:287 +#: ../src/keybindings.c:291 msgid "Show macro list" msgstr "Mostrar a lista de macros" -#: ../src/keybindings.c:289 +#: ../src/keybindings.c:293 +msgid "Word part completion" +msgstr "Completado de partes de palabras" + +#: ../src/keybindings.c:295 +msgid "Move line(s) up" +msgstr "Mover liña(s) cara arriba" + +#: ../src/keybindings.c:297 +msgid "Move line(s) down" +msgstr "Mover liña(s) cara abaixo" + +#: ../src/keybindings.c:299 msgid "Clipboard" msgstr "Portaretallos" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:302 msgid "Cut" msgstr "Cortar" -#: ../src/keybindings.c:294 +#: ../src/keybindings.c:304 msgid "Copy" msgstr "Copiar" -#: ../src/keybindings.c:296 +#: ../src/keybindings.c:306 msgid "Paste" msgstr "Pegar" -#: ../src/keybindings.c:298 -msgid "Copy current line(s)" -msgstr "Copiar a(s) liña(s) actual(is)" - -#: ../src/keybindings.c:300 -msgid "Cut current line(s)" -msgstr "Cortar a(s) liña(s) actual(is)" - -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:314 msgid "Select" msgstr "Seleccionar" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:317 msgid "Select All" msgstr "Seleccionar todo" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:319 msgid "Select current word" msgstr "Seleccionar a palabra actual" -#: ../src/keybindings.c:309 -msgid "Select current line(s)" -msgstr "Seleccionar a(s) liña(s) actual(is)" +#: ../src/keybindings.c:327 +msgid "Select to previous word part" +msgstr "Seleccionar ata a anterior parte de palabra" -#: ../src/keybindings.c:311 -msgid "Select current paragraph" -msgstr "Seleccionar o parágrafo actual" +#: ../src/keybindings.c:329 +msgid "Select to next word part" +msgstr "Seleccionar ata a seguinte parte de palabra" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:331 msgid "Format" msgstr "Formato" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:335 msgid "Toggle Case of Selection" msgstr "Alternar a capitalización da selección" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:337 msgid "Toggle line commentation" msgstr "Intercambiar o comentado da liña" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:340 msgid "Comment line(s)" msgstr "Comentar liña(s)" -#: ../src/keybindings.c:324 +#: ../src/keybindings.c:342 msgid "Uncomment line(s)" msgstr "Descomentar liña(s)" -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:344 msgid "Increase indent" msgstr "Aumentar a sangría" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:347 msgid "Decrease indent" msgstr "Diminuír a sangría" -#: ../src/keybindings.c:332 +#: ../src/keybindings.c:350 msgid "Increase indent by one space" msgstr "Aumentar o sangrado nun espazo" -#: ../src/keybindings.c:334 +#: ../src/keybindings.c:352 msgid "Decrease indent by one space" msgstr "Reducir o sangrado nun espazo" -#: ../src/keybindings.c:336 -msgid "Smart line indent" -msgstr "Sangría intelixente de liñas" - -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:356 msgid "Send to Custom Command 1" msgstr "Enviar á orde personalizada 1" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:358 msgid "Send to Custom Command 2" msgstr "Enviar á orde personalizada 2" -#: ../src/keybindings.c:342 +#: ../src/keybindings.c:360 msgid "Send to Custom Command 3" msgstr "Enviar á orde personalizada 3" -#: ../src/keybindings.c:344 +#: ../src/keybindings.c:362 msgid "Send Selection to Terminal" msgstr "Enviar a selección á Terminal" -#: ../src/keybindings.c:346 -msgid "Reflow lines/block" -msgstr "Refacer o fluxo de liñas/bloque" - -#: ../src/keybindings.c:348 +#: ../src/keybindings.c:367 msgid "Insert" msgstr "Inserir" -#: ../src/keybindings.c:351 +#: ../src/keybindings.c:370 msgid "Insert date" msgstr "Inserir data" -#: ../src/keybindings.c:354 -msgid "Insert alternative white space" -msgstr "Inserir espazo en branco alternativo" - -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:376 msgid "Settings" msgstr "Configuración" -#: ../src/keybindings.c:362 ../src/toolbar.c:350 +#: ../src/keybindings.c:384 ../src/toolbar.c:350 msgid "Search" msgstr "Buscar" -#: ../src/keybindings.c:365 ../src/search.c:379 +#: ../src/keybindings.c:387 ../src/search.c:379 msgid "Find" msgstr "Buscar" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:389 msgid "Find Next" msgstr "Buscar seguinte" -#: ../src/keybindings.c:369 +#: ../src/keybindings.c:391 msgid "Find Previous" msgstr "Buscar anterior" -#: ../src/keybindings.c:372 +#: ../src/keybindings.c:394 msgid "Find Next Selection" msgstr "Buscar a seguinte selección" -#: ../src/keybindings.c:374 +#: ../src/keybindings.c:396 msgid "Find Previous Selection" msgstr "Buscar a anterior selección" -#: ../src/keybindings.c:376 ../src/search.c:514 +#: ../src/keybindings.c:398 ../src/search.c:514 msgid "Replace" msgstr "Substituír" -#: ../src/keybindings.c:378 ../src/search.c:686 +#: ../src/keybindings.c:400 ../src/search.c:686 msgid "Find in Files" msgstr "Buscar en ficheiros" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:403 msgid "Next Message" msgstr "Seguinte mensaxe" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:405 msgid "Previous Message" msgstr "Mensaxe anterior" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:407 msgid "Find Usage" msgstr "Uso da busca" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:409 msgid "Find Document Usage" msgstr "Uso da busca en documentos" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:411 msgid "Mark All" msgstr "Marcar todo" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:413 msgid "Go to" msgstr "Ir a" -#: ../src/keybindings.c:394 ../src/toolbar.c:66 +#: ../src/keybindings.c:416 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Navegar cara atrás unha localización" -#: ../src/keybindings.c:396 ../src/toolbar.c:67 +#: ../src/keybindings.c:418 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Navegar cara adiante unha localización" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:423 msgid "Go to matching brace" msgstr "Ir ao paréntese correspondente" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:426 msgid "Toggle marker" msgstr "Intercambiar marcador" -#: ../src/keybindings.c:407 -msgid "Go to next marker" -msgstr "Ir ao seguinte marcador" - -#: ../src/keybindings.c:410 -msgid "Go to previous marker" -msgstr "Ir ao anterior marcador" - -#: ../src/keybindings.c:412 +#: ../src/keybindings.c:434 msgid "Go to Tag Definition" msgstr "Ir á definición da etiqueta" -#: ../src/keybindings.c:414 +#: ../src/keybindings.c:436 msgid "Go to Tag Declaration" msgstr "Ir á declaración da etiqueta" -#: ../src/keybindings.c:416 +#: ../src/keybindings.c:438 msgid "Go to Start of Line" msgstr "Ir ao comezo de liña" -#: ../src/keybindings.c:418 +#: ../src/keybindings.c:440 msgid "Go to End of Line" msgstr "Ir ao final de liña" -#: ../src/keybindings.c:420 +#: ../src/keybindings.c:442 msgid "Go to End of Display Line" msgstr "Ir ao final da liña en pantalla" -#: ../src/keybindings.c:422 +#: ../src/keybindings.c:444 msgid "Go to Previous Word Part" msgstr "Ir á anterior parte de palabra" -#: ../src/keybindings.c:424 +#: ../src/keybindings.c:446 msgid "Go to Next Word Part" msgstr "Ir á seguinte parte de palabra" -#: ../src/keybindings.c:426 +#: ../src/keybindings.c:448 msgid "View" msgstr "Ver" -#: ../src/keybindings.c:429 +#: ../src/keybindings.c:451 msgid "Toggle All Additional Widgets" msgstr "Intercambiar todos os widgets adicionais" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:454 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:456 msgid "Toggle Messages Window" msgstr "Des/Activar a xanela de mensaxes" -#: ../src/keybindings.c:437 +#: ../src/keybindings.c:459 msgid "Toggle Sidebar" msgstr "Des/Activar a barra lateral" -#: ../src/keybindings.c:439 +#: ../src/keybindings.c:461 msgid "Zoom In" msgstr "Achegar" -#: ../src/keybindings.c:441 +#: ../src/keybindings.c:463 msgid "Zoom Out" msgstr "Alonxar" -#: ../src/keybindings.c:443 +#: ../src/keybindings.c:465 msgid "Focus" msgstr "Foco" -#: ../src/keybindings.c:446 +#: ../src/keybindings.c:468 msgid "Switch to Editor" msgstr "Cambiar ao editor" -#: ../src/keybindings.c:448 +#: ../src/keybindings.c:470 msgid "Switch to Scribble" msgstr "Cambiar ás anotacións" -#: ../src/keybindings.c:450 +#: ../src/keybindings.c:472 msgid "Switch to VTE" msgstr "Cambiar ao ETV" -#: ../src/keybindings.c:452 +#: ../src/keybindings.c:474 msgid "Switch to Search Bar" msgstr "Cambiar á barra de busca" -#: ../src/keybindings.c:454 +#: ../src/keybindings.c:476 msgid "Switch to Sidebar" msgstr "Cambiar á barra lateral" -#: ../src/keybindings.c:456 +#: ../src/keybindings.c:478 msgid "Switch to Compiler" msgstr "Cambiar ao compilador" -#: ../src/keybindings.c:458 +#: ../src/keybindings.c:480 +msgid "Switch to Messages" +msgstr "Cambiar ás mensaxes" + +#: ../src/keybindings.c:482 msgid "Notebook tab" msgstr "Separador do caderno" -#: ../src/keybindings.c:461 +#: ../src/keybindings.c:485 msgid "Switch to left document" msgstr "Cambiar ao documento á esquerda" -#: ../src/keybindings.c:463 +#: ../src/keybindings.c:487 msgid "Switch to right document" msgstr "Cambiar ao documento á dereita" -#: ../src/keybindings.c:465 +#: ../src/keybindings.c:489 msgid "Switch to last used document" msgstr "Cambiar ao último documento usado" -#: ../src/keybindings.c:467 +#: ../src/keybindings.c:491 msgid "Move document left" msgstr "Mover o documento á esquerda" -#: ../src/keybindings.c:469 +#: ../src/keybindings.c:493 msgid "Move document right" msgstr "Mover o documento á dereita" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:495 msgid "Move document first" msgstr "Mover o documento ao inicio" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:497 msgid "Move document last" msgstr "Mover o documento ao final" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:499 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:478 +#: ../src/keybindings.c:502 msgid "Toggle Line wrapping" msgstr "Des/Activar o axuste de liñas" -#: ../src/keybindings.c:480 +#: ../src/keybindings.c:504 msgid "Toggle Line breaking" msgstr "Des/Activar a rotura de liñas" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:508 msgid "Replace spaces by tabs" msgstr "Substituír espazos por tabulacións" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:510 msgid "Toggle current fold" msgstr "Des/Activar o pregado actual" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:512 msgid "Fold all" msgstr "Pregar todo" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:514 msgid "Unfold all" msgstr "Despregar todo" -#: ../src/keybindings.c:492 +#: ../src/keybindings.c:516 msgid "Reload symbol list" msgstr "Recargar a lista de símbolos" -#: ../src/keybindings.c:494 ../src/keybindings.c:499 ../src/project.c:481 -#: ../src/ui_utils.c:1788 +#: ../src/keybindings.c:518 ../src/keybindings.c:523 ../src/project.c:483 +#: ../src/ui_utils.c:1795 msgid "Build" msgstr "Construír" -#: ../src/keybindings.c:497 ../src/toolbar.c:68 +#: ../src/keybindings.c:521 ../src/toolbar.c:68 msgid "Compile" msgstr "Compilar" -#: ../src/keybindings.c:501 +#: ../src/keybindings.c:525 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:504 +#: ../src/keybindings.c:528 msgid "Make custom target" msgstr "Make (destino personalizado)" -#: ../src/keybindings.c:506 +#: ../src/keybindings.c:530 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:508 +#: ../src/keybindings.c:532 msgid "Next error" msgstr "Seguinte erro" -#: ../src/keybindings.c:510 +#: ../src/keybindings.c:534 msgid "Previous error" msgstr "Erro anterior" -#: ../src/keybindings.c:512 +#: ../src/keybindings.c:536 msgid "Run" msgstr "Executar" -#: ../src/keybindings.c:514 +#: ../src/keybindings.c:538 msgid "Build options" msgstr "Opcións para construír" -#: ../src/keybindings.c:519 +#: ../src/keybindings.c:543 msgid "Show Color Chooser" msgstr "Mostrar o selector de cores" -#: ../src/keybindings.c:521 ../src/keybindings.c:524 +#: ../src/keybindings.c:545 ../src/keybindings.c:548 msgid "Help" msgstr "Axuda" -#: ../src/keybindings.c:813 +#: ../src/keybindings.c:837 msgid "Keyboard Shortcuts" msgstr "Atallos de teclado" -#: ../src/keybindings.c:826 +#: ../src/keybindings.c:850 msgid "The following keyboard shortcuts are configurable:" msgstr "Os seguintes atallos de teclado son configurábeis :" -#: ../src/keybindings.c:1659 +#: ../src/keybindings.c:1694 msgid "Switch to Document" msgstr "Cambiar ao documento" -#: ../src/keyfile.c:815 +#: ../src/keyfile.c:821 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Escriba aquí o que queira, úseo como un taboleiro de avisos ou apuntes" -#: ../src/keyfile.c:1019 +#: ../src/keyfile.c:1025 msgid "Failed to load one or more session files." msgstr "Produciuse un erro ao cargar un ou máis ficheiros de sesión." @@ -3230,25 +3262,25 @@ msgid "Show version and exit" msgstr "Mostrar a versión e saír" -#: ../src/main.c:467 +#: ../src/main.c:474 msgid "[FILES...]" msgstr "[Ficheiros...]" -#: ../src/main.c:484 +#: ../src/main.c:491 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(compiladoen %s con GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:575 +#: ../src/main.c:582 msgid "Move it now?" msgstr "Movelo agora?" -#: ../src/main.c:577 +#: ../src/main.c:584 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Geany precisa mover o seu directorio de configuración vello antes de comezar." -#: ../src/main.c:586 +#: ../src/main.c:593 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3258,7 +3290,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:596 +#: ../src/main.c:603 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3267,7 +3299,7 @@ "Non foi posíbel mover o seu vello directorio de configuración \"%s\" a \"%s" "\" (%s). Por favor, mova de xeito manual o directorio á nova localización." -#: ../src/main.c:677 +#: ../src/main.c:684 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3279,22 +3311,22 @@ "configuración.\n" "Iniciar Geany de todos xeitos?" -#: ../src/main.c:763 ../src/socket.c:164 ../src/templates.c:339 +#: ../src/main.c:770 ../src/socket.c:164 ../src/templates.c:339 #, c-format msgid "Could not find file '%s'." msgstr "Non foi posíbel encontrar o ficheiro '%s'." -#: ../src/main.c:973 +#: ../src/main.c:980 #, c-format msgid "This is Geany %s." msgstr "Isto é Geany %s" -#: ../src/main.c:975 +#: ../src/main.c:982 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Non foi posíbel crear o directorio de configuración (%s)." -#: ../src/main.c:1194 +#: ../src/main.c:1201 msgid "Configuration files reloaded." msgstr "Recargáronse os ficheiros de configuración." @@ -3310,7 +3342,7 @@ msgid "_Hide Message Window" msgstr "_Ocultar a xanela de mensaxes" -#: ../src/plugins.c:422 +#: ../src/plugins.c:424 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3319,11 +3351,11 @@ "O plugin \"%s\" non é compatíbel a nivel binario con esta versión de Geany - " "por favor, recompíleo. " -#: ../src/plugins.c:864 +#: ../src/plugins.c:866 msgid "_Plugin Manager" msgstr "Xestor de _plugins" -#: ../src/plugins.c:1022 +#: ../src/plugins.c:1024 #, c-format msgid "" "Plugin: %s %s\n" @@ -3334,31 +3366,31 @@ "Descrición: %s\n" "Autor(es): %s" -#: ../src/plugins.c:1094 +#: ../src/plugins.c:1096 msgid "Active" msgstr "Activo" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1102 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1124 +#: ../src/plugins.c:1126 msgid "No plugins available." msgstr "Non hai plugins dispoñíbeis." -#: ../src/plugins.c:1204 +#: ../src/plugins.c:1206 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1224 +#: ../src/plugins.c:1226 msgid "Choose which plugins should be loaded at startup:" msgstr "Escolla que plugins se deben cargar ao iniciar:" -#: ../src/plugins.c:1236 +#: ../src/plugins.c:1238 msgid "Plugin details:" msgstr "Detalles do plugin:" -#: ../src/pluginutils.c:205 +#: ../src/pluginutils.c:207 msgid "Configure Plugins" msgstr "Configurar plugins" @@ -3371,11 +3403,11 @@ msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Prema a combinación de teclas que quere usar para \"%s\"." -#: ../src/prefs.c:210 ../src/symbols.c:1834 +#: ../src/prefs.c:210 ../src/symbols.c:1833 msgid "_Expand All" msgstr "_Expandir todo" -#: ../src/prefs.c:215 ../src/symbols.c:1839 +#: ../src/prefs.c:215 ../src/symbols.c:1838 msgid "_Collapse All" msgstr "_Contraer todo" @@ -3387,33 +3419,33 @@ msgid "Shortcut" msgstr "Atallo" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1407 msgid "_Override" msgstr "S_obrescribir" -#: ../src/prefs.c:1400 +#: ../src/prefs.c:1407 msgid "_Allow" msgstr "_Permitir" -#: ../src/prefs.c:1401 +#: ../src/prefs.c:1408 msgid "Override that keybinding?" msgstr "Sobrescribir ese atallo de teclado?" -#: ../src/prefs.c:1402 +#: ../src/prefs.c:1409 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "A combinación '%s' xa se usa para \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1518 +#: ../src/prefs.c:1527 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Introduza as rutas ás ferramentas embaixo. Pode deixar en branco as " "ferramentas que non necesite." #. page Templates -#: ../src/prefs.c:1523 +#: ../src/prefs.c:1532 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3421,7 +3453,7 @@ "Configurar a información que se usará nos modelos. Vexa a documentación se " "quere máis detalles." -#: ../src/prefs.c:1527 +#: ../src/prefs.c:1536 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3432,7 +3464,7 @@ "configuración." #. page Keybindings -#: ../src/prefs.c:1533 +#: ../src/prefs.c:1542 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3444,7 +3476,7 @@ "atallo." #. page Printing -#: ../src/prefs.c:1538 +#: ../src/prefs.c:1547 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3454,7 +3486,7 @@ "GTK 2.10 (ou superior)." #. page Editor->Indentation -#: ../src/prefs.c:1544 +#: ../src/prefs.c:1553 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3539,19 +3571,19 @@ msgid "C_reate" msgstr "C_rear" -#: ../src/project.c:140 ../src/project.c:418 +#: ../src/project.c:140 ../src/project.c:419 msgid "Name:" msgstr "Nome:" -#: ../src/project.c:149 ../src/project.c:431 +#: ../src/project.c:149 ../src/project.c:432 msgid "Filename:" msgstr "Nome do ficheiro:" -#: ../src/project.c:165 ../src/project.c:461 +#: ../src/project.c:165 ../src/project.c:462 msgid "Base path:" msgstr "Ruta base:" -#: ../src/project.c:171 ../src/project.c:470 +#: ../src/project.c:171 ../src/project.c:471 msgid "" "Base directory of all files that make up the project. This can be a new " "path, or an existing directory tree. You can use paths relative to the " @@ -3561,11 +3593,11 @@ "unha ruta nova, ou unha árbore de directorios existente. Pode usar rutas " "relativas ó nome de ficheiro do proxecto." -#: ../src/project.c:174 ../src/project.c:473 +#: ../src/project.c:174 ../src/project.c:474 msgid "Choose Project Base Path" msgstr "Seleccionar a ruta base do proxecto" -#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:935 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:937 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Non foi posíbel cargar o ficheiro de proxecto \"%s\"." @@ -3578,92 +3610,92 @@ msgid "Project files" msgstr "Ficheiros do proxecto" -#: ../src/project.c:342 +#: ../src/project.c:343 #, c-format msgid "Project \"%s\" closed." msgstr "Pechouse o proxecto \"%s\"." -#: ../src/project.c:444 +#: ../src/project.c:445 msgid "Description:" msgstr "Descrición:" -#: ../src/project.c:485 -msgid "Set the non-filetype working directories on build tab to use base path:" +#: ../src/project.c:487 +msgid "Set the Build non-filetype working directories to use base path:" msgstr "" -#: ../src/project.c:488 +#: ../src/project.c:490 msgid "Set" msgstr "Configurar" -#: ../src/project.c:490 +#: ../src/project.c:492 msgid "" "Set the working directories (on the Build tab) for the non-filetype build " "commands to use the base path" msgstr "" -#: ../src/project.c:502 +#: ../src/project.c:504 msgid "File patterns:" msgstr "Patróns de ficheiro:" -#: ../src/project.c:599 +#: ../src/project.c:601 msgid "Do you want to close it before proceeding?" msgstr "Quere pechalo antes de continuar?" -#: ../src/project.c:600 +#: ../src/project.c:602 #, c-format msgid "The '%s' project is already open." msgstr "O proxecto '%s' xa está aberto." -#: ../src/project.c:644 +#: ../src/project.c:646 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4391] trunk/po
by frlan＠users.sourceforge.net 29 Oct '09

29 Oct '09

Revision: 4391 http://geany.svn.sourceforge.net/geany/?rev=4391&view=rev Author: frlan Date: 2009-10-29 18:00:34 +0000 (Thu, 29 Oct 2009) Log Message: ----------- Update of Slovenian translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/sl.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-10-29 12:34:53 UTC (rev 4390) +++ trunk/po/ChangeLog 2009-10-29 18:00:34 UTC (rev 4391) @@ -1,3 +1,8 @@ +2009-10-29 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * sl.po: Update of Slovenian translation. Thanks to Jože Klepec for providing. + + 2009-10-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * gl.po: Update of Galician translation. Thanks to José Manuel Castroagudín Silva. Modified: trunk/po/sl.po =================================================================== --- trunk/po/sl.po 2009-10-29 12:34:53 UTC (rev 4390) +++ trunk/po/sl.po 2009-10-29 18:00:34 UTC (rev 4391) @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: geany 0.19\n" -"Report-Msgid-Bugs-To: geany-i18n(a)uvena.de\n" -"POT-Creation-Date: 2009-09-01 10:23+0200\n" -"PO-Revision-Date: 2009-08-29 00:22+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-29 18:59+0100\n" +"PO-Revision-Date: 2009-10-28 18:35+0100\n" "Last-Translator: Jože Klepec <joze.klepec(a)siol.net>\n" "Language-Team: Slovenian <>\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Hitro in lahkotno vdelano razvojno okolje z uporabo GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:262 ../src/interface.c:1476 +#: ../geany.desktop.in.h:2 ../src/interface.c:280 ../src/interface.c:1618 msgid "Geany" msgstr "Geany" @@ -34,54 +34,54 @@ msgid "Integrated Development Environment" msgstr "Vdelano razvojno okolje" -#: ../src/about.c:139 +#: ../src/about.c:140 msgid "About Geany" msgstr "O Geany" -#: ../src/about.c:189 +#: ../src/about.c:190 msgid "A fast and lightweight IDE" msgstr "Hitro in lahkotno razvojno okolje" -#: ../src/about.c:210 +#: ../src/about.c:211 #, c-format msgid "(built on or after %s)" msgstr "(zgrajeno dne %s ali kasneje)" # gtk_container_add(GTK_CONTAINER(info_box), cop_label); #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:241 +#: ../src/about.c:242 msgid "Info" msgstr "Info" -#: ../src/about.c:257 +#: ../src/about.c:258 msgid "Developers" msgstr "Razvijalci" -#: ../src/about.c:266 +#: ../src/about.c:267 msgid "maintainer" msgstr "vzdrževalec" -#: ../src/about.c:274 +#: ../src/about.c:275 msgid "developer" msgstr "razvijalec" -#: ../src/about.c:282 +#: ../src/about.c:283 msgid "translation maintainer" msgstr "vzdrževalec prevoda" -#: ../src/about.c:291 +#: ../src/about.c:292 msgid "Translators" msgstr "Prevajalci" -#: ../src/about.c:311 +#: ../src/about.c:312 msgid "Previous Translators" msgstr "Prejšnji prevajalci" -#: ../src/about.c:332 +#: ../src/about.c:333 msgid "Contributors" msgstr "Sodelavci" -#: ../src/about.c:342 +#: ../src/about.c:343 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -89,15 +89,15 @@ "Nekateri od mnogih sodelavcev (za bolj natančen seznam, poglejte datoteko %" "s):" -#: ../src/about.c:368 +#: ../src/about.c:369 msgid "Credits" msgstr "Zahvale" -#: ../src/about.c:382 +#: ../src/about.c:383 msgid "License" msgstr "Licenca" -#: ../src/about.c:391 +#: ../src/about.c:392 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -105,38 +105,44 @@ "Besedilo licence ni najdeno, za ogled obiščite spletno mesto: http://www.gnu." "org/licenses/gpl-2.0.txt " +# fall back to %d #. fall back to %d -#: ../src/build.c:536 +#: ../src/build.c:626 #, c-format msgid "failed to substitute %%p, no project active" -msgstr "" +msgstr "spodletela zamenjava %%p, ni aktivnega projekta" -#: ../src/build.c:596 +#: ../src/build.c:664 +#, fuzzy +msgid "Process failed, no working directory" +msgstr "Spodletela menjava delovne mape v \"%s\"" + +#: ../src/build.c:690 #, c-format msgid "%s (in directory: %s)" msgstr "%s (v mapi: %s)" -#: ../src/build.c:616 ../src/build.c:839 ../src/search.c:1411 +#: ../src/build.c:710 ../src/build.c:934 ../src/search.c:1412 #, c-format msgid "Process failed (%s)" msgstr "Proces spodletel (%s)" -#: ../src/build.c:685 +#: ../src/build.c:780 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Spodletela menjava delovne mape v \"%s\"" -#: ../src/build.c:714 +#: ../src/build.c:809 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Spodletelo izvajanje \"%s\" (ni mogoče ustvariti zagonske skripte)." -#: ../src/build.c:768 +#: ../src/build.c:863 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "Izvajanje v VTE ni možno, ker verjetno vsebuje ukaz." -#: ../src/build.c:806 +#: ../src/build.c:901 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -145,234 +151,225 @@ "Ne najdem terminala \"%s\" (preverite pot za nastavitve orodja Terminal v " "Možnostih)" -#: ../src/build.c:976 +#: ../src/build.c:1071 msgid "Compilation failed." msgstr "Prevajanje spodletelo." -#: ../src/build.c:990 +#: ../src/build.c:1085 msgid "Compilation finished successfully." msgstr "Prevajanje uspešno zaključeno." -#: ../src/build.c:1144 -#, fuzzy +#: ../src/build.c:1241 msgid "Custom Text" -msgstr "Zgradi tarčo po meri" +msgstr "Besedilo po meri" -#: ../src/build.c:1145 -#, fuzzy +#: ../src/build.c:1242 msgid "Enter custom text here, all entered text is appended to the command." msgstr "" "Tu vnesite možnosti po meri, vse vneseno besedilo bo preneseno ukazu make." # skok na naslednjo napako -#: ../src/build.c:1219 +#: ../src/build.c:1320 msgid "_Next Error" msgstr "_Naslednja napaka" # skok na prejšnjo napako -#: ../src/build.c:1221 +#: ../src/build.c:1322 msgid "_Previous Error" msgstr "_Predhodna napaka" -#: ../src/build.c:1231 -#, fuzzy +#: ../src/build.c:1332 msgid "_Set Build Commands" -msgstr "Nastavi ukaze po meri" +msgstr "_Nastavi ukaze za gradnjo" -#: ../src/build.c:1489 ../src/toolbar.c:344 +#: ../src/build.c:1610 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Zgradi trenutno datoteko" -#: ../src/build.c:1504 +#: ../src/build.c:1624 msgid "Build the current file with Make and the default target" msgstr "Zgradi trenutno datoteko z Make in privzeto tarčo." -#: ../src/build.c:1506 +#: ../src/build.c:1626 msgid "Build the current file with Make and the specified target" msgstr "Zgradi trenutno datoteko z Make in določeno tarčo." -#: ../src/build.c:1508 +#: ../src/build.c:1628 msgid "Compile the current file with Make" msgstr "Prevede trenutno datoteko z Make" -#: ../src/build.c:1535 +#: ../src/build.c:1655 #, c-format msgid "Process could not be stopped (%s)." msgstr "Procesa ni bilo mogoče zaustaviti (%s)." -#: ../src/build.c:1554 ../src/build.c:1568 +#: ../src/build.c:1672 ../src/build.c:1684 msgid "No more build errors." msgstr "Ni več napak gradnje." -#: ../src/build.c:1630 +#: ../src/build.c:1756 msgid "Item" -msgstr "" +msgstr "Izbira" -#: ../src/build.c:1631 ../src/symbols.c:636 +#: ../src/build.c:1757 ../src/symbols.c:639 msgid "Label" msgstr "Oznaka" -#: ../src/build.c:1632 ../src/symbols.c:631 +#: ../src/build.c:1758 ../src/symbols.c:634 msgid "Command" msgstr "Ukaz" -#: ../src/build.c:1633 -#, fuzzy +#: ../src/build.c:1759 msgid "Working directory" -msgstr "%s (v mapi: %s)" +msgstr "Delovni imenik" -#: ../src/build.c:1634 -#, fuzzy +#: ../src/build.c:1760 msgid "Clear" -msgstr "Prevajalnik" +msgstr "Počisti" # in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1726 -#, c-format -msgid "%s commands" +#: ../src/build.c:1862 ../src/build.c:1864 +#, fuzzy, c-format +msgid "%s Commands" msgstr "%s ukazi" -#: ../src/build.c:1728 -#, fuzzy +#: ../src/build.c:1864 msgid "No Filetype" -msgstr "Nastavi _tip datoteke" +msgstr "Brez tipa datoteke" -#: ../src/build.c:1736 ../src/build.c:1769 +#: ../src/build.c:1872 ../src/build.c:1907 #, fuzzy -msgid "Error Regular Expression" -msgstr "_Grepovi regularni izrazi" +msgid "Error Regular Expression:" +msgstr "Napaka regularnega izraza" -#: ../src/build.c:1763 -msgid "Non Filetype Commands" +#: ../src/build.c:1900 +#, fuzzy +msgid "Non-Filetype Commands" +msgstr "Ukazi nedatotečne vrste" + +#: ../src/build.c:1930 +msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" -#: ../src/build.c:1796 -#, fuzzy +#: ../src/build.c:1939 msgid "Execute Commands" -msgstr "Nastavi ukaze po meri" +msgstr "Izvedi ukaze" -#: ../src/build.c:1811 +#: ../src/build.c:1950 #, c-format msgid "" -"Notes:\n" -" %d, %e, %f, %p are substituted in Commands and Working dir, see manual " -"for details\n" -" Non-filetype menu Item 2 opens a dialog and appends the reponse to the " -"command" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." msgstr "" -#: ../src/build.c:1956 -#, fuzzy +#: ../src/build.c:2102 msgid "Set Build Commands" -msgstr "Nastavi ukaze po meri" +msgstr "Nastavi ukaze za gradnjo" -#: ../src/build.c:2191 ../src/build.c:2358 -#, fuzzy +#: ../src/build.c:2368 ../src/build.c:2553 msgid "_Execute" -msgstr "Poženi:" +msgstr "_Izvedi:" -#: ../src/build.c:2355 -#, fuzzy +#: ../src/build.c:2550 msgid "_Make" -msgstr "Make:" +msgstr "_Zgradi:" # zgradi izvorno kodo z make custom #. build the code with make custom -#: ../src/build.c:2356 ../src/build.c:2409 +#: ../src/build.c:2551 ../src/build.c:2604 msgid "Make Custom _Target" msgstr "Zgradi _tarčo po meri" # zgradi izvorno kodo z make object #. build the code with make object -#: ../src/build.c:2357 ../src/build.c:2417 +#: ../src/build.c:2552 ../src/build.c:2612 msgid "Make _Object" msgstr "Zgradi _objekt" # zgradi izvorno kodo #. build the code -#: ../src/build.c:2389 ../src/interface.c:976 +#: ../src/build.c:2584 ../src/interface.c:1069 msgid "_Build" msgstr "_Zgradi" # zgradi izvorno kodo z make all #. build the code with make all -#: ../src/build.c:2401 +#: ../src/build.c:2596 msgid "_Make All" msgstr "Zgradi _vse" #. arguments -#: ../src/build.c:2429 -#, fuzzy +#: ../src/build.c:2624 msgid "_Set Build Menu Commands" -msgstr "Nastavi ukaze po meri" +msgstr "Nastavi ukaze za izbirnik gradnje" -#: ../src/callbacks.c:152 +#: ../src/callbacks.c:153 msgid "Do you really want to quit?" msgstr "Zares želite končati z delom?" # ponovno naloži datoteko -#: ../src/callbacks.c:469 ../src/document.c:2871 ../src/interface.c:340 -#: ../src/treeviews.c:578 +#: ../src/callbacks.c:481 ../src/document.c:2923 ../src/interface.c:351 +#: ../src/sidebar.c:580 msgid "_Reload" msgstr "_Ponovno odpri" -#: ../src/callbacks.c:470 +#: ../src/callbacks.c:482 msgid "Any unsaved changes will be lost." msgstr "Vse neshranjene spremembe bodo izgubljene." -#: ../src/callbacks.c:471 +#: ../src/callbacks.c:483 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Zagotovo želite ponovno odpreti '%s'?" -#: ../src/callbacks.c:1249 ../src/keybindings.c:397 +#: ../src/callbacks.c:1270 ../src/keybindings.c:420 msgid "Go to Line" msgstr "Pojdi na vrstico" -#: ../src/callbacks.c:1249 +#: ../src/callbacks.c:1270 msgid "Enter the line you want to go to:" msgstr "Vnesite želeno številko vrstice:" -#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +#: ../src/callbacks.c:1367 ../src/callbacks.c:1392 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Prosim, nastavite tip datoteke za trenutno datoteko preden uporabite to " "funkcijo." -#: ../src/callbacks.c:1481 ../src/ui_utils.c:542 +#: ../src/callbacks.c:1504 ../src/ui_utils.c:544 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:543 +#: ../src/callbacks.c:1506 ../src/ui_utils.c:545 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1485 ../src/ui_utils.c:544 +#: ../src/callbacks.c:1508 ../src/ui_utils.c:546 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1487 ../src/ui_utils.c:553 +#: ../src/callbacks.c:1510 ../src/ui_utils.c:555 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1489 ../src/ui_utils.c:554 +#: ../src/callbacks.c:1512 ../src/ui_utils.c:556 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1491 ../src/ui_utils.c:555 +#: ../src/callbacks.c:1514 ../src/ui_utils.c:557 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1493 ../src/ui_utils.c:564 +#: ../src/callbacks.c:1516 ../src/ui_utils.c:566 msgid "_Use Custom Date Format" msgstr "_Uporabi obliko datuma po meri" -#: ../src/callbacks.c:1497 +#: ../src/callbacks.c:1520 msgid "Custom Date Format" msgstr "Oblika datuma po meri" -#: ../src/callbacks.c:1498 +#: ../src/callbacks.c:1521 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -380,21 +377,21 @@ "Tu vnesite obliko datuma in časa po meri. Uporabite lahko vse oblike, ki jih " "sprejme ANSI C strftime funkcija." -#: ../src/callbacks.c:1516 +#: ../src/callbacks.c:1539 msgid "Date format string could not be converted (possibly too long)." msgstr "Datumski oblični niz ni bil pretvorjen (verjetno predolg)." -#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 +#: ../src/callbacks.c:1753 ../src/callbacks.c:1763 msgid "No more message items." msgstr "Ni več sporočilnih postavk." # initialize the dialog #. initialize the dialog -#: ../src/dialogs.c:140 ../src/prefs.c:1634 +#: ../src/dialogs.c:140 ../src/prefs.c:1660 msgid "Open File" msgstr "Odpri datoteko" -#: ../src/dialogs.c:144 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:784 msgid "_View" msgstr "_Pogled" @@ -410,7 +407,7 @@ msgid "Detect by file extension" msgstr "Zaznaj po podaljšku datoteke" -#: ../src/dialogs.c:196 ../src/interface.c:3578 ../src/interface.c:5118 +#: ../src/dialogs.c:196 ../src/interface.c:3648 ../src/interface.c:5166 msgid "Detect from file" msgstr "Zaznaj po vsebini" @@ -460,13 +457,12 @@ "izbranim tipom datoteke." #: ../src/dialogs.c:389 -#, fuzzy msgid "Overwrite?" -msgstr "_Prezri" +msgstr "Prepišem?" #: ../src/dialogs.c:390 msgid "Filename already exists!" -msgstr "" +msgstr "Datoteka s tem imenom že obstaja!" #: ../src/dialogs.c:424 msgid "Save File" @@ -496,7 +492,7 @@ msgid "Error" msgstr "Napaka" -#: ../src/dialogs.c:569 ../src/dialogs.c:1367 ../src/win32.c:568 +#: ../src/dialogs.c:569 ../src/dialogs.c:1382 ../src/win32.c:568 #: ../src/win32.c:627 msgid "Question" msgstr "Vprašanje" @@ -536,112 +532,112 @@ #: ../src/dialogs.c:1023 ../src/dialogs.c:1024 ../src/dialogs.c:1025 #: ../src/dialogs.c:1031 ../src/dialogs.c:1032 ../src/dialogs.c:1033 -#: ../src/symbols.c:1707 ../src/symbols.c:1728 ../src/symbols.c:1780 -#: ../src/ui_utils.c:216 +#: ../src/symbols.c:1691 ../src/symbols.c:1712 ../src/symbols.c:1764 +#: ../src/ui_utils.c:218 msgid "unknown" msgstr "neznano" -#: ../src/dialogs.c:1038 ../src/symbols.c:780 +#: ../src/dialogs.c:1038 ../src/symbols.c:782 msgid "Properties" msgstr "Lastnosti" -#: ../src/dialogs.c:1069 +#: ../src/dialogs.c:1067 msgid "Type:" msgstr "Tip:" -#: ../src/dialogs.c:1083 +#: ../src/dialogs.c:1081 msgid "Size:" msgstr "Velikost:" -#: ../src/dialogs.c:1099 +#: ../src/dialogs.c:1097 msgid "Location:" -msgstr "Location:" +msgstr "Pot:" -#: ../src/dialogs.c:1113 +#: ../src/dialogs.c:1111 msgid "Read-only:" msgstr "Samo-za-branje:" -#: ../src/dialogs.c:1120 +#: ../src/dialogs.c:1118 msgid "(only inside Geany)" msgstr "(samo znotraj Geany)" -#: ../src/dialogs.c:1129 +#: ../src/dialogs.c:1127 msgid "Encoding:" msgstr "Kodiranje:" #. BOM = byte order mark -#: ../src/dialogs.c:1139 ../src/ui_utils.c:219 +#: ../src/dialogs.c:1137 ../src/ui_utils.c:221 msgid "(with BOM)" msgstr "(z BOM)" -#: ../src/dialogs.c:1139 +#: ../src/dialogs.c:1137 msgid "(without BOM)" msgstr "(brez BOM)" # prilagojeno, spremenjeno -#: ../src/dialogs.c:1150 +#: ../src/dialogs.c:1148 msgid "Modified:" msgstr "Prilagojeno:" # spremenjeno, prenarejeno -#: ../src/dialogs.c:1164 +#: ../src/dialogs.c:1162 msgid "Changed:" msgstr "Spremenjeno:" -#: ../src/dialogs.c:1178 +#: ../src/dialogs.c:1176 msgid "Accessed:" msgstr "Dostopano:" -#: ../src/dialogs.c:1200 +#: ../src/dialogs.c:1198 msgid "Permissions:" msgstr "Dovoljenja:" #. Header -#: ../src/dialogs.c:1208 +#: ../src/dialogs.c:1206 msgid "Read:" msgstr "Branje:" -#: ../src/dialogs.c:1215 +#: ../src/dialogs.c:1213 msgid "Write:" msgstr "Pisanje:" -#: ../src/dialogs.c:1222 +#: ../src/dialogs.c:1220 msgid "Execute:" msgstr "Poženi:" # Lastnik #. Owner -#: ../src/dialogs.c:1230 +#: ../src/dialogs.c:1228 msgid "Owner:" msgstr "Lastnik:" #. Group -#: ../src/dialogs.c:1266 +#: ../src/dialogs.c:1264 msgid "Group:" msgstr "Skupina:" # Drugi, npr. guest, anonymus, ostali uporabniki #. Other -#: ../src/dialogs.c:1302 +#: ../src/dialogs.c:1300 msgid "Other:" msgstr "Drugi:" -#: ../src/document.c:622 +#: ../src/document.c:643 #, c-format msgid "File %s closed." msgstr "Datoteka %s zaprta." -#: ../src/document.c:745 +#: ../src/document.c:768 #, c-format msgid "New file \"%s\" opened." msgstr "Odprta nova datoteka \"%s\"." -#: ../src/document.c:918 ../src/document.c:1421 +#: ../src/document.c:941 ../src/document.c:1456 #, c-format msgid "Could not open file %s (%s)" msgstr "Ni mogoče odpreti datoteke %s (%s)" -#: ../src/document.c:948 +#: ../src/document.c:971 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -658,12 +654,12 @@ # Datoteka \"test.txt" ni veljavna UTF-8 datoteka. #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:974 +#: ../src/document.c:997 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Datoteka \"%s\" ni veljavna %s datoteka." -#: ../src/document.c:984 +#: ../src/document.c:1007 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -671,15 +667,15 @@ msgstr "" "Datoteka \"%s\" ni besedilna datoteka ali kodiranje besedila ni podprto." -#: ../src/document.c:1122 +#: ../src/document.c:1155 msgid "Spaces" msgstr "Presledki" -#: ../src/document.c:1125 +#: ../src/document.c:1158 msgid "Tabs" msgstr "Razmaki" -#: ../src/document.c:1128 +#: ../src/document.c:1161 msgid "Tabs and Spaces" msgstr "Razmaki in presledki" @@ -687,16 +683,16 @@ # * and Spaces), the second one is the filename #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1133 +#: ../src/document.c:1166 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Nastavitev %s načina zamikanja za %s." -#: ../src/document.c:1186 +#: ../src/document.c:1219 msgid "Invalid filename" msgstr "Napačno ime datoteke" -#: ../src/document.c:1309 +#: ../src/document.c:1334 #, c-format msgid "File %s reloaded." msgstr "Datoteka %s ponovno odprta." @@ -704,20 +700,20 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1314 +#: ../src/document.c:1339 #, c-format msgid "File %s opened(%d%s)." msgstr "Datoteka %s je odprta (%d%s)." -#: ../src/document.c:1316 +#: ../src/document.c:1341 msgid ", read-only" msgstr ", za branje" -#: ../src/document.c:1516 +#: ../src/document.c:1551 msgid "Error renaming file." msgstr "Napaka med preimenovanjem datoteke." -#: ../src/document.c:1591 +#: ../src/document.c:1626 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -726,7 +722,7 @@ "Napaka se je pojavila med pretvorbo datoteke iz UTF-8 \"%s\". Datoteka " "ostaja neshranjena." -#: ../src/document.c:1613 +#: ../src/document.c:1648 #, c-format msgid "" "Error message: %s\n" @@ -735,42 +731,42 @@ "Sporočilo o napaki: %s\n" "Napaka se je pojavila na mestu \"%s\" (vrstica: %d, stolpec %d)." -#: ../src/document.c:1618 +#: ../src/document.c:1653 #, c-format msgid "Error message: %s." msgstr "Sporočilo o napaki: %s." -#: ../src/document.c:1719 ../src/document.c:1779 +#: ../src/document.c:1756 ../src/document.c:1819 msgid "Error saving file." msgstr "Napaka med shranjevanjem datoteke." -#: ../src/document.c:1778 +#: ../src/document.c:1818 #, c-format msgid "Error saving file (%s)." msgstr "Napaka med shranjevanjem datoteke (%s)." -#: ../src/document.c:1803 +#: ../src/document.c:1843 #, c-format msgid "File %s saved." msgstr "Datoteka %s shranjena." # Search regexp I assume for now. -#: ../src/document.c:1871 ../src/document.c:1928 ../src/document.c:1936 +#: ../src/document.c:1911 ../src/document.c:1968 ../src/document.c:1976 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" ni bila najden." -#: ../src/document.c:1936 +#: ../src/document.c:1976 msgid "Wrap search and find again?" msgstr "Zaključim iskanje v preostanku?" -#: ../src/document.c:2015 ../src/search.c:1084 ../src/search.c:1688 -#: ../src/search.c:1689 +#: ../src/document.c:2055 ../src/search.c:1085 ../src/search.c:1659 +#: ../src/search.c:1660 #, c-format msgid "No matches found for \"%s\"." msgstr "Ni ujemanj za \"%s\"." -#: ../src/document.c:2026 ../src/document.c:2035 +#: ../src/document.c:2066 ../src/document.c:2075 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." @@ -779,11 +775,11 @@ msgstr[2] "%s: zamenjanih %d pojavljanj niza \"%s\" z nizom \"%s\"." msgstr[3] "%s: zamenjanih %d pojavljanj niza \"%s\" z nizom \"%s\"." -#: ../src/document.c:2872 +#: ../src/document.c:2924 msgid "Do you want to reload it?" msgstr "Ali želite ponovno odpreti datoteko?" -#: ../src/document.c:2873 +#: ../src/document.c:2925 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -792,20 +788,20 @@ "Datoteka '%s' na disku je bolj sveža kot\n" "trenutni pomnilnik." -#: ../src/document.c:2894 +#: ../src/document.c:2946 msgid "Try to resave the file?" msgstr "Želite ponovno shraniti?" -#: ../src/document.c:2895 +#: ../src/document.c:2947 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Datoteka \"%s\" ni bila najdena na disku!" -#: ../src/editor.c:4288 +#: ../src/editor.c:4357 msgid "Enter Tab Width" msgstr "Vnesite širino tabulatorja" -#: ../src/editor.c:4289 +#: ../src/editor.c:4358 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Vnesite število presledkov, ki naj bodo zamenjani s tabulatorjem. " @@ -836,7 +832,7 @@ #: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 msgid "Central European" -msgstr "Centralnoevropsko" +msgstr "Srednjeevropsko" # ISO-IR-111 ni na voljo pod Windows #. ISO-IR-111 not available on Windows @@ -921,27 +917,27 @@ msgid "Without encoding" msgstr "Brez kodiranja" -#: ../src/encodings.c:374 +#: ../src/encodings.c:375 msgid "_West European" msgstr "_Zahodnoevropsko" -#: ../src/encodings.c:380 +#: ../src/encodings.c:381 msgid "_East European" msgstr "_Vzhodnoevropsko" -#: ../src/encodings.c:386 +#: ../src/encodings.c:387 msgid "East _Asian" msgstr "Vzhodno _azijsko" -#: ../src/encodings.c:392 +#: ../src/encodings.c:393 msgid "_SE & SW Asian" msgstr "_JV & JZ azijsko" -#: ../src/encodings.c:398 +#: ../src/encodings.c:399 msgid "_Middle Eastern" msgstr "_Bližnjevzhodno" -#: ../src/encodings.c:404 +#: ../src/encodings.c:405 msgid "_Unicode" msgstr "_Unicode" @@ -952,544 +948,598 @@ msgstr "%s izvorna datoteka" #: ../src/filetypes.c:102 -#, fuzzy, c-format +#, c-format msgid "%s file" msgstr "%s izvorna datoteka" -#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3497 -#: ../src/interface.c:5037 +#: ../src/filetypes.c:118 ../src/filetypes.c:119 ../src/interface.c:3567 +#: ../src/interface.c:5109 msgid "None" msgstr "Brez" -#: ../src/filetypes.c:387 +#: ../src/filetypes.c:409 msgid "Shell script file" msgstr "Lupinski skript" -#: ../src/filetypes.c:399 +#: ../src/filetypes.c:421 msgid "Makefile" msgstr "Datoteka gradnje" -#: ../src/filetypes.c:411 +#: ../src/filetypes.c:433 msgid "XML document" msgstr "dokument XML" -#: ../src/filetypes.c:446 +#: ../src/filetypes.c:468 msgid "Cascading StyleSheet" msgstr "Padajoča slogovna predloga (CSS)" -#: ../src/filetypes.c:457 +#: ../src/filetypes.c:479 msgid "SQL Dump file" msgstr "SQL " -#: ../src/filetypes.c:501 +#: ../src/filetypes.c:523 msgid "Config file" msgstr "Nastavitvena datoteka" -#: ../src/filetypes.c:513 +#: ../src/filetypes.c:535 msgid "Gettext translation file" msgstr "Gettext datoteka s prevodi" -#: ../src/filetypes.c:546 +#: ../src/filetypes.c:568 #, c-format msgid "%s script file" msgstr "%s skriptna datoteka" -#: ../src/filetypes.c:797 +#: ../src/filetypes.c:814 msgid "_Programming Languages" msgstr "_Programski jeziki" -#: ../src/filetypes.c:798 +#: ../src/filetypes.c:815 msgid "_Scripting Languages" msgstr "_Skriptni jeziki" -#: ../src/filetypes.c:799 +#: ../src/filetypes.c:816 msgid "_Markup Languages" msgstr "_Označevalni jeziki" -#: ../src/filetypes.c:800 +#: ../src/filetypes.c:817 msgid "M_iscellaneous Languages" msgstr "_Drugi jeziki" -#: ../src/filetypes.c:1349 ../src/win32.c:107 +#: ../src/filetypes.c:1386 ../src/win32.c:107 msgid "All Source" msgstr "Vsa izvorna koda" -#: ../src/filetypes.c:1374 ../src/project.c:291 +#: ../src/filetypes.c:1411 ../src/project.c:292 msgid "All files" msgstr "Vse datoteke" -#: ../src/filetypes.c:1432 +#: ../src/filetypes.c:1470 #, c-format msgid "Bad regex for filetype %s: %s" -msgstr "Slab regex za datotečno vrsto %s: %s" +msgstr "Slab regex izraz za datotečno vrsto %s: %s" #: ../src/geany.h:53 msgid "untitled" msgstr "neimenovano" -#: ../src/interface.c:276 +#: ../src/interface.c:294 msgid "_File" msgstr "_Datoteka" -#: ../src/interface.c:287 +#: ../src/interface.c:305 msgid "New (with _Template)" msgstr "Novo (iz _vzorca)" -#: ../src/interface.c:298 ../src/interface.c:359 ../src/interface.c:537 -#: ../src/interface.c:591 ../src/interface.c:605 ../src/interface.c:851 -#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 -#: ../src/interface.c:2086 -msgid "invisible" -msgstr "nevidno" - -#: ../src/interface.c:300 -msgid "dummy tooltip, don't translate this." -msgstr "dummy tooltip, don't translate this." - -#: ../src/interface.c:311 ../src/interface.c:1940 +#: ../src/interface.c:322 ../src/interface.c:2086 msgid "Open Selected F_ile" msgstr "Odpri _izbrano datoteko" -#: ../src/interface.c:315 +#: ../src/interface.c:326 msgid "Recent _Files" msgstr "_Nedavne datoteke" -#: ../src/interface.c:332 +#: ../src/interface.c:343 msgid "Save A_ll" msgstr "Shrani _vse" -#: ../src/interface.c:348 +#: ../src/interface.c:359 msgid "R_eload As" msgstr "Pono_vno odpri kot" -#: ../src/interface.c:376 +#: ../src/interface.c:370 ../src/interface.c:556 ../src/interface.c:676 +#: ../src/interface.c:690 ../src/interface.c:944 ../src/interface.c:954 +#: ../src/interface.c:2154 ../src/interface.c:2168 +msgid "invisible" +msgstr "nevidno" + +#: ../src/interface.c:387 msgid "Page Set_up" msgstr "Nastavitev _strani" -#: ../src/interface.c:393 ../src/notebook.c:240 +#: ../src/interface.c:404 ../src/notebook.c:213 msgid "Close Ot_her Documents" msgstr "Zapri _ostale dokumente" # zapre vse dokumente -#: ../src/interface.c:401 ../src/notebook.c:245 +#: ../src/interface.c:412 ../src/notebook.c:218 msgid "C_lose All" msgstr "Zapri _vse" -#: ../src/interface.c:418 +#: ../src/interface.c:429 msgid "_Edit" msgstr "_Uredi" -#: ../src/interface.c:468 ../src/interface.c:1949 +#: ../src/interface.c:479 ../src/interface.c:2095 msgid "_Format" msgstr "_Oblika" -#: ../src/interface.c:475 ../src/interface.c:1956 +#: ../src/interface.c:486 ../src/keybindings.c:364 +#, fuzzy +msgid "_Reflow Lines/Block" +msgstr "Ponovno poravnaj vrstice/blok" + +#: ../src/interface.c:490 msgid "T_oggle Case of Selection" msgstr "Pre_obrni izbor" -#: ../src/interface.c:484 ../src/interface.c:1965 +#: ../src/interface.c:494 ../src/keybindings.c:270 +#, fuzzy +msgid "_Transpose Current Line" +msgstr "Prestavi tekočo vrstico" + +#: ../src/interface.c:503 msgid "_Comment Line(s)" msgstr "_Komentiraj vrstico ali več vrstic" -#: ../src/interface.c:488 ../src/interface.c:1969 +#: ../src/interface.c:507 msgid "U_ncomment Line(s)" msgstr "_Odkomentiraj vrstico ali več vrstic" -#: ../src/interface.c:492 ../src/interface.c:1973 +#: ../src/interface.c:511 msgid "_Toggle Line Commentation" msgstr "_Preklopi komentiranje vrstic" -#: ../src/interface.c:496 ../src/interface.c:1977 -msgid "Du_plicate Line or Selection" -msgstr "Po_dvoji vrstico ali izbor" - -#: ../src/interface.c:505 ../src/interface.c:1986 +#: ../src/interface.c:520 msgid "_Increase Indent" msgstr "_Povečaj zamik" -#: ../src/interface.c:513 ../src/interface.c:1994 +#: ../src/interface.c:528 msgid "_Decrease Indent" msgstr "_Zmanjšaj zamik" -#: ../src/interface.c:526 ../src/interface.c:2007 +#: ../src/interface.c:536 ../src/keybindings.c:354 +#, fuzzy +msgid "_Smart Line Indent" +msgstr "Pametno zamikanje vrstic" + +#: ../src/interface.c:545 msgid "_Send Selection to Terminal" msgstr "_Pošlji izbor terminalu" -#: ../src/interface.c:530 ../src/interface.c:2011 +#: ../src/interface.c:549 msgid "_Send Selection to" msgstr "_Pošlji izbor v" -#: ../src/interface.c:545 ../src/interface.c:2026 +#: ../src/interface.c:559 ../src/interface.c:2099 +#, fuzzy +msgid "_Commands" +msgstr "Ukaz" + +#: ../src/interface.c:566 ../src/keybindings.c:311 +msgid "Cut current line(s)" +msgstr "Izreži tekočo vrstico ali več vrstic" + +#: ../src/interface.c:574 ../src/keybindings.c:308 +msgid "Copy current line(s)" +msgstr "Kopiraj tekočo vrstico ali več vrstic" + +#: ../src/interface.c:582 ../src/keybindings.c:263 +msgid "Delete current line(s)" +msgstr "Izbriši trenutno vrstico ali več vrstic" + +#: ../src/interface.c:586 ../src/keybindings.c:260 +msgid "Duplicate line or selection" +msgstr "Podvoji vrstico ali izbor" + +#: ../src/interface.c:595 ../src/keybindings.c:321 +msgid "Select current line(s)" +msgstr "Izberi tekočo vrstico ali več vrstic" + +#: ../src/interface.c:599 ../src/keybindings.c:324 +msgid "Select current paragraph" +msgstr "Izberi tekoči odstavek" + +#: ../src/interface.c:608 ../src/keybindings.c:373 +msgid "Insert alternative white space" +msgstr "Vstavi alternativni presledek" + +#: ../src/interface.c:617 ../src/keybindings.c:429 +msgid "Go to next marker" +msgstr "Pojdi na naslednjo oznako" + +#: ../src/interface.c:621 ../src/keybindings.c:432 +msgid "Go to previous marker" +msgstr "Pojdi na predhodno oznako" + +#: ../src/interface.c:630 ../src/interface.c:2108 msgid "I_nsert Comments" msgstr "Vstavi _komentar" -#: ../src/interface.c:556 ../src/interface.c:2037 +#: ../src/interface.c:641 ../src/interface.c:2119 msgid "Insert _ChangeLog Entry" msgstr "Vstavi vnos d_nevnika sprememb" -#: ../src/interface.c:560 ../src/interface.c:2041 +#: ../src/interface.c:645 ../src/interface.c:2123 msgid "Insert File _Header" msgstr "Vstavi _zaglavje datoteke" -#: ../src/interface.c:564 ../src/interface.c:2045 +#: ../src/interface.c:649 ../src/interface.c:2127 msgid "Insert _Function Description" msgstr "Vstavi opis _funkcije" -#: ../src/interface.c:568 ../src/interface.c:2049 +#: ../src/interface.c:653 ../src/interface.c:2131 msgid "Insert _Multiline Comment" msgstr "Vstavi ve_čvrstični komentar" -#: ../src/interface.c:572 ../src/interface.c:2053 +#: ../src/interface.c:657 ../src/interface.c:2135 msgid "Insert _GPL Notice" msgstr "Vstavi _GPL obvestilo" -#: ../src/interface.c:576 ../src/interface.c:2057 +#: ../src/interface.c:661 ../src/interface.c:2139 msgid "Insert _BSD License Notice" msgstr "Vstavi _BSD obvestilo" -#: ../src/interface.c:580 ../src/interface.c:2061 +#: ../src/interface.c:665 ../src/interface.c:2143 msgid "Insert Dat_e" msgstr "Vstavi _datum" -#: ../src/interface.c:594 ../src/interface.c:2075 +#: ../src/interface.c:679 ../src/interface.c:2157 msgid "_Insert \"include <...>\"" msgstr "_Vstavi \"include <...>\"" -#: ../src/interface.c:613 +#: ../src/interface.c:698 msgid "Preference_s" msgstr "_Možnosti" -#: ../src/interface.c:621 +#: ../src/interface.c:706 ../src/keybindings.c:382 +#, fuzzy +msgid "P_lugin Preferences" +msgstr "Možnosti" + +#: ../src/interface.c:714 msgid "_Search" msgstr "_Išči" -#: ../src/interface.c:632 +#: ../src/interface.c:725 msgid "Find _Next" msgstr "Išči _naslednje" -#: ../src/interface.c:636 +#: ../src/interface.c:729 msgid "Find _Previous" msgstr "Išči _predhodno" -#: ../src/interface.c:640 +#: ../src/interface.c:733 msgid "Find in F_iles" msgstr "Išči v _datoteki" -#: ../src/interface.c:644 ../src/search.c:524 +#: ../src/interface.c:737 ../src/search.c:524 msgid "_Replace" msgstr "_Zamenjaj" -#: ../src/interface.c:657 +#: ../src/interface.c:750 msgid "Find _Selected" msgstr "Išči v _izboru" -#: ../src/interface.c:661 +#: ../src/interface.c:754 msgid "Find Pre_vious Selected" msgstr "Išči v p_rejšnjem izboru" -#: ../src/interface.c:670 +#: ../src/interface.c:763 msgid "Next _Message" msgstr "Naslednje _sporočilo" -#: ../src/interface.c:674 +#: ../src/interface.c:767 msgid "Pr_evious Message" msgstr "Pr_ejšnje sporočilo" -#: ../src/interface.c:683 ../src/interface.c:2127 +#: ../src/interface.c:776 ../src/interface.c:2209 msgid "_Go to Line" msgstr "Pojdi na vrs_tico" -#: ../src/interface.c:698 +#: ../src/interface.c:791 msgid "Change _Font" msgstr "Spremeni _nabor znakov" -#: ../src/interface.c:711 +#: ../src/interface.c:804 msgid "To_ggle All Additional Widgets" msgstr "Preklo_pi vse dodatne gradnike" -#: ../src/interface.c:715 +#: ../src/interface.c:808 msgid "Full_screen" msgstr "_Celozaslonsko" -#: ../src/interface.c:719 +#: ../src/interface.c:812 msgid "Show Message _Window" msgstr "Pokaži _sporočilno okno" -#: ../src/interface.c:724 +#: ../src/interface.c:817 msgid "Show _Toolbar" msgstr "Pokaži _orodno vrstico" -#: ../src/interface.c:729 +#: ../src/interface.c:822 msgid "Show Side_bar" msgstr "Pokaži s_transko vrstico" -#: ../src/interface.c:734 ../src/interface.c:3913 ../src/keybindings.c:250 +#: ../src/interface.c:827 ../src/interface.c:3983 ../src/keybindings.c:253 msgid "Editor" msgstr "Urejevalnik" -#: ../src/interface.c:741 +#: ../src/interface.c:834 msgid "Show _Markers Margin" msgstr "Pokaži _rob oznak" -#: ../src/interface.c:746 +#: ../src/interface.c:839 msgid "Show _Line Numbers" msgstr "Pokaži številke _vrstic" -#: ../src/interface.c:751 +#: ../src/interface.c:844 msgid "Show _White Space" msgstr "Pokaži _prazne znake" -#: ../src/interface.c:755 +#: ../src/interface.c:848 msgid "Show Line _Endings" msgstr "Prikaži _konce vrstic" -#: ../src/interface.c:759 +#: ../src/interface.c:852 msgid "Show _Indentation Guides" msgstr "Pokaži vodila _zamikanja" -#: ../src/interface.c:780 +#: ../src/interface.c:873 msgid "_Document" msgstr "_Dokument" -#: ../src/interface.c:787 +#: ../src/interface.c:880 msgid "_Line Wrapping" msgstr "_Zavijanje vrstic" -#: ../src/interface.c:792 +#: ../src/interface.c:885 msgid "Line _Breaking" msgstr "_Lomljenje vrstic" -#: ../src/interface.c:796 +#: ../src/interface.c:889 msgid "_Auto-indentation" msgstr "S_amozamikanje" -#: ../src/interface.c:801 +#: ../src/interface.c:894 msgid "In_dent Type" msgstr "Vrsta _zamika" -#: ../src/interface.c:808 ../src/interface.c:3536 ../src/interface.c:5076 +#: ../src/interface.c:901 ../src/interface.c:3606 ../src/interface.c:5148 msgid "_Tabs" msgstr "_Razmaki" -#: ../src/interface.c:814 ../src/interface.c:3527 ../src/interface.c:5067 +#: ../src/interface.c:907 ../src/interface.c:3597 ../src/interface.c:5139 msgid "_Spaces" msgstr "_Presledki" -#: ../src/interface.c:820 ../src/interface.c:3545 ../src/interface.c:5085 +#: ../src/interface.c:913 ../src/interface.c:3615 ../src/interface.c:5157 msgid "T_abs and Spaces" msgstr "R_azmaki in presledki" -#: ../src/interface.c:831 +#: ../src/interface.c:924 msgid "Read _Only" msgstr "Le za _branje" -#: ../src/interface.c:835 +#: ../src/interface.c:928 msgid "_Write Unicode BOM" msgstr "_Zapiši Unicode BOM" -#: ../src/interface.c:844 +#: ../src/interface.c:937 msgid "Set File_type" msgstr "Nastavi _tip datoteke" -#: ../src/interface.c:854 +#: ../src/interface.c:947 msgid "Set _Encoding" msgstr "Nastavi _kodiranje" -#: ../src/interface.c:864 +#: ../src/interface.c:957 msgid "Set Line E_ndings" msgstr "Nastavi ko_nce vrstic" -#: ../src/interface.c:871 +#: ../src/interface.c:964 msgid "Convert and Set to _CR/LF (Win)" msgstr "Pretvori in nastavi na _CR/LF (Win)" -#: ../src/interface.c:877 +#: ../src/interface.c:970 msgid "Convert and Set to _LF (Unix)" msgstr "Pretvori in nastavi na _LF (Unix)" -#: ../src/interface.c:883 +#: ../src/interface.c:976 msgid "Convert and Set to CR (_Mac)" msgstr "Pretvori in nastavi na CR(_Mac)" -#: ../src/interface.c:894 +#: ../src/interface.c:987 msgid "_Strip Trailing Spaces" msgstr "_Odreži presledke na repu" -#: ../src/interface.c:898 +#: ../src/interface.c:991 msgid "_Replace Tabs by Spaces" msgstr "Zamenjaj _razmake s presledki" -#: ../src/interface.c:902 +#: ../src/interface.c:995 msgid "Replace Spaces b_y Tabs" msgstr "Zamenjaj _presledke z razmaki" -#: ../src/interface.c:911 +#: ../src/interface.c:1004 msgid "_Fold All" msgstr "_Zvij vse" -#: ../src/interface.c:915 +#: ../src/interface.c:1008 msgid "_Unfold All" msgstr "_Odvij vse" -#: ../src/interface.c:924 +#: ../src/interface.c:1017 msgid "Remove _Markers" msgstr "Odstrani _oznake" -#: ../src/interface.c:928 +#: ../src/interface.c:1021 msgid "Remove Error _Indicators" msgstr "Odstrani oznake _napak" -#: ../src/interface.c:932 +#: ../src/interface.c:1025 msgid "_Project" msgstr "_Projekt" -#: ../src/interface.c:939 +#: ../src/interface.c:1032 msgid "_New" msgstr "_Nov" -#: ../src/interface.c:947 +#: ../src/interface.c:1040 msgid "_Open" msgstr "_Odpri" -#: ../src/interface.c:955 +#: ../src/interface.c:1048 msgid "_Recent Projects" msgstr "Ne_davni projekti" -#: ../src/interface.c:959 +#: ../src/interface.c:1052 msgid "_Close" msgstr "_Zapri" -#: ../src/interface.c:980 +#: ../src/interface.c:1073 msgid "_Tools" msgstr "_Orodja" -#: ../src/interface.c:987 +#: ../src/interface.c:1080 +msgid "_Reload Configuration" +msgstr "_Osveži nastavitve" + +#: ../src/interface.c:1088 +msgid "C_onfiguration Files" +msgstr "_Nastavitvene datoteke" + +#: ../src/interface.c:1101 msgid "_Color Chooser" msgstr "_Barvni izbiralnik" -#: ../src/interface.c:995 +#: ../src/interface.c:1109 msgid "_Word Count" msgstr "_Preštevalnik besed" -#: ../src/interface.c:999 +#: ../src/interface.c:1113 msgid "Load Ta_gs" msgstr "Naloži _značke" -#: ../src/interface.c:1003 -msgid "_Reload Configuration" -msgstr "_Osveži nastavitve" - -#: ../src/interface.c:1011 ../src/interface.c:1018 +#: ../src/interface.c:1117 ../src/interface.c:1124 msgid "_Help" msgstr "_Pomoč" -#: ../src/interface.c:1026 +#: ../src/interface.c:1132 msgid "_Website" msgstr "_Splet" -#: ../src/interface.c:1030 +#: ../src/interface.c:1136 msgid "_Keyboard Shortcuts" msgstr "Bližnjice _tipkovnice" -#: ../src/interface.c:1034 +#: ../src/interface.c:1140 msgid "_Debug Messages" msgstr "_Razhroščevalna sporočila" -#: ../src/interface.c:1073 ../src/treeviews.c:119 +#: ../src/interface.c:1179 ../src/sidebar.c:121 msgid "Symbols" msgstr "Simboli" -#: ../src/interface.c:1087 +#: ../src/interface.c:1193 msgid "Documents" msgstr "Dokumenti" -#: ../src/interface.c:1123 +#: ../src/interface.c:1229 msgid "Status" msgstr "Stanje" -#: ../src/interface.c:1137 +#: ../src/interface.c:1243 msgid "Compiler" msgstr "Prevajalnik" -#: ../src/interface.c:1152 +#: ../src/interface.c:1258 msgid "Messages" msgstr "Sporočila" -#: ../src/interface.c:1165 +#: ../src/interface.c:1271 msgid "Scribble" msgstr "Beležka" -#: ../src/interface.c:1727 ../src/interface.c:3282 +#: ../src/interface.c:1889 ../src/interface.c:3352 msgid "Images _and Text" msgstr "Besedilo _in podobe" -#: ../src/interface.c:1732 ../src/interface.c:3314 +#: ../src/interface.c:1894 ../src/interface.c:3384 msgid "_Images Only" msgstr "Samo _podobe" -#: ../src/interface.c:1737 ../src/interface.c:3306 +#: ../src/interface.c:1899 ../src/interface.c:3376 msgid "_Text Only" msgstr "Samo _besedilo" -#: ../src/interface.c:1748 ../src/interface.c:3298 +#: ../src/interface.c:1910 ../src/interface.c:3368 msgid "_Large Icons" msgstr "_Velike ikone" -#: ../src/interface.c:1753 ../src/interface.c:3290 +#: ../src/interface.c:1915 ../src/interface.c:3360 msgid "_Small Icons" msgstr "_Male ikone" -#: ../src/interface.c:1758 ../src/interface.c:3322 +#: ../src/interface.c:1920 ../src/interface.c:3392 msgid "_Very Small Icons" msgstr "_Drobne ikone" -#: ../src/interface.c:1769 -#, fuzzy +#: ../src/interface.c:1931 msgid "_Customize Toolbar" -msgstr "_Skrij orodno vrstico" +msgstr "Pri_lagodi orodno vrstico" -#: ../src/interface.c:1777 -#, fuzzy +#: ../src/interface.c:1939 msgid "_Hide Toolbar" msgstr "_Skrij orodno vrstico" -#: ../src/interface.c:2094 +#: ../src/interface.c:2176 msgid "Find _Usage" msgstr "Najdi _uporabo" -#: ../src/interface.c:2102 +#: ../src/interface.c:2184 msgid "Find _Document Usage" msgstr "Najdi uporabo _dokumenta" -#: ../src/interface.c:2110 +#: ../src/interface.c:2192 msgid "Go to _Tag Definition" msgstr "Pojdi na _opredelitev značke" -#: ../src/interface.c:2114 +#: ../src/interface.c:2196 msgid "Go to T_ag Declaration" msgstr "Pojdi na _navedbo značke" -#: ../src/interface.c:2118 +#: ../src/interface.c:2200 msgid "Conte_xt Action" msgstr "Dejanje _konteksta" -#: ../src/interface.c:2663 ../src/keybindings.c:358 +#: ../src/interface.c:2712 ../src/keybindings.c:379 msgid "Preferences" msgstr "Možnosti" -#: ../src/interface.c:2699 +#: ../src/interface.c:2748 msgid "Load files from the last session" msgstr "Naloži datoteke prejšnje seje" -#: ../src/interface.c:2702 +#: ../src/interface.c:2751 msgid "Opens at startup the files from the last session" msgstr "Ob zagonu odpre datoteke iz zadnje seje" -#: ../src/interface.c:2704 +#: ../src/interface.c:2753 msgid "Load virtual terminal support" msgstr "Naloži podporo za navidezni terminal" -#: ../src/interface.c:2706 +#: ../src/interface.c:2755 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1497,40 +1547,40 @@ "Ali naj bo ob zagonu naložena podpora za posnemovalnik navideznega terminal " "(VTE) . Onemogočite, če je ne potrebujete." -#: ../src/interface.c:2708 +#: ../src/interface.c:2757 msgid "Enable plugin support" msgstr "Omogoči podporo vstavkom" -#: ../src/interface.c:2712 +#: ../src/interface.c:2761 msgid "Startup" msgstr "Zagon" -#: ../src/interface.c:2731 +#: ../src/interface.c:2780 msgid "Save window position and geometry" msgstr "Shrani položaj in razmerja okna" -#: ../src/interface.c:2734 +#: ../src/interface.c:2783 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Shrani položaj okna in njegova razmerja ter jih obnovi ob naslednjem zagonu" -#: ../src/interface.c:2736 +#: ../src/interface.c:2785 msgid "Confirm exit" msgstr "Potrdi izhod" -#: ../src/interface.c:2739 +#: ../src/interface.c:2788 msgid "Shows a confirmation dialog on exit" msgstr "Prikaže potrditveno okno ob izhodu" -#: ../src/interface.c:2741 +#: ../src/interface.c:2790 msgid "Shutdown" msgstr "Zaustavitev" -#: ../src/interface.c:2762 +#: ../src/interface.c:2811 msgid "Startup path:" msgstr "Zagonska pot:" -#: ../src/interface.c:2774 +#: ../src/interface.c:2823 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1538,19 +1588,19 @@ "Zagonska pot kjer odpirate in shranjujete datoteke. Mora biti absolutna pot. " "Pustite prazno, da uporabite trenutno delovno mapo." -#: ../src/interface.c:2787 +#: ../src/interface.c:2836 msgid "Project files:" msgstr "Projektne datoteke:" -#: ../src/interface.c:2799 +#: ../src/interface.c:2848 msgid "Path to start in when opening project files" msgstr "Začetna pot ob odprtju projektnih datotek" -#: ../src/interface.c:2812 +#: ../src/interface.c:2861 msgid "Extra plugin path:" msgstr "Pot do dodatnih vstavkov:" -#: ../src/interface.c:2824 +#: ../src/interface.c:2873 msgid "" "Geany looks by default in the global installation path and in the " "configuration directory. The path entered here will be searched additionally " @@ -1560,30 +1610,30 @@ "splošno namestitveno pot in nastavitveno mapo. Pustite prazno, da " "onemogočite." -#: ../src/interface.c:2837 +#: ../src/interface.c:2886 msgid "Paths" msgstr "Poti" -#: ../src/interface.c:2842 +#: ../src/interface.c:2891 msgid "Startup" msgstr "Zagon" -#: ../src/interface.c:2864 +#: ../src/interface.c:2913 msgid "Beep on errors or when compilation has finished" msgstr "Zapiskaj ob napaki ali ob zaključenem prevajanju" -#: ../src/interface.c:2867 +#: ../src/interface.c:2916 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "" "Ali naj se sproži pisk ob napaki oziroma ob zaključku prevajalnega postopka" -#: ../src/interface.c:2869 +#: ../src/interface.c:2918 msgid "Switch to status message list at new message" msgstr "Preklopi v seznam sporočil stanja po novem sporočilu" -#: ../src/interface.c:2872 +#: ../src/interface.c:2921 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1591,11 +1641,11 @@ "Ob novem sporočilu stanja preklopi v seznam sporočil stanja (v oknu zvezka " "na dnu)" -#: ../src/interface.c:2874 +#: ../src/interface.c:2923 msgid "Suppress status messages in the status bar" msgstr "Zatri sporočila stanja v vrstici stanja" -#: ../src/interface.c:2877 +#: ../src/interface.c:2926 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1604,13 +1654,12 @@ "v oknu sporočil stanja." # Kot naslednji/As next -#: ../src/interface.c:2879 -#, fuzzy +#: ../src/interface.c:2928 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Samodejno fokusiraj gradnike (fokus sledi miški)" # puščen delno nepreveden, bo dodelan - fokus ni najboljši prevod; will be done later, left partially undone - goto line fields? -#: ../src/interface.c:2882 +#: ../src/interface.c:2931 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1619,27 +1668,27 @@ "Samodejno dodeli fokus gradnikom pod miškinim kazalcem. Deluje za gradnike " "glavnega urejevalnika, beležko, iskanje iz orodne vrstice in VTE." -#: ../src/interface.c:2884 ../src/interface.c:3210 ../src/interface.c:4122 +#: ../src/interface.c:2933 ../src/interface.c:3280 ../src/interface.c:4188 msgid "Miscellaneous" msgstr "Raznotero" -#: ../src/interface.c:2904 +#: ../src/interface.c:2953 msgid "Always wrap search and hide the Find dialog" -msgstr "Vedno dokončaj iskanje in skrije pogovorno okno Najdi" +msgstr "Vedno obrne iskanje in skrije pogovorno okno Najdi" -#: ../src/interface.c:2907 +#: ../src/interface.c:2956 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" msgstr "" -"Vedno dokonča iskanje izraza dokumenta v preostanku besedila in skrije " -"pogovorno okno Najdi po kliku na Najdi Naprej/Nazaj" +"Vedno obrne iskanje izraza v preostanku dokumenta in skrije pogovorno okno " +"Najdi po kliku na Najdi Naprej/Nazaj" -#: ../src/interface.c:2909 +#: ../src/interface.c:2958 msgid "Use the current word under the cursor for Find dialogs" msgstr "Uporabi trenutno besedo pod kazalko za pogovorna okna Najdi" -#: ../src/interface.c:2912 +#: ../src/interface.c:2961 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" @@ -1647,19 +1696,19 @@ "Uporabi trenutno besedo pod kazalko ob odpiranju pogovornih oken Najdi, " "Najdi v datotekah ali Zamenjaj, ko ne obstaja izbira" -#: ../src/interface.c:2914 +#: ../src/interface.c:2963 msgid "Use the current file's directory for Find in Files" msgstr "Uporabi mapo trenutne datoteke za Najdi v datotekah" -#: ../src/interface.c:2918 +#: ../src/interface.c:2967 msgid "Search" msgstr "Išči" -#: ../src/interface.c:2937 +#: ../src/interface.c:2986 msgid "Use project-based session files" msgstr "Uporabi projektno osnovane sejne datoteke" -#: ../src/interface.c:2940 +#: ../src/interface.c:2989 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1667,11 +1716,11 @@ "Ali naj se sejne datoteke projekta shranijo in odprejo ob ponovnem odpiranju " "projekta" -#: ../src/interface.c:2942 +#: ../src/interface.c:2991 msgid "Store project file inside the project base directory" msgstr "Shrani projektno datoteko v osnovnem imenu projekta" -#: ../src/interface.c:2945 +#: ../src/interface.c:2994 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1683,75 +1732,90 @@ "njim. Še vedno pa lahko spremenite pot projektne datoteke v pogovornem oknu " "Nov projekt." -#: ../src/interface.c:2947 +#: ../src/interface.c:2996 msgid "Projects" msgstr "Projekti" -#: ../src/interface.c:2952 +#: ../src/interface.c:3001 msgid "Miscellaneous" msgstr "Raznotero" -#: ../src/interface.c:2956 +#: ../src/interface.c:3005 msgid "General" msgstr "Splošno" -#: ../src/interface.c:2979 +#: ../src/interface.c:3028 msgid "Show symbol list" msgstr "Pokaži seznam simbolov" -#: ../src/interface.c:2982 +#: ../src/interface.c:3031 msgid "Toggle the symbol list on and off" msgstr "Vklopi/izklopi seznam simbolov" -#: ../src/interface.c:2984 +#: ../src/interface.c:3033 msgid "Show documents list" msgstr "Pokaži seznam dokumentov" -#: ../src/interface.c:2987 +#: ../src/interface.c:3036 msgid "Toggle the documents list on and off" msgstr "Vklopi/izklopi seznam dokumentov" -#: ../src/interface.c:2989 +#: ../src/interface.c:3042 +#, fuzzy +msgid "Position:" +msgstr "Opis:" + +#: ../src/interface.c:3046 ../src/interface.c:3161 ../src/interface.c:3215 +#: ../src/interface.c:3233 ../src/interface.c:3251 +msgid "Left" +msgstr "Levo" + +#: ../src/interface.c:3053 ../src/interface.c:3169 ../src/interface.c:3216 +#: ../src/interface.c:3234 ../src/interface.c:3252 +msgid "Right" +msgstr "Desno" + +#: ../src/interface.c:3059 msgid "Sidebar" msgstr "Stranska vrstica" -#: ../src/interface.c:3010 +#: ../src/interface.c:3080 msgid "Symbol list:" msgstr "Seznam simbolov:" -#: ../src/interface.c:3017 ../src/interface.c:3132 +#: ../src/interface.c:3087 ../src/interface.c:3202 msgid "Message window:" msgstr "Sporočilno okno:" -#: ../src/interface.c:3024 ../src/interface.c:3168 +#: ../src/interface.c:3094 ../src/interface.c:3238 msgid "Editor:" msgstr "Urejevalnik:" -#: ../src/interface.c:3036 +#: ../src/interface.c:3106 msgid "Sets the font for the message window" msgstr "Nastavi nabor znakov za sporočilno okno" -#: ../src/interface.c:3044 +#: ../src/interface.c:3114 msgid "Sets the font for the symbol list" msgstr "Nastavi nabor znakov za seznam simbolov" -#: ../src/interface.c:3052 +#: ../src/interface.c:3122 msgid "Sets the editor font" msgstr "Nastavi nabor znakov za urejevalnik" -#: ../src/interface.c:3054 +#: ../src/interface.c:3124 msgid "Fonts" msgstr "Nabori znakov" -#: ../src/interface.c:3073 +#: ../src/interface.c:3143 msgid "Show editor tabs" msgstr "Pokaži razmake urejevalnika" -#: ../src/interface.c:3077 +#: ../src/interface.c:3147 msgid "Show close buttons" msgstr "Pokaži gumbe za zapiranje" -#: ../src/interface.c:3080 +#: ../src/interface.c:3150 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" @@ -1759,126 +1823,115 @@ "Pokaže majhen križast gumb na zavihku za lažje zapiranje datotek ob kliku " "nanj (zahteva ponovni zagon Geany)" -#: ../src/interface.c:3086 +#: ../src/interface.c:3156 msgid "Placement of new file tabs:" msgstr "Položaj novih datotečnih zavihkov:" -#: ../src/interface.c:3091 ../src/interface.c:3145 ../src/interface.c:3163 -#: ../src/interface.c:3181 -msgid "Left" -msgstr "Levo" - -#: ../src/interface.c:3094 +#: ../src/interface.c:3164 msgid "File tabs will be placed on the left of the notebook" msgstr "Datotečni zavihki bodo na levi strani zvezka" -#: ../src/interface.c:3099 ../src/interface.c:3146 ../src/interface.c:3164 -#: ../src/interface.c:3182 -msgid "Right" -msgstr "Desno" - -#: ../src/interface.c:3102 +#: ../src/interface.c:3172 msgid "File tabs will be placed on the right of the notebook" msgstr "Datotečni zavihki bodo na desni strani zvezka" -#: ../src/interface.c:3106 +#: ../src/interface.c:3176 msgid "Double-clicking hides all additional widgets" msgstr "Dvoklik skrije vse dodatne gradnike" -#: ../src/interface.c:3109 +#: ../src/interface.c:3179 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Pokliče ukaz Pogled->Preklopi vse dodatne gradnike" -#: ../src/interface.c:3111 +#: ../src/interface.c:3181 msgid "Editor tabs" msgstr "Razmaki urejevalnika" -#: ../src/interface.c:3147 ../src/interface.c:3165 ../src/interface.c:3183 +#: ../src/interface.c:3217 ../src/interface.c:3235 ../src/interface.c:3253 msgid "Top" msgstr "Vrh" -#: ../src/interface.c:3148 ../src/interface.c:3166 ../src/interface.c:3184 +#: ../src/interface.c:3218 ../src/interface.c:3236 ../src/interface.c:3254 msgid "Bottom" msgstr "Dno" -#: ../src/interface.c:3150 +#: ../src/interface.c:3220 msgid "Sidebar:" msgstr "Stranska vrstica:" -#: ../src/interface.c:3186 +#: ../src/interface.c:3256 msgid "Tab positions" msgstr "Pozicije razmakov:" -#: ../src/interface.c:3205 +#: ../src/interface.c:3275 msgid "Show status bar" msgstr "Pokaži vrstico stanja" -#: ../src/interface.c:3208 +#: ../src/interface.c:3278 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Ali naj se prikaže statusna vrstica na dnu glavnega okna" -#: ../src/interface.c:3215 +#: ../src/interface.c:3285 msgid "Interface" msgstr "Vmesnik" -#: ../src/interface.c:3238 +#: ../src/interface.c:3308 msgid "Show T_oolbar" msgstr "P_okaži orodno vrstico" -#: ../src/interface.c:3242 +#: ../src/interface.c:3312 msgid "_Append Toolbar to the Menu" msgstr "Dod_aj orodno vrstico v meni" # Ni: Add --> Temveč: Pack -#: ../src/interface.c:3245 +#: ../src/interface.c:3315 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Dodaj orodno vrstico v glavni meni zaradi prihranka navpičnega prostora" -#: ../src/interface.c:3247 +#: ../src/interface.c:3317 msgid "Toolbar" msgstr "Orodna vrstica" -#: ../src/interface.c:3268 +#: ../src/interface.c:3338 msgid "Icon style:" msgstr "Slog ikon:" -#: ../src/interface.c:3275 +#: ../src/interface.c:3345 msgid "Icon size:" msgstr "Velikost ikon:" -#: ../src/interface.c:3330 +#: ../src/interface.c:3400 msgid "Appearance" msgstr "Izgled" -#: ../src/interface.c:3355 ../src/toolbar.c:881 -#, fuzzy +#: ../src/interface.c:3425 ../src/toolbar.c:883 msgid "Customize Toolbar" -msgstr "Pokaži _orodno vrstico" +msgstr "Prilagodi orodno vrstico" -#: ../src/interface.c:3359 +#: ../src/interface.c:3429 msgid "Toolbar" msgstr "Orodna vrstica" -#: ../src/interface.c:3386 +#: ../src/interface.c:3456 msgid "Line wrapping" msgstr "Zavijanje vrstic" -#: ../src/interface.c:3389 +#: ../src/interface.c:3459 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " "disabled on slow machines." msgstr "" "Zavije vrstico na robu okna in jo nadaljuje v naslednji. Opomba: zavijanje " -"vrstic ima močan vpliv na zmogljivost pri velikih dokumentih in bi moral " +"vrstic ima močan vpliv na zmogljivost pri velikih dokumentih in bi moralo " "biti onemogočen na počasnejših računalnikih. " -#: ../src/interface.c:3391 +#: ../src/interface.c:3461 msgid "Enable \"smart\" home key" msgstr "Omogoči \"pametno\" tipko domov" -#: ../src/interface.c:3394 +#: ../src/interface.c:3464 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -1886,17 +1939,17 @@ "key always moves the caret to the start of the current line, regardless of " "its current position." msgstr "" -"Kadar je \"pametni\" domov omogočen, bo tipka HOME pomaknila kazalec na prvi " -"ne-prazni znak vrstice razen v primeru da se že tam nahaja. V tem primeru " -"bo kazalec pomaknjen na sam začetek vrstice. Če je ta možnost onemogočena, " -"bo tipka HOME vedno pomaknila kazalec na strogi začetek vrstice ne glede na " -"tekoči stolpec." +"Kadar je \"pametni\" domov omogočen, bo tipka \" Home pomaknila kazalec na " +"prvi ne-prazni znak vrstice razen v primeru da se že tam nahaja. V tem " +"primeru bo kazalec pomaknjen na sam začetek vrstice. Če je ta možnost " +"onemogočena, bo tipka Home vedno pomaknila kazalec na strogi začetek vrstice " +"ne glede na tekoči stolpec." -#: ../src/interface.c:3396 +#: ../src/interface.c:3466 msgid "Disable Drag and Drop" msgstr "Onemogoči povleci in spusti" -#: ../src/interface.c:3399 +#: ../src/interface.c:3469 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" @@ -1904,19 +1957,19 @@ "Popolnoma onemogoči povleci in spusti v oknu urejevalnika tako, da ne " "morete povleci in spustiti nobenih izbir znotraj ali zunaj okna urejevalnika" -#: ../src/interface.c:3401 +#: ../src/interface.c:3471 msgid "Enable folding" msgstr "Omogoči zvijanje" -#: ../src/interface.c:3404 +#: ../src/interface.c:3474 msgid "Whether to enable folding the code" msgstr "Ali naj bo zvijanje kode omogočeno" -#: ../src/interface.c:3406 +#: ../src/interface.c:3476 msgid "Fold/unfold all children of a fold point" msgstr "Zvij/odvij vse naslednike točke zvijanja" -#: ../src/interface.c:3409 +#: ../src/interface.c:3479 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -1924,12 +1977,12 @@ "Zvije ali odvije vse naslednike točke zvijanja. S pritiskom na tipko Shift " "med klikom na simbol zvijanja se uporabi nasproten učinek." -#: ../src/interface.c:3411 +#: ../src/interface.c:3481 msgid "Use indicators to show compile errors" msgstr "Uporabi pokazatelje, da prikažeš napake prevajanja" # squiggly=twisty!-->wavy -#: ../src/interface.c:3414 +#: ../src/interface.c:3484 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1937,23 +1990,23 @@ "Ali naj bodo v uporabi pokazatelji (valovito podčrtavanje), ki poudarijo " "vrstice kjer je prevajalnik našel opozorilo ali napako" -#: ../src/interface.c:3416 +#: ../src/interface.c:3486 msgid "Newline strips trailing spaces" msgstr "Nova vrstica poreže presledke na repu" -#: ../src/interface.c:3419 +#: ../src/interface.c:3489 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Omogoči novi vrstici rezanje presledkov na repu prejšnje vrstice" -#: ../src/interface.c:3425 +#: ../src/interface.c:3495 msgid "Line breaking column:" msgstr "Prelomni stolpec vrstice:" -#: ../src/interface.c:3439 +#: ../src/interface.c:3509 msgid "Comment toggle marker:" msgstr "Oznaka komentarja:" -#: ../src/interface.c:3446 +#: ../src/interface.c:3516 msgid "" "A string which is added when toggling a line comment in a source file, it is " "used to mark the comment as toggled." @@ -1961,94 +2014,94 @@ "Niz, ki je dodan takrat, ko preklapljamo komentar vrstice v izvorni kodi. " "Uporablja se za oznako komentarja kot preklopljenega." -#: ../src/interface.c:3448 +#: ../src/interface.c:3518 msgid "Features" -msgstr "Posebnosti!!" +msgstr "Možnosti" -#: ../src/interface.c:3453 +#: ../src/interface.c:3523 msgid "Features" -msgstr "Posebnosti!!" +msgstr "Možnosti" -#: ../src/interface.c:3485 ../src/interface.c:5025 +#: ../src/interface.c:3555 ../src/interface.c:5097 msgid "Auto-indent mode:" msgstr "Samozamikalni način:" -#: ../src/interface.c:3498 ../src/interface.c:5038 +#: ../src/interface.c:3568 ../src/interface.c:5110 msgid "Basic" msgstr "Osnovno" -#: ../src/interface.c:3499 ../src/interface.c:5039 +#: ../src/interface.c:3569 ../src/interface.c:5111 msgid "Current chars" msgstr "Tekoči znaki" -#: ../src/interface.c:3500 ../src/interface.c:5040 +#: ../src/interface.c:3570 ../src/interface.c:5112 msgid "Match braces" msgstr "Ujemanje oklepajev" -#: ../src/interface.c:3502 ../src/interface.c:3853 ../src/interface.c:5042 +#: ../src/interface.c:3572 ../src/interface.c:3923 ../src/interface.c:5114 msgid "Type:" msgstr "Način:" -#: ../src/interface.c:3509 ../src/interface.c:5049 +#: ../src/interface.c:3579 ../src/interface.c:5121 msgid "Width:" msgstr "Širina:" -#: ../src/interface.c:3522 ../src/interface.c:5062 +#: ../src/interface.c:3592 ../src/interface.c:5134 msgid "The width in chars of a single indent" msgstr "Širina enega zamika v znakih" -#: ../src/interface.c:3532 ../src/interface.c:5072 +#: ../src/interface.c:3602 ../src/interface.c:5144 msgid "Use spaces when inserting indentation" msgstr "Uporabi presledke ob vrivanju zamikanja" -#: ../src/interface.c:3541 ../src/interface.c:5081 +#: ../src/interface.c:3611 ../src/interface.c:5153 msgid "Use one tab per indent" msgstr "Uporabi en razmak na zamik" -#: ../src/interface.c:3550 ../src/interface.c:5090 +#: ../src/interface.c:3620 ../src/interface.c:5162 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Uporabi presledke, če je skupni zamik manjši kot širina razmaka, sicer " "uporabi oboje" -#: ../src/interface.c:3565 ../src/interface.c:5105 +#: ../src/interface.c:3635 ../src/interface.c:5184 msgid "Hard tab width:" msgstr "Širina trajnega razmaka:" -#: ../src/interface.c:3573 ../src/interface.c:5113 +#: ../src/interface.c:3643 ../src/interface.c:5192 msgid "The width of a tab when Tabs & Spaces is set for a document" msgstr "Širina razmaka, ko uporabljamo Razmake & presledke v dokumentu" -#: ../src/interface.c:3583 ../src/interface.c:5123 +#: ../src/interface.c:3653 ../src/interface.c:5171 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Ali naj se zazna način zamikanja iz vsebine datoteke ob njenem odprtju" -#: ../src/interface.c:3585 +#: ../src/interface.c:3655 msgid "Tab key indents" msgstr "Tipka razmaka zamakne" -#: ../src/interface.c:3588 +#: ../src/interface.c:3658 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Pritisk na razmak/shift-razmak zamakne/umakne namesto vrivanja znaka razmaka" -#: ../src/interface.c:3590 +#: ../src/interface.c:3660 msgid "Indentation" msgstr "Zamikanje" -#: ../src/interface.c:3595 ../src/interface.c:5125 +#: ../src/interface.c:3665 ../src/interface.c:5197 msgid "Indentation" msgstr "Zamikanje" -#: ../src/interface.c:3618 +#: ../src/interface.c:3688 msgid "Snippet completion" msgstr "Dokončanje koščkov" -#: ../src/interface.c:3621 +#: ../src/interface.c:3691 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2056,20 +2109,19 @@ "Natipkajte določeno kratko zaporedje znakov in ga dokončajte v bolj " "zapletenega z uporabo ene tipke" -#: ../src/interface.c:3623 -#, fuzzy +#: ../src/interface.c:3693 msgid "XML tag autocompletion" msgstr "Samodokončanje XML značk" -#: ../src/interface.c:3626 +#: ../src/interface.c:3696 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Samodokončanje in zapiranje XML značk (vključuje HTML značke)" -#: ../src/interface.c:3628 +#: ../src/interface.c:3698 msgid "Automatic continuation of multi-line comments" msgstr "Samodejno nadaljevanje večvrstičnih komentarjev" -#: ../src/interface.c:3631 +#: ../src/interface.c:3701 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" @@ -2077,11 +2129,11 @@ "Samodejno nadaljuj večvrstične komentarje v jezikih kot so C, C++ in Java, " "ko je vrinjena nova vrstica znotraj komentarja " -#: ../src/interface.c:3633 +#: ../src/interface.c:3703 msgid "Autocomplete symbols" -msgstr "" +msgstr "Samodokončaj simbole" -#: ../src/interface.c:3636 +#: ../src/interface.c:3706 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2089,148 +2141,140 @@ "Samodokončanje znanih simbolov v odprtih datotekah (imena funkcij, splošne " "spremenljivke, ...)" -#: ../src/interface.c:3638 +#: ../src/interface.c:3708 msgid "Autocomplete all words in document" -msgstr "" +msgstr "Samodokončaj vse besede v dokumentu" -#: ../src/interface.c:3642 +#: ../src/interface.c:3712 msgid "Drop rest of word on completion" -msgstr "" +msgstr "Izpusti ostanek besede ob dokončanju" -#: ../src/interface.c:3652 +#: ../src/interface.c:3722 msgid "Max. symbol name suggestions:" msgstr "Največ predloženih imen simbolov:" -#: ../src/interface.c:3659 +#: ../src/interface.c:3729 msgid "Completion list height:" msgstr "Višina seznama dokončanja" -#: ../src/interface.c:3666 -#, fuzzy +#: ../src/interface.c:3736 msgid "Characters to type for autocompletion:" msgstr "Potrebni znaki za dopolnjevanje:" -#: ../src/interface.c:3679 -#, fuzzy +#: ../src/interface.c:3749 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "" "Količina potrebnih znakov, ki je potrebna za prikaz seznama samodopolnjevanja" -#: ../src/interface.c:3688 -#, fuzzy +#: ../src/interface.c:3758 msgid "Display height in rows for the autocompletion list" msgstr "Višina prikaza v vrsticah za seznam samodopolnjevanja" -#: ../src/interface.c:3697 -#, fuzzy +#: ../src/interface.c:3767 msgid "Maximum number of entries to display in the autocompletion list" msgstr "Največje število prikazanih vnosov v seznamu samodopolnjevanja" -#: ../src/interface.c:3700 +#: ../src/interface.c:3770 msgid "Completions" msgstr "Dopolnjevanja" -#: ../src/interface.c:3720 +#: ../src/interface.c:3790 msgid "Parenthesis ( )" msgstr "Oklepaji ()" -#: ../src/interface.c:3725 +#: ../src/interface.c:3795 msgid "Auto-close parenthesis when typing an opening one" msgstr "Samodejno zapri oklepaje med tipkanjem med odpiranjem" -#: ../src/interface.c:3727 +#: ../src/interface.c:3797 msgid "Single quotes ' '" msgstr "Enojni narekovaji ' '" -#: ../src/interface.c:3732 +#: ../src/interface.c:3802 msgid "Auto-close simple quote when typing an opening one" msgstr "Samodejno zapri enojne narekovaje med odpiranjem" -#: ../src/interface.c:3734 +#: ../src/interface.c:3804 msgid "Curly brackets { }" msgstr "Zaviti oklepaji { }" -#: ../src/interface.c:3739 +#: ../src/interface.c:3809 msgid "Auto-close curly bracket when typing an opening one" msgstr "Samodejno zapri zaviti oklepaje med tipkanjem" -#: ../src/interface.c:3741 +#: ../src/interface.c:3811 msgid "Square brackets [ ]" msgstr "Oglati oklepaji [ ]" -#: ../src/interface.c:3746 +#: ../src/interface.c:3816 msgid "Auto-close square-bracket when typing an opening one" msgstr "Samodejno zapri oglate oklepaje med tipkanjem" -#: ../src/interface.c:3748 +#: ../src/interface.c:3818 msgid "Double quotes \" \"" msgstr "Dvojni narekovaji \" \"" -#: ../src/interface.c:3753 +#: ../src/interface.c:3823 msgid "Auto-close double quote when typing an opening one" msgstr "Samodejno zapri dvojni narekovaje med tipkanjem" -#: ../src/interface.c:3755 +#: ../src/interface.c:3825 msgid "Auto-close quotes and brackets" msgstr "Samodejno zapri narekovaje in oklepaje" -#: ../src/interface.c:3760 +#: ../src/interface.c:3830 msgid "Completions" msgstr "Dopolnjevanja" -#: ../src/interface.c:3783 +#: ../src/interface.c:3853 msgid "Invert syntax highlighting colors" msgstr "Obrni barve poudarjanja skladnje" -#: ../src/interface.c:3786 -msgid "" -"Use white text on a black background and invert all colors, this option " -"requires a restart of Geany" +#: ../src/interface.c:3856 +msgid "Invert all colors, by default using white text on a black background" msgstr "" -"Uporabi beli tekst na črnem ozadju in obrne vse barve. Ta izbira zahteva " -"ponovni zagon Geany" -#: ../src/interface.c:3788 +#: ../src/interface.c:3858 msgid "Show indentation guides" msgstr "Pokaži vodila zamikanja" # right indent=pravilna ali desna? -#: ../src/interface.c:3791 +#: ../src/interface.c:3861 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Prikaže majhne pikčaste črte, ki so vam v pomoč pri uporabi desne poravnave" -#: ../src/interface.c:3793 +#: ../src/interface.c:3863 msgid "Show white space" msgstr "Pokaži prazni prostor" -#: ../src/interface.c:3796 +#: ../src/interface.c:3866 msgid "Marks spaces with dots and tabs with arrows" msgstr "Prikaže presledke kot pikice in razmake kot puščice" -#: ../src/interface.c:3798 +#: ../src/interface.c:3868 msgid "Show line endings" msgstr "Pokaži konec vrstice" -#: ../src/interface.c:3801 +#: ../src/interface.c:3871 msgid "Shows the line ending character" msgstr "Prikaže znak za konec vrstice" -#: ../src/interface.c:3803 +#: ../src/interface.c:3873 msgid "Show line numbers" msgstr "Pokaži številke vrstic" -#: ../src/interface.c:3806 +#: ../src/interface.c:3876 msgid "Shows or hides the Line Number margin" msgstr "Prikaže ali skrije rob s številkami vrstic" -#: ../src/interface.c:3808 +#: ../src/interface.c:3878 msgid "Show markers margin" msgstr "Pokaži rob oznak" -#: ../src/interface.c:3811 +#: ../src/interface.c:3881 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2238,36 +2282,36 @@ "Prikaže ali skrije mali rob desno od številk strani, ki se uporablja za " "označevanje vrstic" -#: ../src/interface.c:3813 +#: ../src/interface.c:3883 msgid "Stop scrolling at last line" msgstr "Ustavi pomikanje na zadnji vrstici" -#: ../src/interface.c:3816 +#: ../src/interface.c:3886 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Ali naj se ustavi pomikanje za zadnjo vrstico dokumenta" -#: ../src/interface.c:3818 +#: ../src/interface.c:3888 msgid "Display" msgstr "Prikaz" -#: ../src/interface.c:3839 +#: ../src/interface.c:3909 msgid "Long line marker:" msgstr "Oznaka dolge vrste:" -#: ../src/interface.c:3846 +#: ../src/interface.c:3916 msgid "Long line marker color:" msgstr "Barva oznake dolge vrste:" -#: ../src/interface.c:3865 +#: ../src/interface.c:3935 msgid "Sets the color of the long line marker" msgstr "Nastavi barvo oznake dolge vrste" -#: ../src/interface.c:3866 ../src/toolbar.c:70 ../src/tools.c:746 +#: ../src/interface.c:3936 ../src/toolbar.c:70 ../src/tools.c:717 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Barvni izbiralnik" -#: ../src/interface.c:3874 +#: ../src/interface.c:3944 msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -2277,11 +2321,11 @@ "dolge črte ali kot namig pri prelomu vrstice. Nastavite to vrednost na večjo " "od 0 da določite stolpec kjer se naj pojavi." -#: ../src/interface.c:3884 +#: ../src/interface.c:3954 msgid "Line" msgstr "Črta" -#: ../src/interface.c:3887 +#: ../src/interface.c:3957 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2289,11 +2333,11 @@ "Izpiše navpično črto v oknu urejevalnika na dani poziciji kurzorja (glej " "spodaj)" -#: ../src/interface.c:3891 +#: ../src/interface.c:3961 msgid "Background" msgstr "Ozadje" -#: ../src/interface.c:3894 +#: ../src/interface.c:3964 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below, (this is recommended if you use " @@ -2303,111 +2347,115 @@ "spremenil v barvo nastavljeno spodaj. To je priporočeno, če uporabljate " "proporcionalni nabor znakov. " -#: ../src/interface.c:3898 +#: ../src/interface.c:3968 msgid "Disabled" msgstr "Onemogočeno" -#: ../src/interface.c:3904 +#: ../src/interface.c:3974 msgid "Long line marker" msgstr "Oznaka dolge vrste" -#: ../src/interface.c:3909 +#: ../src/interface.c:3979 msgid "Display" msgstr "Prikaz" # "Open"!="Create"; "Ustvari"=="Create"; "Start"=="Začni"; "Začni"==nonsense_translation; -#: ../src/interface.c:3940 +#: ../src/interface.c:4010 msgid "Open new documents from the command-line" msgstr "Ustvari nove dokumente iz ukazne vrstice" # "Open"!="Create"; "Ustvari"=="Create"; "Start"=="Začni"; "Začni"==nonsense_translation; -#: ../src/interface.c:3943 +#: ../src/interface.c:4013 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Odpre novo datoteko za vsako datoteko iz ukazne vrstice, ki ne obstaja" -#: ../src/interface.c:3957 +#: ../src/interface.c:4027 msgid "Default end of line characters:" msgstr "Privzeti znaki konca vrstice:" -#: ../src/interface.c:3964 +#: ../src/interface.c:4034 msgid "New files" msgstr "Nove datoteke" -#: ../src/interface.c:3990 -msgid "Sets the default encoding for newly created files" -msgstr "Nastavi kodiranje za novonastale datoteke" - -#: ../src/interface.c:3996 +#: ../src/interface.c:4057 msgid "Default encoding (new files):" msgstr "Privzeto kodiranje (nove datoteke):" -#: ../src/interface.c:4003 -msgid "Default encoding (existing files):" -msgstr "Privzeto kodiranje (obstoječe datoteke):" +#: ../src/interface.c:4065 +msgid "Sets the default encoding for newly created files" +msgstr "Nastavi kodiranje za novonastale datoteke" -#: ../src/interface.c:4015 -msgid "Sets the default encoding for opening existing files" -msgstr "Nastavi privzeto kodiranje ob odpiranju obstoječih datotek" - -#: ../src/interface.c:4021 -msgid "Use fixed encoding when opening files" +#: ../src/interface.c:4071 +#, fuzzy +msgid "Use fixed encoding when opening non-Unicode files" msgstr "Uporabi fiksno kodiranje ob odpiranju datotek" -#: ../src/interface.c:4026 +#: ../src/interface.c:4074 +#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " -"opening files and opens the file with the specified encoding (usually not " -"needed)" +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" msgstr "" "Ta možnost onemogoči samodejno zaznavanje kodiranja datotek ob odpiranju in " "odpre datoteko z določenim kodiranjem (običajno nepotrebno)." -#: ../src/interface.c:4028 +#: ../src/interface.c:4080 +#, fuzzy +msgid "Default encoding (existing non-Unicode files):" +msgstr "Privzeto kodiranje (obstoječe datoteke):" + +#: ../src/interface.c:4088 +#, fuzzy +msgid "Sets the default encoding for opening existing non-Unicode files" +msgstr "Nastavi privzeto kodiranje ob odpiranju obstoječih datotek" + +#: ../src/interface.c:4094 msgid "Encodings" msgstr "Kodiranja" -#: ../src/interface.c:4047 +#: ../src/interface.c:4113 msgid "Ensure new line at file end" msgstr "Zagotovi novo vrstico na koncu" -#: ../src/interface.c:4050 +#: ../src/interface.c:4116 msgid "Ensures that at the end of the file is a new line" msgstr "Zagotovi novo vrstico na koncu datoteke" -#: ../src/interface.c:4052 +#: ../src/interface.c:4118 msgid "Strip trailing spaces and tabs" msgstr "Poreži razmike in presledke na koncu" -#: ../src/interface.c:4055 +#: ../src/interface.c:4121 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Poreže razmike in presledke na koncu vrstic" -#: ../src/interface.c:4057 ../src/keybindings.c:481 +#: ../src/interface.c:4123 ../src/keybindings.c:506 msgid "Replace tabs by space" msgstr "Zamenja razmike s presledki" -#: ../src/interface.c:4060 +#: ../src/interface.c:4126 msgid "Replaces all tabs in document by spaces" msgstr "Zamenja vse razmike v dokumentu s presledki" -#: ../src/interface.c:4062 +#: ../src/interface.c:4128 msgid "Saving files" msgstr "Shranjevanje datotek" -#: ../src/interface.c:4087 +#: ../src/interface.c:4153 msgid "Recent files list length:" msgstr "Dolžina seznam nedavnih:" -#: ../src/interface.c:4101 +#: ../src/interface.c:4167 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Določa število datotek, spravljenih na seznamu nedavnih datotek" # fsck 3rd rock from the Sun? -#: ../src/interface.c:4105 +#: ../src/interface.c:4171 msgid "Disk check timeout:" msgstr "Potek časa za preverjanje diska:" -#: ../src/interface.c:4118 +#: ../src/interface.c:4184 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2415,19 +2463,19 @@ "Preverjanje za spremembe na dokumentih na disku v sekundah. Ničla onemogoči " "preverjanja." -#: ../src/interface.c:4127 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +#: ../src/interface.c:4193 ../src/symbols.c:593 ../plugins/filebrowser.c:1031 msgid "Files" msgstr "Datoteke" -#: ../src/interface.c:4160 +#: ../src/interface.c:4226 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4167 +#: ../src/interface.c:4233 msgid "Browser:" msgstr "Brskalnik:" -#: ../src/interface.c:4179 +#: ../src/interface.c:4245 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2435,23 +2483,23 @@ "Posnemovalnik terminala kot xterm, gnome-terminal ali konsole (sprejeti mora " "možnost -e)" -#: ../src/interface.c:4186 +#: ../src/interface.c:4252 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pot (in morebitne dodatne možnosti) do vašega brskalnika " -#: ../src/interface.c:4208 +#: ../src/interface.c:4274 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4231 +#: ../src/interface.c:4297 msgid "Tool paths" msgstr "Poti do orodij" -#: ../src/interface.c:4252 +#: ../src/interface.c:4318 msgid "Context action:" msgstr "Kontekstno dejanje:" -#: ../src/interface.c:4263 +#: ../src/interface.c:4329 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2462,150 +2510,147 @@ "pripomočkom %s. Lahko se pojavi kjerkoli v danem ukazu in bo zamenjan pred " "izvedbo." -#: ../src/interface.c:4276 +#: ../src/interface.c:4342 msgid "Commands" msgstr "Ukazi" -#: ../src/interface.c:4281 ../src/keybindings.c:515 +#: ../src/interface.c:4347 ../src/keybindings.c:540 msgid "Tools" msgstr "Orodja" -#: ../src/interface.c:4315 +#: ../src/interface.c:4381 msgid "email address of the developer" msgstr "e-poštni naslov razvijalca" -#: ../src/interface.c:4322 +#: ../src/interface.c:4388 msgid "Initials of the developer name" msgstr "Začetnice razvijalca" -#: ../src/interface.c:4324 +#: ../src/interface.c:4390 msgid "Initial version:" msgstr "Začetna različica:" -#: ../src/interface.c:4336 +#: ../src/interface.c:4402 msgid "Version number, which a new file initially has" msgstr "Različica, ki jo nosi nova datoteka ob nastanku" -#: ../src/interface.c:4343 +#: ../src/interface.c:4409 msgid "Company name" msgstr "Ime družbe" -#: ../src/interface.c:4345 +#: ../src/interface.c:4411 msgid "Developer:" msgstr "Razvijalec:" -#: ../src/interface.c:4352 +#: ../src/interface.c:4418 msgid "Company:" msgstr "Družba:" -#: ../src/interface.c:4359 +#: ../src/interface.c:4425 msgid "Mail address:" -msgstr "E-naslov:" +msgstr "Elektronska pošta:" -#: ../src/interface.c:4366 +#: ../src/interface.c:4432 msgid "Initials:" msgstr "Začetnice:" -#: ../src/interface.c:4378 +#: ../src/interface.c:4444 msgid "The name of the developer" msgstr "Ime razvijalca:" -#: ../src/interface.c:4380 +#: ../src/interface.c:4446 msgid "Year:" msgstr "Leto:" -#: ../src/interface.c:4387 +#: ../src/interface.c:4453 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4394 +#: ../src/interface.c:4460 msgid "Date & Time:" msgstr "Datum in čas:" -#: ../src/interface.c:4406 -#, fuzzy +#: ../src/interface.c:4472 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Določite obliko za {datetime} wildcard. Uporabite lahko katerikoli " +"Določite obliko za zamenjavo{datetime}. Uporabite lahko katerikoli " "pretvorbeni določitelj, ki je uporaben v ANSI C strftime funkciji." -#: ../src/interface.c:4413 -#, fuzzy +#: ../src/interface.c:4479 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Določite obliko za {year} wildcard. Uporabite lahko katerikoli pretvorbeni " +"Določite obliko za zamenjavo {year}. Uporabite lahko katerikoli pretvorbeni " "določitelj, ki je uporaben v ANSI C strftime funkciji." -#: ../src/interface.c:4420 -#, fuzzy +#: ../src/interface.c:4486 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." msgstr "" -"Določite obliko za {date} wildcard. Uporabite lahko katerikoli pretvorbeni " +"Določite obliko za zamenjavo {date}. Uporabite lahko katerikoli pretvorbeni " "določitelj, ki je uporaben v ANSI C strftime funkciji." -#: ../src/interface.c:4422 +#: ../src/interface.c:4488 msgid "Template data" msgstr "Podatki predlog" -#: ../src/interface.c:4427 +#: ../src/interface.c:4493 msgid "Templates" msgstr "Predloge" -#: ../src/interface.c:4465 +#: ../src/interface.c:4531 msgid "C_hange" msgstr "_Spremeni" -#: ../src/interface.c:4469 +#: ../src/interface.c:4535 msgid "Keyboard shortcuts" msgstr "Bližnjice tipkovnice" -#: ../src/interface.c:4474 +#: ../src/interface.c:4540 msgid "Keybindings" msgstr "Bližnjice tipkovnice" -#: ../src/interface.c:4497 +#: ../src/interface.c:4563 msgid "Command:" msgstr "Ukaz:" -#: ../src/interface.c:4504 +#: ../src/interface.c:4570 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Pot do ukaza za tiskanje datotek (uporabite %f za ime datoteke)" -#: ../src/interface.c:4514 +#: ../src/interface.c:4580 msgid "Use an external command for printing" msgstr "Uporabi zunanji ukaz za tiskanje" -#: ../src/interface.c:4534 ../src/printing.c:380 +#: ../src/interface.c:4600 ../src/printing.c:381 msgid "Print line numbers" msgstr "Natisni številke vrstic" -#: ../src/interface.c:4537 ../src/printing.c:382 +#: ../src/interface.c:4603 ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Doda številke vrstic na natisnjeno stran" -#: ../src/interface.c:4539 ../src/printing.c:385 +#: ../src/interface.c:4605 ../src/printing.c:386 msgid "Print page numbers" msgstr "Natisni številko strani" -#: ../src/interface.c:4542 ../src/printing.c:387 +#: ../src/interface.c:4608 ../src/printing.c:388 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "" "Doda številke vrstic na dno natisnjene strani kar vzame dve (2) vrstici na " "stran." -#: ../src/interface.c:4544 ../src/printing.c:390 +#: ../src/interface.c:4610 ../src/printing.c:391 msgid "Print page header" msgstr "Natisni glavo strani" -#: ../src/interface.c:4547 ../src/printing.c:392 +#: ../src/interface.c:4613 ../src/printing.c:393 msgid "" "Add a little header to every page containing the page number, the filename " "and the current date (see below). It takes 3 lines of the page." @@ -2613,20 +2658,20 @@ "Doda majhno glavo na vsako stran s številko strani, imenom datoteke in " "trenutnim datumom (glej spodaj). Porabi tri (3) vrstice na stran." -#: ../src/interface.c:4564 ../src/printing.c:408 +#: ../src/interface.c:4630 ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Uporabi skrajšano ime natisnjene datoteke" -#: ../src/interface.c:4567 +#: ../src/interface.c:4633 msgid "Print only the basename (without the path) of the printed file" msgstr "Natisne le skrajšano ime natisnjene datoteke (brez poti)" -#: ../src/interface.c:4573 ../src/printing.c:416 +#: ../src/interface.c:4639 ../src/printing.c:417 msgid "Date format:" msgstr "Oblika datuma:" # conversion specifier?=pretvorbeno določilo -#: ../src/interface.c:4580 ../src/printing.c:422 +#: ../src/interface.c:4646 ../src/printing.c:423 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2636,548 +2681,527 @@ "natisnjene strani. Uporabite lahko katerakoli pretvorbena določila, ki se " "uporabljajo s funkcijo ANSI C strftime." -#: ../src/interface.c:4583 +#: ../src/interface.c:4649 msgid "Use native GTK printing" msgstr "Uporabi vgrajeno GTK tiskanje" -#: ../src/interface.c:4589 +#: ../src/interface.c:4655 msgid "Printing" msgstr "Tiskanje" -#: ../src/interface.c:5008 +#: ../src/interface.c:5080 msgid "Project Properties" msgstr "Lastnosti projekta" -#: ../src/keybindings.c:219 ../src/plugins.c:1076 +#: ../src/keybindings.c:222 ../src/plugins.c:1108 msgid "File" msgstr "Datoteka" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:225 msgid "New" msgstr "Novo" -#: ../src/keybindings.c:224 +#: ../src/keybindings.c:227 msgid "Open" msgstr "Odpri" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:230 msgid "Open selected file" msgstr "Odpri izbrano datoteko" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:232 msgid "Save" msgstr "Shrani" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:234 msgid "Save as" msgstr "Shrani kot" -#: ../src/keybindings.c:233 +#: ../src/keybindings.c:236 msgid "Save all" msgstr "Shrani vse" -#: ../src/keybindings.c:236 +#: ../src/keybindings.c:239 msgid "Print" msgstr "Natisni" -#: ../src/keybindings.c:238 +#: ../src/keybindings.c:241 msgid "Close" msgstr "Zapri" -#: ../src/keybindings.c:240 +#: ../src/keybindings.c:243 msgid "Close all" msgstr "Zapri vse" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:246 msgid "Reload file" msgstr "Ponovno odpre datoteko" -#: ../src/keybindings.c:245 ../src/project.c:518 +#: ../src/keybindings.c:248 ../src/project.c:522 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:251 msgid "Project properties" msgstr "Lastnosti projekta" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:256 msgid "Undo" msgstr "Razveljavi" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:258 msgid "Redo" msgstr "Ponovi" -#: ../src/keybindings.c:257 -msgid "Duplicate line or selection" -msgstr "Podvoji vrstico ali izbor" - -#: ../src/keybindings.c:260 -msgid "Delete current line(s)" -msgstr "Izbriši trenutno vrstico ali več vrstic" - -#: ../src/keybindings.c:263 -#, fuzzy +#: ../src/keybindings.c:267 msgid "Delete to line end" -msgstr "Izbriši trenutno vrstico ali več vrstic" +msgstr "Izbriši do konca trenutne vrstice" -#: ../src/keybindings.c:265 -msgid "Transpose current line" -msgstr "Prestavi tekočo vrstico" - -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:273 msgid "Scroll to current line" msgstr "Pomakni do trenutne vrstice" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:275 msgid "Scroll up the view by one line" msgstr "Pomakni navzgor za eno vrstico" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:277 msgid "Scroll down the view by one line" msgstr "Pomakni dol za eno vrstico" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:279 msgid "Complete snippet" msgstr "Zaključi košček" -#: ../src/keybindings.c:276 +#: ../src/keybindings.c:281 msgid "Move cursor in snippet" msgstr "Premakni kazalko v košček" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Suppress snippet completion" msgstr "Zatri dokončanje koščkov" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Context Action" msgstr "Kontekstno dejanje" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Complete word" msgstr "Dokončaj besedo" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Show calltip" msgstr "Prikaži pozivni namig" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Show macro list" msgstr "Prikaži seznam makrojev" -#: ../src/keybindings.c:288 +#: ../src/keybindings.c:293 +#, fuzzy +msgid "Word part completion" +msgstr "Dokončanje koščkov" + +#: ../src/keybindings.c:295 +#, fuzzy +msgid "Move line(s) up" +msgstr "Komentiraj vrstico ali več vrstic" + +#: ../src/keybindings.c:297 +#, fuzzy +msgid "Move line(s) down" +msgstr "Komentiraj vrstico ali več vrstic" + +#: ../src/keybindings.c:299 msgid "Clipboard" msgstr "Odložišče" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:302 msgid "Cut" msgstr "Izreži" -#: ../src/keybindings.c:293 +#: ../src/keybindings.c:304 msgid "Copy" msgstr "Kopiraj" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:306 msgid "Paste" msgstr "Prilepi" -#: ../src/keybindings.c:297 -msgid "Copy current line(s)" -msgstr "Kopiraj tekočo vrstico ali več vrstic" - -#: ../src/keybindings.c:299 -msgid "Cut current line(s)" -msgstr "Izreži tekočo vrstico ali več vrstic" - -#: ../src/keybindings.c:301 +#: ../src/keybindings.c:314 msgid "Select" msgstr "Izberi" -#: ../src/keybindings.c:304 +#: ../src/keybindings.c:317 msgid "Select All" msgstr "Izberi vse" -#: ../src/keybindings.c:306 +#: ../src/keybindings.c:319 msgid "Select current word" msgstr "Izberi tekočo besedo" -#: ../src/keybindings.c:308 -msgid "Select current line(s)" -msgstr "Izberi tekočo vrstico ali več vrstic" +#: ../src/keybindings.c:327 +#, fuzzy +msgid "Select to previous word part" +msgstr "Pojdi na predhodni del besede" -#: ../src/keybindings.c:310 -msgid "Select current paragraph" -msgstr "Izberi tekoči odstavek" +#: ../src/keybindings.c:329 +#, fuzzy +msgid "Select to next word part" +msgstr "Pojdi na naslednji del besede" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:331 msgid "Format" msgstr "Oblika" -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:335 msgid "Toggle Case of Selection" msgstr "Preklopi velikost izbora" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:337 msgid "Toggle line commentation" msgstr "Preklopi komentiranje vrstic" -#: ../src/keybindings.c:321 +#: ../src/keybindings.c:340 msgid "Comment line(s)" msgstr "Komentiraj vrstico ali več vrstic" -#: ../src/keybindings.c:323 +#: ../src/keybindings.c:342 msgid "Uncomment line(s)" msgstr "Odkomentiraj vrstico ali več vrstic" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:344 msgid "Increase indent" msgstr "Povečaj zamik" -#: ../src/keybindings.c:328 +#: ../src/keybindings.c:347 msgid "Decrease indent" msgstr "Zmanjšaj zamik" -#: ../src/keybindings.c:331 +#: ../src/keybindings.c:350 msgid "Increase indent by one space" msgstr "Povečaj zamik za presledek" -#: ../src/keybindings.c:333 +#: ../src/keybindings.c:352 msgid "Decrease indent by one space" msgstr "Zmanjšaj zamik za presledek" -#: ../src/keybindings.c:335 -msgid "Smart line indent" -msgstr "Pametno zamikanje vrstic" - -#: ../src/keybindings.c:337 +#: ../src/keybindings.c:356 msgid "Send to Custom Command 1" msgstr "Nastavi na ukaz po meri 1" -#: ../src/keybindings.c:339 +#: ../src/keybindings.c:358 msgid "Send to Custom Command 2" msgstr "Nastavi na ukaz po meri 2" -#: ../src/keybindings.c:341 +#: ../src/keybindings.c:360 msgid "Send to Custom Command 3" msgstr "Nastavi na ukaz po meri 3" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:362 msgid "Send Selection to Terminal" msgstr "Pošlji izbor terminalu" -#: ../src/keybindings.c:345 -msgid "Reflow lines/block" -msgstr "" - -#: ../src/keybindings.c:347 +#: ../src/keybindings.c:367 msgid "Insert" msgstr "Vstavi" -#: ../src/keybindings.c:350 +#: ../src/keybindings.c:370 msgid "Insert date" msgstr "Vstavi datum" -#: ../src/keybindings.c:353 -msgid "Insert alternative white space" -msgstr "Vstavi alternativni presledek" - -#: ../src/keybindings.c:355 +#: ../src/keybindings.c:376 msgid "Settings" msgstr "Nastavitve" -#: ../src/keybindings.c:361 ../src/toolbar.c:350 +#: ../src/keybindings.c:384 ../src/toolbar.c:350 msgid "Search" msgstr "Išči" -#: ../src/keybindings.c:364 ../src/search.c:379 +#: ../src/keybindings.c:387 ../src/search.c:379 msgid "Find" msgstr "Najdi" -#: ../src/keybindings.c:366 +#: ../src/keybindings.c:389 msgid "Find Next" msgstr "Najdi naslednje" -#: ../src/keybindings.c:368 +#: ../src/keybindings.c:391 msgid "Find Previous" msgstr "Najdi predhodno" -#: ../src/keybindings.c:371 +#: ../src/keybindings.c:394 msgid "Find Next Selection" msgstr "Najdi naslednjo izbiro" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:396 msgid "Find Previous Selection" msgstr "Najdi predhodno izbiro" -#: ../src/keybindings.c:375 ../src/search.c:514 +#: ../src/keybindings.c:398 ../src/search.c:514 msgid "Replace" msgstr "Zamenjaj" -#: ../src/keybindings.c:377 ../src/search.c:686 +#: ../src/keybindings.c:400 ../src/search.c:686 msgid "Find in Files" msgstr "Najdi v datotekah" -#: ../src/keybindings.c:380 +#: ../src/keybindings.c:403 msgid "Next Message" msgstr "Naslednje sporočilo" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:405 msgid "Previous Message" msgstr "Predhodno sporočilo" -#: ../src/keybindings.c:384 +#: ../src/keybindings.c:407 msgid "Find Usage" msgstr "Najdi uporabo" -#: ../src/keybindings.c:386 +#: ../src/keybindings.c:409 msgid "Find Document Usage" msgstr "Najdi uporabo dokumenta" # zgradi izvorno kodo z make all -#: ../src/keybindings.c:388 -#, fuzzy +#: ../src/keybindings.c:411 msgid "Mark All" -msgstr "Zgradi _vse" +msgstr "Označi vse" -#: ../src/keybindings.c:390 +#: ../src/keybindings.c:413 msgid "Go to" msgstr "Pojdi" -#: ../src/keybindings.c:393 ../src/toolbar.c:66 +#: ../src/keybindings.c:416 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Krmari nazaj " -#: ../src/keybindings.c:395 ../src/toolbar.c:67 +#: ../src/keybindings.c:418 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Krmari naprej" -#: ../src/keybindings.c:400 +#: ../src/keybindings.c:423 msgid "Go to matching brace" msgstr "Pojdi na ujemajoči oklepaj" -#: ../src/keybindings.c:403 +#: ../src/keybindings.c:426 msgid "Toggle marker" msgstr "Preklopi oznako" -#: ../src/keybindings.c:406 -msgid "Go to next marker" -msgstr "Pojdi na naslednjo oznako" - -#: ../src/keybindings.c:409 -msgid "Go to previous marker" -msgstr "Pojdi na predhodno oznako" - -#: ../src/keybindings.c:411 +#: ../src/keybindings.c:434 msgid "Go to Tag Definition" msgstr "Pojdi na opredelitev značke" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:436 msgid "Go to Tag Declaration" msgstr "Pojdi na navedbo značke" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:438 msgid "Go to Start of Line" msgstr "Pojdi na začetek vrstice " -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:440 msgid "Go to End of Line" msgstr "Pojdi na konec vrstice" -#: ../src/keybindings.c:419 -#, fuzzy +#: ../src/keybindings.c:442 msgid "Go to End of Display Line" -msgstr "Pojdi na konec vrstice" +msgstr "Pojdi na konec prikazne vrstice" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:444 msgid "Go to Previous Word Part" msgstr "Pojdi na predhodni del besede" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:446 msgid "Go to Next Word Part" msgstr "Pojdi na naslednji del besede" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:448 msgid "View" msgstr "Pogled" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:451 msgid "Toggle All Additional Widgets" msgstr "Preklopi vse dodatne gradnike" -#: ../src/keybindings.c:431 +#: ../src/keybindings.c:454 msgid "Fullscreen" msgstr "Celozaslonsko" -#: ../src/keybindings.c:433 +#: ../src/keybindings.c:456 msgid "Toggle Messages Window" msgstr "Preklopi sporočilno okno" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:459 msgid "Toggle Sidebar" msgstr "Preklopi stransko vrstico" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:461 msgid "Zoom In" msgstr "Približaj" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:463 msgid "Zoom Out" msgstr "Oddalji" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:465 msgid "Focus" msgstr "Žarišče" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:468 msgid "Switch to Editor" msgstr "Preklopi v urejevalnik" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:470 msgid "Switch to Scribble" msgstr "Preklopi v beležko" -#: ../src/keybindings.c:449 +#: ../src/keybindings.c:472 msgid "Switch to VTE" msgstr "Preklopi v VTE" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:474 msgid "Switch to Search Bar" msgstr "Preklopi v iskalno vrstico" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:476 msgid "Switch to Sidebar" msgstr "Preklopi v stransko vrstico" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:478 msgid "Switch to Compiler" msgstr "Preklopi v prevajalnik" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:480 +#, fuzzy +msgid "Switch to Messages" +msgstr "Preklopi v stransko vrstico" + +#: ../src/keybindings.c:482 msgid "Notebook tab" msgstr "Zavihek zvezka" -#: ../src/keybindings.c:460 +#: ../src/keybindings.c:485 msgid "Switch to left document" msgstr "Preklopi v levi dokument" -#: ../src/keybindings.c:462 +#: ../src/keybindings.c:487 msgid "Switch to right document" msgstr "Preklopi v desni dokument" -#: ../src/keybindings.c:464 +#: ../src/keybindings.c:489 msgid "Switch to last used document" msgstr "Preklopi v zadnji uporabljeni dokument" -#: ../src/keybindings.c:466 +#: ../src/keybindings.c:491 msgid "Move document left" msgstr "Premakni dokument levo" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:493 msgid "Move document right" msgstr "Premakni dokument desno" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:495 msgid "Move document first" msgstr "Premakni dokument na prvo mesto" -#: ../src/keybindings.c:472 +#: ../src/keybindings.c:497 msgid "Move document last" msgstr "Premakni dokument na zadnje mesto" -#: ../src/keybindings.c:474 +#: ../src/keybindings.c:499 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:502 msgid "Toggle Line wrapping" msgstr "Preklopi zavijanje vrstic" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:504 msgid "Toggle Line breaking" msgstr "Preklopi lomljenje vrstic" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:508 msgid "Replace spaces by tabs" msgstr "Zamenjaj presledke z razmaki" -#: ../src/keybindings.c:485 +#: ../src/keybindings.c:510 msgid "Toggle current fold" msgstr "Preklopi trenutno zvijanje" -#: ../src/keybindings.c:487 +#: ../src/keybindings.c:512 msgid "Fold all" msgstr "Zvij vse" -#: ../src/keybindings.c:489 +#: ../src/keybindings.c:514 msgid "Unfold all" msgstr "Odvij vse" -#: ../src/keybindings.c:491 +#: ../src/keybindings.c:516 msgid "Reload symbol list" msgstr "Osveži seznam simbolov" -#: ../src/keybindings.c:493 ../src/keybindings.c:498 ../src/project.c:479 -#: ../src/ui_utils.c:1787 +#: ../src/keybindings.c:518 ../src/keybindings.c:523 ../src/project.c:483 +#: ../src/ui_utils.c:1795 msgid "Build" msgstr "Zgradi" -#: ../src/keybindings.c:496 ../src/toolbar.c:68 +#: ../src/keybindings.c:521 ../src/toolbar.c:68 msgid "Compile" msgstr "Prevedi" -#: ../src/keybindings.c:500 +#: ../src/keybindings.c:525 msgid "Make all" msgstr "Zgradi vse" -#: ../src/keybindings.c:503 +#: ../src/keybindings.c:528 msgid "Make custom target" msgstr "Zgradi tarčo po meri" -#: ../src/keybindings.c:505 +#: ../src/keybindings.c:530 msgid "Make object" msgstr "Zgradi objekt" -#: ../src/keybindings.c:507 +#: ../src/keybindings.c:532 msgid "Next error" msgstr "Naslednja napaka" -#: ../src/keybindings.c:509 +#: ../src/keybindings.c:534 msgid "Previous error" msgstr "Predhodna napaka" -#: ../src/keybindings.c:511 +#: ../src/keybindings.c:536 msgid "Run" msgstr "Zaženi" -#: ../src/keybindings.c:513 +#: ../src/keybindings.c:538 msgid "Build options" msgstr "Možnosti gradnje" -#: ../src/keybindings.c:518 +#: ../src/keybindings.c:543 msgid "Show Color Chooser" msgstr "Prikaži barvni izbiralnik" -#: ../src/keybindings.c:520 ../src/keybindings.c:523 +#: ../src/keybindings.c:545 ../src/keybindings.c:548 msgid "Help" msgstr "Pomoč" -#: ../src/keybindings.c:812 +#: ../src/keybindings.c:837 msgid "Keyboard Shortcuts" msgstr "Bližnjice tipkovnice" -#: ../src/keybindings.c:825 +#: ../src/keybindings.c:850 msgid "The following keyboard shortcuts are configurable:" msgstr "Naslednje bližnjice tipkovnice so nastavljive:" -#: ../src/keybindings.c:1625 +#: ../src/keybindings.c:1694 msgid "Switch to Document" msgstr "Preklopi v dokument" -#: ../src/keyfile.c:818 +#: ../src/keyfile.c:821 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Tu natipkajte karkoli želite, uporabite to kot vašo beležko." -#: ../src/keyfile.c:1022 +#: ../src/keyfile.c:1025 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4390] trunk
by ntrel＠users.sourceforge.net 29 Oct '09

29 Oct '09

Revision: 4390 http://geany.svn.sourceforge.net/geany/?rev=4390&view=rev Author: ntrel Date: 2009-10-29 12:34:53 +0000 (Thu, 29 Oct 2009) Log Message: ----------- Use GtkVBoxes for Encoding prefs combo boxes to reduce width of prefs dialog. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-29 11:59:55 UTC (rev 4389) +++ trunk/ChangeLog 2009-10-29 12:34:53 UTC (rev 4390) @@ -10,6 +10,9 @@ strings. Add mnemonics for 3 Edit->Format menu items. Add keybindings_get_label(). + * src/interface.c, geany.glade: + Use GtkVBoxes for Encoding prefs combo boxes to reduce width of prefs + dialog. 2009-10-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-10-29 11:59:55 UTC (rev 4389) +++ trunk/geany.glade 2009-10-29 12:34:53 UTC (rev 4390) @@ -7287,117 +7287,68 @@ <property name="right_padding">0</property> <child> - <widget class="GtkTable" id="table5"> + <widget class="GtkVBox" id="vbox43"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">24</property> + <property name="spacing">6</property> <child> - <widget class="GtkEventBox" id="eventbox1"> + <widget class="GtkVBox" id="vbox44"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the default encoding for newly created files</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> <child> - <widget class="GtkComboBox" id="combo_new_encoding"> + <widget class="GtkLabel" id="label153"> <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="label" translatable="yes">Default encoding (new files):</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label153"> - <property name="visible">True</property> - <property name="label" translatable="yes">Default encoding (new files):</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label_open_encoding"> - <property name="visible">True</property> - <property name="label" translatable="yes">Default encoding (existing non-Unicode files):</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEventBox" id="eventbox3"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Sets the default encoding for opening existing non-Unicode files</property> - <property name="visible_window">True</property> - <property name="above_child">False</property> - <child> - <widget class="GtkComboBox" id="combo_open_encoding"> + <widget class="GtkEventBox" id="eventbox1"> <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="tooltip" translatable="yes">Sets the default encoding for newly created files</property> + <property name="visible_window">True</property> + <property name="above_child">False</property> + + <child> + <widget class="GtkComboBox" id="combo_new_encoding"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> @@ -7415,13 +7366,71 @@ <property name="draw_indicator">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkVBox" id="vbox45"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label_open_encoding"> + <property name="visible">True</property> + <property name="label" translatable="yes">Default encoding (existing non-Unicode files):</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEventBox" id="eventbox3"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the default encoding for opening existing non-Unicode files</property> + <property name="visible_window">True</property> + <property name="above_child">False</property> + + <child> + <widget class="GtkComboBox" id="combo_open_encoding"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> </child> </widget> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-10-29 11:59:55 UTC (rev 4389) +++ trunk/src/interface.c 2009-10-29 12:34:53 UTC (rev 4390) @@ -2584,14 +2584,16 @@ GtkWidget *label109; GtkWidget *frame37; GtkWidget *alignment40; - GtkWidget *table5; + GtkWidget *vbox43; + GtkWidget *vbox44; + GtkWidget *label153; GtkWidget *eventbox1; GtkWidget *combo_new_encoding; - GtkWidget *label153; + GtkWidget *check_open_encoding; + GtkWidget *vbox45; GtkWidget *label_open_encoding; GtkWidget *eventbox3; GtkWidget *combo_open_encoding; - GtkWidget *check_open_encoding; GtkWidget *label219; GtkWidget *frame2; GtkWidget *alignment3; @@ -4044,55 +4046,51 @@ gtk_container_add (GTK_CONTAINER (frame37), alignment40); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment40), 0, 0, 12, 0); - table5 = gtk_table_new (3, 2, FALSE); - gtk_widget_show (table5); - gtk_container_add (GTK_CONTAINER (alignment40), table5); - gtk_table_set_row_spacings (GTK_TABLE (table5), 3); - gtk_table_set_col_spacings (GTK_TABLE (table5), 24); + vbox43 = gtk_vbox_new (FALSE, 6); + gtk_widget_show (vbox43); + gtk_container_add (GTK_CONTAINER (alignment40), vbox43); + vbox44 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox44); + gtk_box_pack_start (GTK_BOX (vbox43), vbox44, TRUE, TRUE, 0); + + label153 = gtk_label_new (_("Default encoding (new files):")); + gtk_widget_show (label153); + gtk_box_pack_start (GTK_BOX (vbox44), label153, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label153), 0, 0.5); + eventbox1 = gtk_event_box_new (); gtk_widget_show (eventbox1); - gtk_table_attach (GTK_TABLE (table5), eventbox1, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_box_pack_start (GTK_BOX (vbox44), eventbox1, TRUE, TRUE, 0); gtk_tooltips_set_tip (tooltips, eventbox1, _("Sets the default encoding for newly created files"), NULL); combo_new_encoding = gtk_combo_box_new_text (); gtk_widget_show (combo_new_encoding); gtk_container_add (GTK_CONTAINER (eventbox1), combo_new_encoding); - label153 = gtk_label_new (_("Default encoding (new files):")); - gtk_widget_show (label153); - gtk_table_attach (GTK_TABLE (table5), label153, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label153), 0, 0.5); + check_open_encoding = gtk_check_button_new_with_mnemonic (_("Use fixed encoding when opening non-Unicode files")); + gtk_widget_show (check_open_encoding); + gtk_box_pack_start (GTK_BOX (vbox43), check_open_encoding, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)"), NULL); + vbox45 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox45); + gtk_box_pack_start (GTK_BOX (vbox43), vbox45, TRUE, TRUE, 0); + label_open_encoding = gtk_label_new (_("Default encoding (existing non-Unicode files):")); gtk_widget_show (label_open_encoding); - gtk_table_attach (GTK_TABLE (table5), label_open_encoding, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + gtk_box_pack_start (GTK_BOX (vbox45), label_open_encoding, FALSE, FALSE, 0); gtk_misc_set_alignment (GTK_MISC (label_open_encoding), 0, 0.5); eventbox3 = gtk_event_box_new (); gtk_widget_show (eventbox3); - gtk_table_attach (GTK_TABLE (table5), eventbox3, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_box_pack_start (GTK_BOX (vbox45), eventbox3, TRUE, TRUE, 0); gtk_tooltips_set_tip (tooltips, eventbox3, _("Sets the default encoding for opening existing non-Unicode files"), NULL); combo_open_encoding = gtk_combo_box_new_text (); gtk_widget_show (combo_open_encoding); gtk_container_add (GTK_CONTAINER (eventbox3), combo_open_encoding); - check_open_encoding = gtk_check_button_new_with_mnemonic (_("Use fixed encoding when opening non-Unicode files")); - gtk_widget_show (check_open_encoding); - gtk_table_attach (GTK_TABLE (table5), check_open_encoding, 0, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)"), NULL); - label219 = gtk_label_new (_("Encodings")); gtk_widget_show (label219); gtk_frame_set_label_widget (GTK_FRAME (frame37), label219); @@ -4924,14 +4922,16 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, label109, "label109"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame37, "frame37"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment40, "alignment40"); - GLADE_HOOKUP_OBJECT (prefs_dialog, table5, "table5"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox43, "vbox43"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox44, "vbox44"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label153, "label153"); GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox1, "eventbox1"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_new_encoding, "combo_new_encoding"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label153, "label153"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_open_encoding, "check_open_encoding"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox45, "vbox45"); GLADE_HOOKUP_OBJECT (prefs_dialog, label_open_encoding, "label_open_encoding"); GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox3, "eventbox3"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_open_encoding, "combo_open_encoding"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_open_encoding, "check_open_encoding"); GLADE_HOOKUP_OBJECT (prefs_dialog, label219, "label219"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame2, "frame2"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment3, "alignment3"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4389] trunk
by ntrel＠users.sourceforge.net 29 Oct '09

29 Oct '09

Revision: 4389 http://geany.svn.sourceforge.net/geany/?rev=4389&view=rev Author: ntrel Date: 2009-10-29 11:59:55 +0000 (Thu, 29 Oct 2009) Log Message: ----------- Allow GeanyKeyBinding label field to contain underscores, which won't be displayed by Geany. This saves adding near-duplicate translation strings. Add mnemonics for 3 Edit->Format menu items. Add keybindings_get_label(). Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/plugins/splitwindow.c trunk/src/interface.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-29 11:31:48 UTC (rev 4388) +++ trunk/ChangeLog 2009-10-29 11:59:55 UTC (rev 4389) @@ -3,6 +3,13 @@ * src/pluginutils.c: Don't expand Plugin Preferences page spacing vertically to fill the height of the dialog. + * src/interface.c, src/keybindings.c, src/keybindings.h, src/prefs.c, + geany.glade, plugins/splitwindow.c: + Allow GeanyKeyBinding label field to contain underscores, which won't + be displayed by Geany. This saves adding near-duplicate translation + strings. + Add mnemonics for 3 Edit->Format menu items. + Add keybindings_get_label(). 2009-10-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-10-29 11:31:48 UTC (rev 4388) +++ trunk/geany.glade 2009-10-29 11:59:55 UTC (rev 4389) @@ -428,7 +428,7 @@ <child> <widget class="GtkMenuItem" id="reflow_lines/block1"> <property name="visible">True</property> - <property name="label" translatable="yes">Reflow Lines/Block</property> + <property name="label" translatable="yes">_Reflow Lines/Block</property> <property name="use_underline">True</property> <signal name="activate" handler="on_reflow_lines/block1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> </widget> @@ -446,7 +446,7 @@ <child> <widget class="GtkMenuItem" id="transpose_current_line1"> <property name="visible">True</property> - <property name="label" translatable="yes">Transpose Current Line</property> + <property name="label" translatable="yes">_Transpose Current Line</property> <property name="use_underline">True</property> <signal name="activate" handler="on_transpose_current_line1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> </widget> @@ -536,7 +536,7 @@ <child> <widget class="GtkMenuItem" id="smart_line_indent1"> <property name="visible">True</property> - <property name="label" translatable="yes">Smart Line Indent</property> + <property name="label" translatable="yes">_Smart Line Indent</property> <property name="use_underline">True</property> <signal name="activate" handler="on_smart_line_indent1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> </widget> Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2009-10-29 11:31:48 UTC (rev 4388) +++ trunk/plugins/splitwindow.c 2009-10-29 11:59:55 UTC (rev 4389) @@ -401,7 +401,7 @@ keybindings_set_item(key_group, KB_SPLIT_VERTICAL, kb_activate, 0, 0, "split_vertical", _("Split Vertically"), menu_items.vertical); keybindings_set_item(key_group, KB_SPLIT_UNSPLIT, kb_activate, - 0, 0, "split_unsplit", _("Unsplit"), menu_items.unsplit); + 0, 0, "split_unsplit", _("_Unsplit"), menu_items.unsplit); } Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-10-29 11:31:48 UTC (rev 4388) +++ trunk/src/interface.c 2009-10-29 11:59:55 UTC (rev 4389) @@ -483,7 +483,7 @@ menu_format1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_format1), menu_format1_menu); - reflow_lines_block1 = gtk_menu_item_new_with_mnemonic (_("Reflow Lines/Block")); + reflow_lines_block1 = gtk_menu_item_new_with_mnemonic (_("_Reflow Lines/Block")); gtk_widget_show (reflow_lines_block1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), reflow_lines_block1); @@ -491,7 +491,7 @@ gtk_widget_show (menu_toggle_case2); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_toggle_case2); - transpose_current_line1 = gtk_menu_item_new_with_mnemonic (_("Transpose Current Line")); + transpose_current_line1 = gtk_menu_item_new_with_mnemonic (_("_Transpose Current Line")); gtk_widget_show (transpose_current_line1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), transpose_current_line1); @@ -533,7 +533,7 @@ gtk_widget_show (image3148); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3148); - smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("Smart Line Indent")); + smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("_Smart Line Indent")); gtk_widget_show (smart_line_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), smart_line_indent1); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-10-29 11:31:48 UTC (rev 4388) +++ trunk/src/keybindings.c 2009-10-29 11:59:55 UTC (rev 4389) @@ -134,7 +134,8 @@ * @param key (Lower case) default key, e.g. @c GDK_j, but usually 0 for unset. * @param mod Default modifier, e.g. @c GDK_CONTROL_MASK, but usually 0 for unset. * @param kf_name Key name for the configuration file, such as @c "menu_new". - * @param label Label used in the preferences dialog keybindings tab. + * @param label Label used in the preferences dialog keybindings tab. May contain + * underscores - these won't be displayed. * @param menu_item Optional widget to set an accelerator for, or @c NULL. * @return The keybinding - normally this is ignored. */ GeanyKeyBinding *keybindings_set_item(GeanyKeyGroup *group, gsize key_id, @@ -266,7 +267,7 @@ _("Delete to line end"), NULL); /* transpose may fit better in format group */ keybindings_set_item(group, GEANY_KEYS_EDITOR_TRANSPOSELINE, NULL, - GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("Transpose Current Line"), + GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("_Transpose Current Line"), LW(transpose_current_line1)); keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLTOLINE, NULL, GDK_l, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_scrolltoline", _("Scroll to current line"), NULL); @@ -350,7 +351,7 @@ keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, NULL, 0, 0, "edit_decreaseindentbyspace", _("Decrease indent by one space"), NULL); keybindings_set_item(group, GEANY_KEYS_FORMAT_AUTOINDENT, NULL, - 0, 0, "edit_autoindent", _("Smart Line Indent"), LW(smart_line_indent1)); + 0, 0, "edit_autoindent", _("_Smart Line Indent"), LW(smart_line_indent1)); keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD1, NULL, GDK_1, GDK_CONTROL_MASK, "edit_sendtocmd1", _("Send to Custom Command 1"), NULL); keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD2, NULL, @@ -360,7 +361,7 @@ keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOVTE, NULL, 0, 0, "edit_sendtovte", _("Send Selection to Terminal"), LW(send_selection_to_vte1)); keybindings_set_item(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, NULL, - GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("Reflow Lines/Block"), + GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("_Reflow Lines/Block"), LW(reflow_lines_block1)); group = ADD_KB_GROUP(INSERT, _("Insert"), cb_func_insert_action); @@ -776,10 +777,15 @@ } +gchar *keybindings_get_label(GeanyKeyBinding *kb) +{ + return utils_str_remove_chars(g_strdup(kb->label), "_"); +} + + static void fill_shortcut_labels_treeview(GtkWidget *tree) { gsize g, i; - gchar *shortcut; GeanyKeyBinding *kb; GeanyKeyGroup *group; GtkListStore *store; @@ -802,13 +808,17 @@ for (i = 0; i < group->count; i++) { + gchar *shortcut, *label; + kb = &group->keys[i]; + label = keybindings_get_label(kb); shortcut = gtk_accelerator_get_label(kb->key, kb->mods); gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, 0, kb->label, 1, shortcut, 2, PANGO_WEIGHT_NORMAL, -1); + gtk_list_store_set(store, &iter, 0, label, 1, shortcut, 2, PANGO_WEIGHT_NORMAL, -1); g_free(shortcut); + g_free(label); } } Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2009-10-29 11:31:48 UTC (rev 4388) +++ trunk/src/keybindings.h 2009-10-29 11:59:55 UTC (rev 4389) @@ -41,7 +41,9 @@ guint key; /**< Key value in lower-case, such as @c GDK_a or 0 */ GdkModifierType mods; /**< Modifier keys, such as @c GDK_CONTROL_MASK or 0 */ gchar *name; /**< Key name for the configuration file, such as @c "menu_new" */ - gchar *label; /**< Label used in the preferences dialog keybindings tab */ + /** Label used in the preferences dialog keybindings tab. + * May contain underscores - these won't be displayed. */ + gchar *label; /** Function called when the key combination is pressed, or @c NULL to use the group callback * (preferred). @see plugin_set_key_group(). */ GeanyKeyCallback callback; @@ -351,6 +353,8 @@ GeanyKeyBinding *keybindings_get_item(GeanyKeyGroup *group, gsize key_id); +gchar *keybindings_get_label(GeanyKeyBinding *kb); + void keybindings_update_combo(GeanyKeyBinding *kb, guint key, GdkModifierType mods); void keybindings_send_command(guint group_id, guint key_id); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2009-10-29 11:31:48 UTC (rev 4388) +++ trunk/src/prefs.c 2009-10-29 11:59:55 UTC (rev 4389) @@ -297,7 +297,7 @@ { GtkTreeIter parent, iter; gsize g, i; - gchar *key_string; + gchar *key_string, *label; GeanyKeyGroup *group; GeanyKeyBinding *kb; @@ -316,11 +316,13 @@ { kb = &group->keys[i]; + label = keybindings_get_label(kb); key_string = gtk_accelerator_name(kb->key, kb->mods); gtk_tree_store_append(store, &iter, &parent); - gtk_tree_store_set(store, &iter, KB_TREE_ACTION, kb->label, + gtk_tree_store_set(store, &iter, KB_TREE_ACTION, label, KB_TREE_SHORTCUT, key_string, KB_TREE_INDEX, i, -1); g_free(key_string); + g_free(label); } } gtk_tree_view_expand_all(GTK_TREE_VIEW(tree)); @@ -1400,12 +1402,15 @@ if (kb->key == key && kb->mods == mods && ! (kb->key == search_kb->key && kb->mods == search_kb->mods)) { + gchar *label = keybindings_get_label(kb); gint ret = dialogs_show_prompt(main_widgets.window, _("_Override"), GTK_STOCK_CANCEL, _("_Allow"), _("Override that keybinding?"), _("The combination '%s' is already used for \"%s\"."), - action, kb->label); + action, label); + g_free(label); + if (ret == GTK_RESPONSE_YES) { keybindings_update_combo(kb, 0, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4388] trunk
by ntrel＠users.sourceforge.net 29 Oct '09

29 Oct '09

Revision: 4388 http://geany.svn.sourceforge.net/geany/?rev=4388&view=rev Author: ntrel Date: 2009-10-29 11:31:48 +0000 (Thu, 29 Oct 2009) Log Message: ----------- Don't expand Plugin Preferences page spacing vertically to fill the height of the dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/pluginutils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-28 18:07:49 UTC (rev 4387) +++ trunk/ChangeLog 2009-10-29 11:31:48 UTC (rev 4388) @@ -1,3 +1,10 @@ +2009-10-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/pluginutils.c: + Don't expand Plugin Preferences page spacing vertically to fill the + height of the dialog. + + 2009-10-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/ui_utils.c: Modified: trunk/src/pluginutils.c =================================================================== --- trunk/src/pluginutils.c 2009-10-28 18:07:49 UTC (rev 4387) +++ trunk/src/pluginutils.c 2009-10-29 11:31:48 UTC (rev 4388) @@ -176,7 +176,8 @@ gtk_alignment_set_padding(GTK_ALIGNMENT(align), 6, 6, 6, 6); gtk_container_add(GTK_CONTAINER(align), page); - page = align; + page = gtk_vbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(page), align, FALSE, FALSE, 0); } } else if (p->configure_single) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4387] trunk
by ntrel＠users.sourceforge.net 28 Oct '09

28 Oct '09

Revision: 4387 http://geany.svn.sourceforge.net/geany/?rev=4387&view=rev Author: ntrel Date: 2009-10-28 18:07:49 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Update for Plugin Preferences keybinding. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-28 18:06:16 UTC (rev 4386) +++ trunk/ChangeLog 2009-10-28 18:07:49 UTC (rev 4387) @@ -14,6 +14,8 @@ Add 'Edit->Plugin Preferences' menu item and keybinding. Don't include plugindata.h in pluginutils.h because it redefines the GEANY() macro for plugin use. + * doc/geany.txt, doc/geany.html: + Update for Plugin Preferences keybinding. 2009-10-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2009-10-28 18:06:16 UTC (rev 4386) +++ trunk/doc/geany.html 2009-10-28 18:07:49 UTC (rev 4387) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2009-10-22" /> +<meta name="date" content="2009-10-27" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ Nick Treleaven Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2009-10-22</td></tr> +<td>2009-10-27</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.19</td></tr> </tbody> @@ -3476,6 +3476,10 @@ <td>Ctrl-Alt-P</td> <td>Opens preferences dialog.</td> </tr> +<tr><td>Plugin Preferences</td> +<td> </td> +<td>Opens plugin preferences dialog.</td> +</tr> </tbody> </table> </div> @@ -5804,7 +5808,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2009-10-23 16:09 UTC. +Generated on: 2009-10-28 18:03 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2009-10-28 18:06:16 UTC (rev 4386) +++ trunk/doc/geany.txt 2009-10-28 18:07:49 UTC (rev 4387) @@ -3047,6 +3047,8 @@ Action Default shortcut Description =============================== ========================= ================================================== Preferences Ctrl-Alt-P Opens preferences dialog. + +Plugin Preferences Opens plugin preferences dialog. =============================== ========================= ================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4386] trunk
by ntrel＠users.sourceforge.net 28 Oct '09

28 Oct '09

Revision: 4386 http://geany.svn.sourceforge.net/geany/?rev=4386&view=rev Author: ntrel Date: 2009-10-28 18:06:16 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Add 'Edit->Plugin Preferences' menu item and keybinding. Don't include plugindata.h in pluginutils.h because it redefines the GEANY() macro for plugin use. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/pluginprivate.h trunk/src/pluginutils.c trunk/src/pluginutils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/ChangeLog 2009-10-28 18:06:16 UTC (rev 4386) @@ -8,6 +8,12 @@ * src/sciwrappers.c, src/sciwrappers.h, src/editor.c: Add general function sci_get_string() that works with any string buffer messages that follow the Windows message convention. + * src/pluginprivate.h, src/interface.c, src/keybindings.c, + src/keybindings.h, src/callbacks.c, src/callbacks.h, + src/pluginutils.c, src/pluginutils.h, geany.glade: + Add 'Edit->Plugin Preferences' menu item and keybinding. + Don't include plugindata.h in pluginutils.h because it redefines the + GEANY() macro for plugin use. 2009-10-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/geany.glade 2009-10-28 18:06:16 UTC (rev 4386) @@ -67,7 +67,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3072"> + <widget class="GtkImage" id="image3141"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -144,7 +144,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3073"> + <widget class="GtkImage" id="image3142"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -165,7 +165,7 @@ <signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3074"> + <widget class="GtkImage" id="image3143"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -185,7 +185,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3075"> + <widget class="GtkImage" id="image3144"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -272,7 +272,7 @@ <signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3076"> + <widget class="GtkImage" id="image3145"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -293,7 +293,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3077"> + <widget class="GtkImage" id="image3146"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -499,7 +499,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3078"> + <widget class="GtkImage" id="image3147"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -520,7 +520,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3079"> + <widget class="GtkImage" id="image3148"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -598,7 +598,7 @@ <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3080"> + <widget class="GtkImage" id="image3149"> <property name="visible">True</property> <property name="stock">gtk-cut</property> <property name="icon_size">1</property> @@ -619,7 +619,7 @@ <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3081"> + <widget class="GtkImage" id="image3150"> <property name="visible">True</property> <property name="stock">gtk-copy</property> <property name="icon_size">1</property> @@ -730,7 +730,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3082"> + <widget class="GtkImage" id="image3151"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -809,7 +809,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3083"> + <widget class="GtkImage" id="image3152"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -841,7 +841,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3084"> + <widget class="GtkImage" id="image3153"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -880,7 +880,7 @@ <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3085"> + <widget class="GtkImage" id="image3154"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -892,6 +892,27 @@ </child> </widget> </child> + + <child> + <widget class="GtkImageMenuItem" id="plugin_preferences1"> + <property name="visible">True</property> + <property name="label" translatable="yes">P_lugin Preferences</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_plugin_preferences1_activate" last_modification_time="Wed, 28 Oct 2009 17:17:31 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image3155"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> </widget> </child> </widget> @@ -951,7 +972,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3086"> + <widget class="GtkImage" id="image3156"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -1026,7 +1047,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3087"> + <widget class="GtkImage" id="image3157"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -1060,7 +1081,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3088"> + <widget class="GtkImage" id="image3158"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1532,7 +1553,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3089"> + <widget class="GtkImage" id="image3159"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1553,7 +1574,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3090"> + <widget class="GtkImage" id="image3160"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1582,7 +1603,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3091"> + <widget class="GtkImage" id="image3161"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1639,7 +1660,7 @@ <signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3092"> + <widget class="GtkImage" id="image3162"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1659,7 +1680,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3093"> + <widget class="GtkImage" id="image3163"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -1686,7 +1707,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3094"> + <widget class="GtkImage" id="image3164"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1738,7 +1759,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3095"> + <widget class="GtkImage" id="image3165"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/callbacks.c 2009-10-28 18:06:16 UTC (rev 4386) @@ -65,6 +65,7 @@ #include "plugins.h" #include "log.h" #include "toolbar.h" +#include "pluginutils.h" #ifdef HAVE_VTE @@ -272,9 +273,18 @@ on_edit1_activate (GtkMenuItem *menuitem, gpointer user_data) { + GtkWidget *item; GeanyDocument *doc = document_get_current(); + ui_update_menu_copy_items(doc); ui_update_insert_include_item(doc, 1); + + item = ui_lookup_widget(main_widgets.window, "plugin_preferences1"); +#ifndef HAVE_PLUGINS + gtk_widget_hide(item); +#else + gtk_widget_set_sensitive(item, active_plugin_list != NULL); +#endif } @@ -2365,3 +2375,13 @@ keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_AUTOINDENT); } + +void +on_plugin_preferences1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ +#ifdef HAVE_PLUGINS + plugin_show_configure(NULL); +#endif +} + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/callbacks.h 2009-10-28 18:06:16 UTC (rev 4386) @@ -660,3 +660,7 @@ void on_smart_line_indent1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_plugin_preferences1_activate (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/interface.c 2009-10-28 18:06:16 UTC (rev 4386) @@ -38,7 +38,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image3072; + GtkWidget *image3141; GtkWidget *separator12; GtkWidget *menu_open1; GtkWidget *menu_open_selected_file1; @@ -47,11 +47,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image3073; + GtkWidget *image3142; GtkWidget *menu_reload1; - GtkWidget *image3074; + GtkWidget *image3143; GtkWidget *menu_reload_as1; - GtkWidget *image3075; + GtkWidget *image3144; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -62,9 +62,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image3076; + GtkWidget *image3145; GtkWidget *menu_close_all1; - GtkWidget *image3077; + GtkWidget *image3146; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -90,9 +90,9 @@ GtkWidget *menu_toggle_line_commentation1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image3078; + GtkWidget *image3147; GtkWidget *menu_decrease_indent1; - GtkWidget *image3079; + GtkWidget *image3148; GtkWidget *smart_line_indent1; GtkWidget *separator37; GtkWidget *send_selection_to_vte1; @@ -102,9 +102,9 @@ GtkWidget *commands2; GtkWidget *commands2_menu; GtkWidget *cut_current_line_s_1; - GtkWidget *image3080; + GtkWidget *image3149; GtkWidget *copy_current_line_s_1; - GtkWidget *image3081; + GtkWidget *image3150; GtkWidget *delete_current_line_s_1; GtkWidget *duplicate_line_or_selection1; GtkWidget *separator49; @@ -117,7 +117,7 @@ GtkWidget *go_to_previous_marker1; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image3082; + GtkWidget *image3151; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -126,16 +126,18 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image3083; + GtkWidget *image3152; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image3084; + GtkWidget *image3153; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; - GtkWidget *image3085; + GtkWidget *image3154; + GtkWidget *plugin_preferences1; + GtkWidget *image3155; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; @@ -143,7 +145,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image3086; + GtkWidget *image3156; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -152,11 +154,11 @@ GtkWidget *previous_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image3087; + GtkWidget *image3157; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image3088; + GtkWidget *image3158; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -214,30 +216,30 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image3089; + GtkWidget *image3159; GtkWidget *project_open1; - GtkWidget *image3090; + GtkWidget *image3160; GtkWidget *recent_projects1; GtkWidget *project_close1; - GtkWidget *image3091; + GtkWidget *image3161; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_reload_configuration1; - GtkWidget *image3092; + GtkWidget *image3162; GtkWidget *configuration_files1; - GtkWidget *image3093; + GtkWidget *image3163; GtkWidget *separator47; GtkWidget *menu_choose_color1; - GtkWidget *image3094; + GtkWidget *image3164; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image3095; + GtkWidget *image3165; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -304,9 +306,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image3072 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3072); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3072); + image3141 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3141); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3141); separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); @@ -342,25 +344,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); - image3073 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3073); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3073); + image3142 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3142); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3142); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image3074 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3074); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3074); + image3143 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3143); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3143); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1); - image3075 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3075); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3075); + image3144 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3144); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3144); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -403,17 +405,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1); - image3076 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3076); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3076); + image3145 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3145); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3145); menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All")); gtk_widget_show (menu_close_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); - image3077 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3077); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3077); + image3146 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3146); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3146); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -519,17 +521,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image3078 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3078); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3078); + image3147 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3147); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3147); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image3079 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3079); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3079); + image3148 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3148); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3148); smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("Smart Line Indent")); gtk_widget_show (smart_line_indent1); @@ -565,17 +567,17 @@ gtk_widget_show (cut_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1); - image3080 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3080); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3080); + image3149 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3149); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3149); copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("Copy current line(s)")); gtk_widget_show (copy_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1); - image3081 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3081); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3081); + image3150 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3150); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3150); delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Delete current line(s)")); gtk_widget_show (delete_current_line_s_1); @@ -629,9 +631,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image3082 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3082); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3082); + image3151 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3151); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3151); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -664,9 +666,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image3083 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3083); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3083); + image3152 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3152); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3152); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -678,9 +680,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image3084 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3084); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3084); + image3153 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3153); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3153); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -697,10 +699,18 @@ gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1); - image3085 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3085); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3085); + image3154 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3154); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3154); + plugin_preferences1 = gtk_image_menu_item_new_with_mnemonic (_("P_lugin Preferences")); + gtk_widget_show (plugin_preferences1); + gtk_container_add (GTK_CONTAINER (edit1_menu), plugin_preferences1); + + image3155 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3155); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3155); + search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); gtk_container_add (GTK_CONTAINER (menubar1), search1); @@ -728,9 +738,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image3086 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3086); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3086); + image3156 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3156); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3156); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -767,9 +777,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image3087 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3087); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3087); + image3157 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3157); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3157); menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -782,9 +792,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); - image3088 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3088); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3088); + image3158 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3158); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3158); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -1023,17 +1033,17 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image3089 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3089); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3089); + image3159 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3159); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3159); project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1); - image3090 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3090); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3090); + image3160 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3160); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3160); recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects")); gtk_widget_show (recent_projects1); @@ -1043,9 +1053,9 @@ gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1); - image3091 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3091); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3091); + image3161 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3161); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3161); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -1071,17 +1081,17 @@ gtk_widget_show (menu_reload_configuration1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1); - image3092 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3092); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3092); + image3162 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3162); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3162); configuration_files1 = gtk_image_menu_item_new_with_mnemonic (_("C_onfiguration Files")); gtk_widget_show (configuration_files1); gtk_container_add (GTK_CONTAINER (tools1_menu), configuration_files1); - image3093 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3093); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3093); + image3163 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3163); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3163); separator47 = gtk_separator_menu_item_new (); gtk_widget_show (separator47); @@ -1092,9 +1102,9 @@ gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); - image3094 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3094); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3094); + image3164 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3164); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3164); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1115,9 +1125,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1); - image3095 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3095); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3095); + image3165 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3165); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3165); website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1417,6 +1427,9 @@ g_signal_connect ((gpointer) preferences1, "activate", G_CALLBACK (on_preferences1_activate), NULL); + g_signal_connect ((gpointer) plugin_preferences1, "activate", + G_CALLBACK (on_plugin_preferences1_activate), + NULL); g_signal_connect ((gpointer) search1, "activate", G_CALLBACK (on_search1_activate), NULL); @@ -1614,7 +1627,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image3072, "image3072"); + GLADE_HOOKUP_OBJECT (window1, image3141, "image3141"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); GLADE_HOOKUP_OBJECT (window1, menu_open1, "menu_open1"); GLADE_HOOKUP_OBJECT (window1, menu_open_selected_file1, "menu_open_selected_file1"); @@ -1623,11 +1636,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image3073, "image3073"); + GLADE_HOOKUP_OBJECT (window1, image3142, "image3142"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image3074, "image3074"); + GLADE_HOOKUP_OBJECT (window1, image3143, "image3143"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image3075, "image3075"); + GLADE_HOOKUP_OBJECT (window1, image3144, "image3144"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1638,9 +1651,9 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1"); - GLADE_HOOKUP_OBJECT (window1, image3076, "image3076"); + GLADE_HOOKUP_OBJECT (window1, image3145, "image3145"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image3077, "image3077"); + GLADE_HOOKUP_OBJECT (window1, image3146, "image3146"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1666,9 +1679,9 @@ GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3078, "image3078"); + GLADE_HOOKUP_OBJECT (window1, image3147, "image3147"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3079, "image3079"); + GLADE_HOOKUP_OBJECT (window1, image3148, "image3148"); GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); @@ -1678,9 +1691,9 @@ GLADE_HOOKUP_OBJECT (window1, commands2, "commands2"); GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu"); GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3080, "image3080"); + GLADE_HOOKUP_OBJECT (window1, image3149, "image3149"); GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3081, "image3081"); + GLADE_HOOKUP_OBJECT (window1, image3150, "image3150"); GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1"); GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1"); GLADE_HOOKUP_OBJECT (window1, separator49, "separator49"); @@ -1693,7 +1706,7 @@ GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image3082, "image3082"); + GLADE_HOOKUP_OBJECT (window1, image3151, "image3151"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1702,16 +1715,18 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image3083, "image3083"); + GLADE_HOOKUP_OBJECT (window1, image3152, "image3152"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image3084, "image3084"); + GLADE_HOOKUP_OBJECT (window1, image3153, "image3153"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); - GLADE_HOOKUP_OBJECT (window1, image3085, "image3085"); + GLADE_HOOKUP_OBJECT (window1, image3154, "image3154"); + GLADE_HOOKUP_OBJECT (window1, plugin_preferences1, "plugin_preferences1"); + GLADE_HOOKUP_OBJECT (window1, image3155, "image3155"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); @@ -1719,7 +1734,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image3086, "image3086"); + GLADE_HOOKUP_OBJECT (window1, image3156, "image3156"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1728,11 +1743,11 @@ GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image3087, "image3087"); + GLADE_HOOKUP_OBJECT (window1, image3157, "image3157"); GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image3088, "image3088"); + GLADE_HOOKUP_OBJECT (window1, image3158, "image3158"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -1788,30 +1803,30 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image3089, "image3089"); + GLADE_HOOKUP_OBJECT (window1, image3159, "image3159"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image3090, "image3090"); + GLADE_HOOKUP_OBJECT (window1, image3160, "image3160"); GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image3091, "image3091"); + GLADE_HOOKUP_OBJECT (window1, image3161, "image3161"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1"); - GLADE_HOOKUP_OBJECT (window1, image3092, "image3092"); + GLADE_HOOKUP_OBJECT (window1, image3162, "image3162"); GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1"); - GLADE_HOOKUP_OBJECT (window1, image3093, "image3093"); + GLADE_HOOKUP_OBJECT (window1, image3163, "image3163"); GLADE_HOOKUP_OBJECT (window1, separator47, "separator47"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image3094, "image3094"); + GLADE_HOOKUP_OBJECT (window1, image3164, "image3164"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); - GLADE_HOOKUP_OBJECT (window1, image3095, "image3095"); + GLADE_HOOKUP_OBJECT (window1, image3165, "image3165"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1"); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/keybindings.c 2009-10-28 18:06:16 UTC (rev 4386) @@ -377,6 +377,8 @@ keybindings_set_item(group, GEANY_KEYS_SETTINGS_PREFERENCES, cb_func_menu_preferences, GDK_p, GDK_CONTROL_MASK | GDK_MOD1_MASK, "menu_preferences", _("Preferences"), LW(preferences1)); + keybindings_set_item(group, GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, cb_func_menu_preferences, + 0, 0, "menu_pluginpreferences", _("P_lugin Preferences"), LW(plugin_preferences1)); group = ADD_KB_GROUP(SEARCH, _("Search"), cb_func_search_action); @@ -1315,9 +1317,17 @@ } -static void cb_func_menu_preferences(G_GNUC_UNUSED guint key_id) +static void cb_func_menu_preferences(guint key_id) { - on_preferences1_activate(NULL, NULL); + switch (key_id) + { + case GEANY_KEYS_SETTINGS_PREFERENCES: + on_preferences1_activate(NULL, NULL); + break; + case GEANY_KEYS_SETTINGS_PLUGINPREFERENCES: + on_plugin_preferences1_activate(NULL, NULL); + break; + } } Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/keybindings.h 2009-10-28 18:06:16 UTC (rev 4386) @@ -210,6 +210,7 @@ enum { GEANY_KEYS_SETTINGS_PREFERENCES, + GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, GEANY_KEYS_SETTINGS_COUNT }; Modified: trunk/src/pluginprivate.h =================================================================== --- trunk/src/pluginprivate.h 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/pluginprivate.h 2009-10-28 18:06:16 UTC (rev 4386) @@ -26,6 +26,7 @@ #ifndef PLUGINPRIVATE_H #define PLUGINPRIVATE_H +#include "plugindata.h" #include "ui_utils.h" /* GeanyAutoSeparator */ #include "keybindings.h" /* GeanyKeyGroup */ Modified: trunk/src/pluginutils.c =================================================================== --- trunk/src/pluginutils.c 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/pluginutils.c 2009-10-28 18:06:16 UTC (rev 4386) @@ -195,7 +195,8 @@ } -/* multiple plugin configure dialog */ +/* multiple plugin configure dialog + * current_plugin can be NULL */ static void configure_plugins(Plugin *current_plugin) { GtkWidget *dialog, *vbox, *nb; @@ -228,14 +229,18 @@ cur_page = n; } } - if (cur_page >= 0) + if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(nb))) { gtk_widget_show_all(vbox); - gtk_notebook_set_current_page(GTK_NOTEBOOK(nb), cur_page); + if (cur_page >= 0) + gtk_notebook_set_current_page(GTK_NOTEBOOK(nb), cur_page); /* run the dialog */ while (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_APPLY); } + else + utils_beep(); + gtk_widget_destroy(dialog); } @@ -244,10 +249,18 @@ * The plugin must implement one of the plugin_configure() or plugin_configure_single() symbols. * @param plugin Must be @ref geany_plugin. * @since 0.19. */ +/* if NULL, show all plugins */ void plugin_show_configure(GeanyPlugin *plugin) { - Plugin *p = plugin->priv; + Plugin *p; + if (!plugin) + { + configure_plugins(NULL); + return; + } + p = plugin->priv; + if (p->configure) configure_plugins(p); else Modified: trunk/src/pluginutils.h =================================================================== --- trunk/src/pluginutils.h 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/pluginutils.h 2009-10-28 18:06:16 UTC (rev 4386) @@ -28,22 +28,25 @@ #ifdef HAVE_PLUGINS -#include "plugindata.h" /* GeanyPlugin */ #include "keybindings.h" /* GeanyKeyGroupCallback */ -void plugin_add_toolbar_item(GeanyPlugin *plugin, GtkToolItem *item); +/* avoid including plugindata.h otherwise this redefines the GEANY() macro */ +struct GeanyPlugin; -void plugin_module_make_resident(GeanyPlugin *plugin); -void plugin_signal_connect(GeanyPlugin *plugin, +void plugin_add_toolbar_item(struct GeanyPlugin *plugin, GtkToolItem *item); + +void plugin_module_make_resident(struct GeanyPlugin *plugin); + +void plugin_signal_connect(struct GeanyPlugin *plugin, GObject *object, gchar *signal_name, gboolean after, GCallback callback, gpointer user_data); -struct GeanyKeyGroup *plugin_set_key_group(GeanyPlugin *plugin, +struct GeanyKeyGroup *plugin_set_key_group(struct GeanyPlugin *plugin, const gchar *section_name, gsize count, GeanyKeyGroupCallback callback); -void plugin_show_configure(GeanyPlugin *plugin); +void plugin_show_configure(struct GeanyPlugin *plugin); #endif /* HAVE_PLUGINS */ #endif /* PLUGINUTILS_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4385] trunk
by ntrel＠users.sourceforge.net 28 Oct '09

28 Oct '09

Revision: 4385 http://geany.svn.sourceforge.net/geany/?rev=4385&view=rev Author: ntrel Date: 2009-10-28 16:32:22 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Add general function sci_get_string() that works with any string buffer messages that follow the Windows message convention. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-28 11:33:11 UTC (rev 4384) +++ trunk/ChangeLog 2009-10-28 16:32:22 UTC (rev 4385) @@ -5,6 +5,9 @@ * src/interface.c, src/keybindings.c, src/callbacks.c, src/callbacks.h, geany.glade: Add 'Reflow, Transpose, Smart line indent' Edit->Format menu items. + * src/sciwrappers.c, src/sciwrappers.h, src/editor.c: + Add general function sci_get_string() that works with any string + buffer messages that follow the Windows message convention. 2009-10-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-10-28 11:33:11 UTC (rev 4384) +++ trunk/src/editor.c 2009-10-28 16:32:22 UTC (rev 4385) @@ -4769,17 +4769,6 @@ } -/* safe way to read Scintilla string into a buffer */ -static gchar *sci_get_string(ScintillaObject *sci, gint msg) -{ - gint size = SSM(sci, msg, 0, 0) + 1; - gchar *str = g_malloc(size); - - SSM(sci, msg, 0, (sptr_t)str); - return str; -} - - gboolean editor_complete_word_part(GeanyEditor *editor) { gchar *entry; @@ -4789,7 +4778,7 @@ if (!SSM(editor->sci, SCI_AUTOCACTIVE, 0, 0)) return FALSE; - entry = sci_get_string(editor->sci, SCI_AUTOCGETCURRENTTEXT); + entry = sci_get_string(editor->sci, SCI_AUTOCGETCURRENTTEXT, 0); /* if no word part, complete normally */ if (!check_partial_completion(editor, entry)) Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2009-10-28 11:33:11 UTC (rev 4384) +++ trunk/src/sciwrappers.c 2009-10-28 16:32:22 UTC (rev 4385) @@ -527,18 +527,26 @@ } +/* safe way to read Scintilla string into new memory. + * works with any string buffer messages that follow the Windows message convention. */ +gchar *sci_get_string(ScintillaObject *sci, gint msg, gulong wParam) +{ + gint size = SSM(sci, msg, wParam, 0) + 1; + gchar *str = g_malloc(size); + + SSM(sci, msg, wParam, (sptr_t)str); + str[size - 1] = '\0'; /* ensure termination, needed for SCI_GETLINE */ + return str; +} + + /** Get line contents. * @param sci Scintilla widget. * @param line_num Line number. * @return A @c NULL-terminated copy of the line text. */ gchar *sci_get_line(ScintillaObject *sci, gint line_num) { - gint len = sci_get_line_length(sci, line_num); - gchar *linebuf = g_malloc(len + 1); - - SSM(sci, SCI_GETLINE, line_num, (sptr_t) linebuf); - linebuf[len] = '\0'; - return linebuf; + return sci_get_string(sci, SCI_GETLINE, line_num); } @@ -593,12 +601,7 @@ */ gchar *sci_get_selection_contents(ScintillaObject *sci) { - gint len = sci_get_selected_text_length(sci); - gchar *selection = g_malloc(len + 1); - - SSM(sci, SCI_GETSELTEXT, 0, (sptr_t) selection); - - return selection; + return sci_get_string(sci, SCI_GETSELTEXT, 0); } Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2009-10-28 11:33:11 UTC (rev 4384) +++ trunk/src/sciwrappers.h 2009-10-28 16:32:22 UTC (rev 4385) @@ -28,6 +28,8 @@ #include "ScintillaWidget.h" +gchar* sci_get_string (ScintillaObject *sci, gint msg, gulong wParam); + void sci_set_line_numbers (ScintillaObject *sci, gboolean set, gint extra_width); void sci_set_mark_long_lines (ScintillaObject *sci, gint type, gint column, const gchar *color); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4384] trunk
by ntrel＠users.sourceforge.net 28 Oct '09

28 Oct '09

Revision: 4384 http://geany.svn.sourceforge.net/geany/?rev=4384&view=rev Author: ntrel Date: 2009-10-28 11:33:11 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Add 'Reflow, Transpose, Smart line indent' Edit->Format menu items. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/ChangeLog 2009-10-28 11:33:11 UTC (rev 4384) @@ -2,6 +2,9 @@ * src/ui_utils.c: Desensitize Edit->Commands menu item when no docs are open. + * src/interface.c, src/keybindings.c, src/callbacks.c, + src/callbacks.h, geany.glade: + Add 'Reflow, Transpose, Smart line indent' Edit->Format menu items. 2009-10-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/geany.glade 2009-10-28 11:33:11 UTC (rev 4384) @@ -67,7 +67,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3021"> + <widget class="GtkImage" id="image3072"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -144,7 +144,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3022"> + <widget class="GtkImage" id="image3073"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -165,7 +165,7 @@ <signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3023"> + <widget class="GtkImage" id="image3074"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -185,7 +185,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3024"> + <widget class="GtkImage" id="image3075"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -272,7 +272,7 @@ <signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3025"> + <widget class="GtkImage" id="image3076"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -293,7 +293,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3026"> + <widget class="GtkImage" id="image3077"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -426,6 +426,15 @@ <widget class="GtkMenu" id="menu_format1_menu"> <child> + <widget class="GtkMenuItem" id="reflow_lines/block1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Reflow Lines/Block</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_reflow_lines/block1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> + </widget> + </child> + + <child> <widget class="GtkMenuItem" id="menu_toggle_case2"> <property name="visible">True</property> <property name="label" translatable="yes">T_oggle Case of Selection</property> @@ -435,6 +444,15 @@ </child> <child> + <widget class="GtkMenuItem" id="transpose_current_line1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Transpose Current Line</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_transpose_current_line1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator28"> <property name="visible">True</property> </widget> @@ -481,7 +499,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3027"> + <widget class="GtkImage" id="image3078"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -502,7 +520,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3028"> + <widget class="GtkImage" id="image3079"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -516,6 +534,15 @@ </child> <child> + <widget class="GtkMenuItem" id="smart_line_indent1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Smart Line Indent</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_smart_line_indent1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator37"> <property name="visible">True</property> </widget> @@ -561,7 +588,7 @@ <property name="use_underline">True</property> <child> - <widget class="GtkMenu" id="commands1_menu"> + <widget class="GtkMenu" id="commands2_menu"> <child> <widget class="GtkImageMenuItem" id="cut_current_line(s)1"> @@ -571,7 +598,7 @@ <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3013"> + <widget class="GtkImage" id="image3080"> <property name="visible">True</property> <property name="stock">gtk-cut</property> <property name="icon_size">1</property> @@ -592,7 +619,7 @@ <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3014"> + <widget class="GtkImage" id="image3081"> <property name="visible">True</property> <property name="stock">gtk-copy</property> <property name="icon_size">1</property> @@ -703,7 +730,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3029"> + <widget class="GtkImage" id="image3082"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -782,7 +809,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3030"> + <widget class="GtkImage" id="image3083"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -814,7 +841,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3031"> + <widget class="GtkImage" id="image3084"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -853,7 +880,7 @@ <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3032"> + <widget class="GtkImage" id="image3085"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -924,7 +951,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3033"> + <widget class="GtkImage" id="image3086"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -999,7 +1026,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3034"> + <widget class="GtkImage" id="image3087"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -1033,7 +1060,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3035"> + <widget class="GtkImage" id="image3088"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1505,7 +1532,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3036"> + <widget class="GtkImage" id="image3089"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1526,7 +1553,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3037"> + <widget class="GtkImage" id="image3090"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1555,7 +1582,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3038"> + <widget class="GtkImage" id="image3091"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1612,7 +1639,7 @@ <signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3039"> + <widget class="GtkImage" id="image3092"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1632,7 +1659,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image3040"> + <widget class="GtkImage" id="image3093"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -1659,7 +1686,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3041"> + <widget class="GtkImage" id="image3094"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1711,7 +1738,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image3042"> + <widget class="GtkImage" id="image3095"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/src/callbacks.c 2009-10-28 11:33:11 UTC (rev 4384) @@ -2341,3 +2341,27 @@ keybindings_send_command(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_PREVIOUSMARKER); } + +void +on_reflow_lines_block1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH); +} + + +void +on_transpose_current_line1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_TRANSPOSELINE); +} + + +void +on_smart_line_indent1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_AUTOINDENT); +} + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/src/callbacks.h 2009-10-28 11:33:11 UTC (rev 4384) @@ -648,3 +648,15 @@ void on_go_to_previous_marker1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_reflow_lines_block1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_transpose_current_line1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_smart_line_indent1_activate (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/src/interface.c 2009-10-28 11:33:11 UTC (rev 4384) @@ -38,7 +38,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image3021; + GtkWidget *image3072; GtkWidget *separator12; GtkWidget *menu_open1; GtkWidget *menu_open_selected_file1; @@ -47,11 +47,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image3022; + GtkWidget *image3073; GtkWidget *menu_reload1; - GtkWidget *image3023; + GtkWidget *image3074; GtkWidget *menu_reload_as1; - GtkWidget *image3024; + GtkWidget *image3075; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -62,9 +62,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image3025; + GtkWidget *image3076; GtkWidget *menu_close_all1; - GtkWidget *image3026; + GtkWidget *image3077; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -81,27 +81,30 @@ GtkWidget *separator25; GtkWidget *menu_format1; GtkWidget *menu_format1_menu; + GtkWidget *reflow_lines_block1; GtkWidget *menu_toggle_case2; + GtkWidget *transpose_current_line1; GtkWidget *separator28; GtkWidget *menu_comment_line1; GtkWidget *menu_uncomment_line1; GtkWidget *menu_toggle_line_commentation1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image3027; + GtkWidget *image3078; GtkWidget *menu_decrease_indent1; - GtkWidget *image3028; + GtkWidget *image3079; + GtkWidget *smart_line_indent1; GtkWidget *separator37; GtkWidget *send_selection_to_vte1; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; GtkWidget *commands2; - GtkWidget *commands1_menu; + GtkWidget *commands2_menu; GtkWidget *cut_current_line_s_1; - GtkWidget *image3013; + GtkWidget *image3080; GtkWidget *copy_current_line_s_1; - GtkWidget *image3014; + GtkWidget *image3081; GtkWidget *delete_current_line_s_1; GtkWidget *duplicate_line_or_selection1; GtkWidget *separator49; @@ -114,7 +117,7 @@ GtkWidget *go_to_previous_marker1; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image3029; + GtkWidget *image3082; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -123,16 +126,16 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image3030; + GtkWidget *image3083; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image3031; + GtkWidget *image3084; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; - GtkWidget *image3032; + GtkWidget *image3085; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; @@ -140,7 +143,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image3033; + GtkWidget *image3086; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -149,11 +152,11 @@ GtkWidget *previous_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image3034; + GtkWidget *image3087; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image3035; + GtkWidget *image3088; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -211,30 +214,30 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image3036; + GtkWidget *image3089; GtkWidget *project_open1; - GtkWidget *image3037; + GtkWidget *image3090; GtkWidget *recent_projects1; GtkWidget *project_close1; - GtkWidget *image3038; + GtkWidget *image3091; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_reload_configuration1; - GtkWidget *image3039; + GtkWidget *image3092; GtkWidget *configuration_files1; - GtkWidget *image3040; + GtkWidget *image3093; GtkWidget *separator47; GtkWidget *menu_choose_color1; - GtkWidget *image3041; + GtkWidget *image3094; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image3042; + GtkWidget *image3095; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -301,9 +304,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image3021 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3021); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3021); + image3072 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3072); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3072); separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); @@ -339,25 +342,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); - image3022 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3022); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3022); + image3073 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3073); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3073); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image3023 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3023); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3023); + image3074 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3074); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3074); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1); - image3024 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3024); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3024); + image3075 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3075); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3075); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -400,17 +403,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1); - image3025 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3025); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3025); + image3076 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3076); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3076); menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All")); gtk_widget_show (menu_close_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); - image3026 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3026); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3026); + image3077 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3077); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3077); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -478,10 +481,18 @@ menu_format1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_format1), menu_format1_menu); + reflow_lines_block1 = gtk_menu_item_new_with_mnemonic (_("Reflow Lines/Block")); + gtk_widget_show (reflow_lines_block1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), reflow_lines_block1); + menu_toggle_case2 = gtk_menu_item_new_with_mnemonic (_("T_oggle Case of Selection")); gtk_widget_show (menu_toggle_case2); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_toggle_case2); + transpose_current_line1 = gtk_menu_item_new_with_mnemonic (_("Transpose Current Line")); + gtk_widget_show (transpose_current_line1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), transpose_current_line1); + separator28 = gtk_separator_menu_item_new (); gtk_widget_show (separator28); gtk_container_add (GTK_CONTAINER (menu_format1_menu), separator28); @@ -508,18 +519,22 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image3027 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3027); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3027); + image3078 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3078); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3078); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image3028 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3028); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3028); + image3079 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3079); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3079); + smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("Smart Line Indent")); + gtk_widget_show (smart_line_indent1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), smart_line_indent1); + separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); gtk_container_add (GTK_CONTAINER (menu_format1_menu), separator37); @@ -543,67 +558,67 @@ gtk_widget_show (commands2); gtk_container_add (GTK_CONTAINER (edit1_menu), commands2); - commands1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (commands2), commands1_menu); + commands2_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (commands2), commands2_menu); cut_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("Cut current line(s)")); gtk_widget_show (cut_current_line_s_1); - gtk_container_add (GTK_CONTAINER (commands1_menu), cut_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1); - image3013 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3013); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3013); + image3080 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3080); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3080); copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("Copy current line(s)")); gtk_widget_show (copy_current_line_s_1); - gtk_container_add (GTK_CONTAINER (commands1_menu), copy_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1); - image3014 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3014); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3014); + image3081 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3081); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3081); delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Delete current line(s)")); gtk_widget_show (delete_current_line_s_1); - gtk_container_add (GTK_CONTAINER (commands1_menu), delete_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), delete_current_line_s_1); duplicate_line_or_selection1 = gtk_menu_item_new_with_mnemonic (_("Duplicate line or selection")); gtk_widget_show (duplicate_line_or_selection1); - gtk_container_add (GTK_CONTAINER (commands1_menu), duplicate_line_or_selection1); + gtk_container_add (GTK_CONTAINER (commands2_menu), duplicate_line_or_selection1); separator49 = gtk_separator_menu_item_new (); gtk_widget_show (separator49); - gtk_container_add (GTK_CONTAINER (commands1_menu), separator49); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator49); gtk_widget_set_sensitive (separator49, FALSE); select_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Select current line(s)")); gtk_widget_show (select_current_line_s_1); - gtk_container_add (GTK_CONTAINER (commands1_menu), select_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_line_s_1); select_current_paragraph1 = gtk_menu_item_new_with_mnemonic (_("Select current paragraph")); gtk_widget_show (select_current_paragraph1); - gtk_container_add (GTK_CONTAINER (commands1_menu), select_current_paragraph1); + gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_paragraph1); separator50 = gtk_separator_menu_item_new (); gtk_widget_show (separator50); - gtk_container_add (GTK_CONTAINER (commands1_menu), separator50); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator50); gtk_widget_set_sensitive (separator50, FALSE); insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("Insert alternative white space")); gtk_widget_show (insert_alternative_white_space1); - gtk_container_add (GTK_CONTAINER (commands1_menu), insert_alternative_white_space1); + gtk_container_add (GTK_CONTAINER (commands2_menu), insert_alternative_white_space1); separator51 = gtk_separator_menu_item_new (); gtk_widget_show (separator51); - gtk_container_add (GTK_CONTAINER (commands1_menu), separator51); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator51); gtk_widget_set_sensitive (separator51, FALSE); go_to_next_marker1 = gtk_menu_item_new_with_mnemonic (_("Go to next marker")); gtk_widget_show (go_to_next_marker1); - gtk_container_add (GTK_CONTAINER (commands1_menu), go_to_next_marker1); + gtk_container_add (GTK_CONTAINER (commands2_menu), go_to_next_marker1); go_to_previous_marker1 = gtk_menu_item_new_with_mnemonic (_("Go to previous marker")); gtk_widget_show (go_to_previous_marker1); - gtk_container_add (GTK_CONTAINER (commands1_menu), go_to_previous_marker1); + gtk_container_add (GTK_CONTAINER (commands2_menu), go_to_previous_marker1); separator18 = gtk_separator_menu_item_new (); gtk_widget_show (separator18); @@ -614,9 +629,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image3029 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3029); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3029); + image3082 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3082); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3082); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -649,9 +664,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image3030 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3030); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3030); + image3083 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3083); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3083); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -663,9 +678,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image3031 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3031); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3031); + image3084 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3084); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3084); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -682,9 +697,9 @@ gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1); - image3032 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3032); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3032); + image3085 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3085); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3085); search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); @@ -713,9 +728,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image3033 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3033); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3033); + image3086 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3086); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3086); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -752,9 +767,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image3034 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3034); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3034); + image3087 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3087); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3087); menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -767,9 +782,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); - image3035 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3035); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3035); + image3088 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3088); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3088); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -1008,17 +1023,17 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image3036 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3036); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3036); + image3089 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3089); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3089); project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1); - image3037 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3037); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3037); + image3090 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3090); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3090); recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects")); gtk_widget_show (recent_projects1); @@ -1028,9 +1043,9 @@ gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1); - image3038 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3038); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3038); + image3091 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3091); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3091); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -1056,17 +1071,17 @@ gtk_widget_show (menu_reload_configuration1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1); - image3039 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3039); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3039); + image3092 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3092); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3092); configuration_files1 = gtk_image_menu_item_new_with_mnemonic (_("C_onfiguration Files")); gtk_widget_show (configuration_files1); gtk_container_add (GTK_CONTAINER (tools1_menu), configuration_files1); - image3040 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3040); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3040); + image3093 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3093); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3093); separator47 = gtk_separator_menu_item_new (); gtk_widget_show (separator47); @@ -1077,9 +1092,9 @@ gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); - image3041 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3041); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3041); + image3094 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3094); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3094); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1100,9 +1115,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1); - image3042 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3042); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3042); + image3095 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3095); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3095); website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1324,9 +1339,15 @@ g_signal_connect ((gpointer) menu_select_all1, "activate", G_CALLBACK (on_menu_select_all1_activate), NULL); + g_signal_connect ((gpointer) reflow_lines_block1, "activate", + G_CALLBACK (on_reflow_lines_block1_activate), + NULL); g_signal_connect ((gpointer) menu_toggle_case2, "activate", G_CALLBACK (on_toggle_case1_activate), NULL); + g_signal_connect ((gpointer) transpose_current_line1, "activate", + G_CALLBACK (on_transpose_current_line1_activate), + NULL); g_signal_connect ((gpointer) menu_comment_line1, "activate", G_CALLBACK (on_menu_comment_line1_activate), NULL); @@ -1342,6 +1363,9 @@ g_signal_connect ((gpointer) menu_decrease_indent1, "activate", G_CALLBACK (on_menu_decrease_indent1_activate), NULL); + g_signal_connect ((gpointer) smart_line_indent1, "activate", + G_CALLBACK (on_smart_line_indent1_activate), + NULL); g_signal_connect ((gpointer) send_selection_to_vte1, "activate", G_CALLBACK (on_send_selection_to_vte1_activate), NULL); @@ -1590,7 +1614,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image3021, "image3021"); + GLADE_HOOKUP_OBJECT (window1, image3072, "image3072"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); GLADE_HOOKUP_OBJECT (window1, menu_open1, "menu_open1"); GLADE_HOOKUP_OBJECT (window1, menu_open_selected_file1, "menu_open_selected_file1"); @@ -1599,11 +1623,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image3022, "image3022"); + GLADE_HOOKUP_OBJECT (window1, image3073, "image3073"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image3023, "image3023"); + GLADE_HOOKUP_OBJECT (window1, image3074, "image3074"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image3024, "image3024"); + GLADE_HOOKUP_OBJECT (window1, image3075, "image3075"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1614,9 +1638,9 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1"); - GLADE_HOOKUP_OBJECT (window1, image3025, "image3025"); + GLADE_HOOKUP_OBJECT (window1, image3076, "image3076"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image3026, "image3026"); + GLADE_HOOKUP_OBJECT (window1, image3077, "image3077"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1633,27 +1657,30 @@ GLADE_HOOKUP_OBJECT (window1, separator25, "separator25"); GLADE_HOOKUP_OBJECT (window1, menu_format1, "menu_format1"); GLADE_HOOKUP_OBJECT (window1, menu_format1_menu, "menu_format1_menu"); + GLADE_HOOKUP_OBJECT (window1, reflow_lines_block1, "reflow_lines_block1"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_case2, "menu_toggle_case2"); + GLADE_HOOKUP_OBJECT (window1, transpose_current_line1, "transpose_current_line1"); GLADE_HOOKUP_OBJECT (window1, separator28, "separator28"); GLADE_HOOKUP_OBJECT (window1, menu_comment_line1, "menu_comment_line1"); GLADE_HOOKUP_OBJECT (window1, menu_uncomment_line1, "menu_uncomment_line1"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3027, "image3027"); + GLADE_HOOKUP_OBJECT (window1, image3078, "image3078"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3028, "image3028"); + GLADE_HOOKUP_OBJECT (window1, image3079, "image3079"); + GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2_menu, "send_selection_to2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); GLADE_HOOKUP_OBJECT (window1, commands2, "commands2"); - GLADE_HOOKUP_OBJECT (window1, commands1_menu, "commands1_menu"); + GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu"); GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3013, "image3013"); + GLADE_HOOKUP_OBJECT (window1, image3080, "image3080"); GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3014, "image3014"); + GLADE_HOOKUP_OBJECT (window1, image3081, "image3081"); GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1"); GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1"); GLADE_HOOKUP_OBJECT (window1, separator49, "separator49"); @@ -1666,7 +1693,7 @@ GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image3029, "image3029"); + GLADE_HOOKUP_OBJECT (window1, image3082, "image3082"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1675,16 +1702,16 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image3030, "image3030"); + GLADE_HOOKUP_OBJECT (window1, image3083, "image3083"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image3031, "image3031"); + GLADE_HOOKUP_OBJECT (window1, image3084, "image3084"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); - GLADE_HOOKUP_OBJECT (window1, image3032, "image3032"); + GLADE_HOOKUP_OBJECT (window1, image3085, "image3085"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); @@ -1692,7 +1719,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image3033, "image3033"); + GLADE_HOOKUP_OBJECT (window1, image3086, "image3086"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1701,11 +1728,11 @@ GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image3034, "image3034"); + GLADE_HOOKUP_OBJECT (window1, image3087, "image3087"); GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image3035, "image3035"); + GLADE_HOOKUP_OBJECT (window1, image3088, "image3088"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -1761,30 +1788,30 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image3036, "image3036"); + GLADE_HOOKUP_OBJECT (window1, image3089, "image3089"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image3037, "image3037"); + GLADE_HOOKUP_OBJECT (window1, image3090, "image3090"); GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image3038, "image3038"); + GLADE_HOOKUP_OBJECT (window1, image3091, "image3091"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1"); - GLADE_HOOKUP_OBJECT (window1, image3039, "image3039"); + GLADE_HOOKUP_OBJECT (window1, image3092, "image3092"); GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1"); - GLADE_HOOKUP_OBJECT (window1, image3040, "image3040"); + GLADE_HOOKUP_OBJECT (window1, image3093, "image3093"); GLADE_HOOKUP_OBJECT (window1, separator47, "separator47"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image3041, "image3041"); + GLADE_HOOKUP_OBJECT (window1, image3094, "image3094"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); - GLADE_HOOKUP_OBJECT (window1, image3042, "image3042"); + GLADE_HOOKUP_OBJECT (window1, image3095, "image3095"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1"); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/src/keybindings.c 2009-10-28 11:33:11 UTC (rev 4384) @@ -264,8 +264,10 @@ keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINETOEND, NULL, GDK_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_deletelinetoend", _("Delete to line end"), NULL); + /* transpose may fit better in format group */ keybindings_set_item(group, GEANY_KEYS_EDITOR_TRANSPOSELINE, NULL, - GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("Transpose current line"), NULL); + GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("Transpose Current Line"), + LW(transpose_current_line1)); keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLTOLINE, NULL, GDK_l, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_scrolltoline", _("Scroll to current line"), NULL); keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLLINEUP, NULL, @@ -348,7 +350,7 @@ keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, NULL, 0, 0, "edit_decreaseindentbyspace", _("Decrease indent by one space"), NULL); keybindings_set_item(group, GEANY_KEYS_FORMAT_AUTOINDENT, NULL, - 0, 0, "edit_autoindent", _("Smart line indent"), NULL); + 0, 0, "edit_autoindent", _("Smart Line Indent"), LW(smart_line_indent1)); keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD1, NULL, GDK_1, GDK_CONTROL_MASK, "edit_sendtocmd1", _("Send to Custom Command 1"), NULL); keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD2, NULL, @@ -358,7 +360,8 @@ keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOVTE, NULL, 0, 0, "edit_sendtovte", _("Send Selection to Terminal"), LW(send_selection_to_vte1)); keybindings_set_item(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, NULL, - GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("Reflow lines/block"), NULL); + GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("Reflow Lines/Block"), + LW(reflow_lines_block1)); group = ADD_KB_GROUP(INSERT, _("Insert"), cb_func_insert_action); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2009