Commits October 2007

commits@lists.geany.org

3 participants
79 discussions

SF.net SVN: geany: [1979] trunk/plugins/pluginmacros.h
by ntrel＠users.sourceforge.net 26 Oct '07

26 Oct '07

Revision: 1979 http://geany.svn.sourceforge.net/geany/?rev=1979&view=rev Author: ntrel Date: 2007-10-26 08:53:19 -0700 (Fri, 26 Oct 2007) Log Message: ----------- Prevent conflict with document::encoding. Modified Paths: -------------- trunk/plugins/pluginmacros.h Modified: trunk/plugins/pluginmacros.h =================================================================== --- trunk/plugins/pluginmacros.h 2007-10-26 12:32:23 UTC (rev 1978) +++ trunk/plugins/pluginmacros.h 2007-10-26 15:53:19 UTC (rev 1979) @@ -32,8 +32,8 @@ #define prefs geany_data->prefs #define dialogs geany_data->dialogs -#define documents geany_data->document -#define encoding geany_data->encoding +#define documents geany_data->document // avoids conflict with document typedef +#define encodings geany_data->encodings // avoids conflict with document::encoding #define keybindings geany_data->keybindings #define msgwindow geany_data->msgwindow #define scintilla geany_data->sci This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1978] trunk
by ntrel＠users.sourceforge.net 26 Oct '07

26 Oct '07

Revision: 1978 http://geany.svn.sourceforge.net/geany/?rev=1978&view=rev Author: ntrel Date: 2007-10-26 05:32:23 -0700 (Fri, 26 Oct 2007) Log Message: ----------- Make all plugins distributed with Geany have the same version number as Geany. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/classbuilder.c trunk/plugins/demoplugin.c trunk/plugins/export.c trunk/plugins/filebrowser.c trunk/plugins/htmlchars.c trunk/plugins/svndiff.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-25 17:38:35 UTC (rev 1977) +++ trunk/ChangeLog 2007-10-26 12:32:23 UTC (rev 1978) @@ -1,3 +1,11 @@ +2007-10-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/svndiff.c, plugins/export.c, plugins/demoplugin.c, + plugins/filebrowser.c, plugins/htmlchars.c, plugins/classbuilder.c: + Make all plugins distributed with Geany have the same version number + as Geany. + + 2007-10-25 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * plugins/svndiff.c: Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2007-10-25 17:38:35 UTC (rev 1977) +++ trunk/plugins/classbuilder.c 2007-10-26 12:32:23 UTC (rev 1978) @@ -46,7 +46,7 @@ VERSION_CHECK(7) -PLUGIN_INFO(_("Class Builder"), _("Creates source files for new class types."), "0.1") +PLUGIN_INFO(_("Class Builder"), _("Creates source files for new class types."), VERSION) enum Modified: trunk/plugins/demoplugin.c =================================================================== --- trunk/plugins/demoplugin.c 2007-10-25 17:38:35 UTC (rev 1977) +++ trunk/plugins/demoplugin.c 2007-10-26 12:32:23 UTC (rev 1978) @@ -52,7 +52,7 @@ VERSION_CHECK(7) /* All plugins must set name, description and version. */ -PLUGIN_INFO(_("Demo"), _("Example plugin."), "0.1") +PLUGIN_INFO(_("Demo"), _("Example plugin."), VERSION) /* Callback when the menu item is clicked. */ Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2007-10-25 17:38:35 UTC (rev 1977) +++ trunk/plugins/export.c 2007-10-26 12:32:23 UTC (rev 1978) @@ -38,7 +38,7 @@ GeanyData *geany_data; VERSION_CHECK(20) -PLUGIN_INFO(_("Export"), _("Exports the current file into different formats."), "0.2") +PLUGIN_INFO(_("Export"), _("Exports the current file into different formats."), VERSION) #define doc_array geany_data->doc_array #define scintilla geany_data->sci Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2007-10-25 17:38:35 UTC (rev 1977) +++ trunk/plugins/filebrowser.c 2007-10-26 12:32:23 UTC (rev 1978) @@ -44,7 +44,7 @@ VERSION_CHECK(26) -PLUGIN_INFO(_("File Browser"), _("Adds a file browser tab to the sidebar."), "0.1") +PLUGIN_INFO(_("File Browser"), _("Adds a file browser tab to the sidebar."), VERSION) enum Modified: trunk/plugins/htmlchars.c =================================================================== --- trunk/plugins/htmlchars.c 2007-10-25 17:38:35 UTC (rev 1977) +++ trunk/plugins/htmlchars.c 2007-10-26 12:32:23 UTC (rev 1978) @@ -42,7 +42,7 @@ VERSION_CHECK(7) -PLUGIN_INFO(_("HTML Characters"), _("Inserts HTML character entities like '&'."), "0.1") +PLUGIN_INFO(_("HTML Characters"), _("Inserts HTML character entities like '&'."), VERSION) enum Modified: trunk/plugins/svndiff.c =================================================================== --- trunk/plugins/svndiff.c 2007-10-25 17:38:35 UTC (rev 1977) +++ trunk/plugins/svndiff.c 2007-10-26 12:32:23 UTC (rev 1978) @@ -42,7 +42,7 @@ VERSION_CHECK(25) -PLUGIN_INFO(_("SVNdiff"), _("Plugin to create a patch of a file against svn"), "0.0.4") +PLUGIN_INFO(_("SVNdiff"), _("Plugin to create a patch of a file against svn"), VERSION) /* Callback if menu item for the current procet or directory was acitvated */ static void svndirectory_activated(GtkMenuItem *menuitem, gpointer gdata) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1977] trunk
by frlan＠users.sourceforge.net 25 Oct '07

25 Oct '07

Revision: 1977 http://geany.svn.sourceforge.net/geany/?rev=1977&view=rev Author: frlan Date: 2007-10-25 10:38:35 -0700 (Thu, 25 Oct 2007) Log Message: ----------- Added feature to make a diff from an open project or a current directory Modified Paths: -------------- trunk/ChangeLog trunk/plugins/svndiff.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-25 07:21:31 UTC (rev 1976) +++ trunk/ChangeLog 2007-10-25 17:38:35 UTC (rev 1977) @@ -1,3 +1,10 @@ +2007-10-25 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * plugins/svndiff.c: + Added feature to make a diff from an open project or a + current directory. + + 2007-10-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/build.c, src/ui_utils.h, src/tools.c, src/project.c, src/geany.h, Modified: trunk/plugins/svndiff.c =================================================================== --- trunk/plugins/svndiff.c 2007-10-25 07:21:31 UTC (rev 1976) +++ trunk/plugins/svndiff.c 2007-10-25 17:38:35 UTC (rev 1977) @@ -2,6 +2,8 @@ * svndiff.c - this file is part of Geany, a fast and lightweight IDE * * Copyright 2007 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,8 +29,9 @@ #include "plugindata.h" #include "document.h" #include "filetypes.h" +#include "utils.h" +#include "project.h" - PluginFields *plugin_fields; GeanyData *geany_data; @@ -39,11 +42,106 @@ VERSION_CHECK(25) -PLUGIN_INFO(_("SVNdiff"), _("Plugin to create a patch of a file against svn"), "0.0.3") +PLUGIN_INFO(_("SVNdiff"), _("Plugin to create a patch of a file against svn"), "0.0.4") +/* Callback if menu item for the current procet or directory was acitvated */ +static void svndirectory_activated(GtkMenuItem *menuitem, gpointer gdata) +{ + guint idx, new_idx; + gchar *base_name = NULL; + gchar *command = NULL; + gchar *project_name = NULL; + gchar *std_output = NULL; + gchar *std_err = NULL; + gint exit_code; + GError *error = NULL; + gchar *filename = NULL; + gchar *locale_filename = NULL; + gchar *text = NULL; + gchar *dir_enc = NULL; -/* Callback if menu item was acitvated */ -static void item_activated(GtkMenuItem *menuitem, gpointer gdata) + GeanyProject *geany_project = geany_data->app->project; + + idx = geany_data->document->get_cur_idx(); + + if (geany_project != NULL && NZV(geany_project->base_path)) + { + if (doc_list[idx].file_name != NULL) + { + geany_data->document->save_file(idx, FALSE); + } + base_name = geany_project->base_path; + project_name = geany_project->name; + } + else if (doc_list[idx].file_name != NULL) + { + if (doc_list[idx].changed) + { + geany_data->document->save_file(idx, FALSE); + } + locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name); + base_name = g_path_get_dirname(locale_filename); + } + else if (doc_list[idx].file_name == NULL) + { + if ( geany_data->dialogs->show_save_as() ) + { + locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name); + base_name = g_path_get_dirname(locale_filename); + } + } + + if (base_name != NULL) + { + command = g_strconcat("svn diff ", base_name, NULL); + + if (project_name != NULL) + { + filename = g_strconcat(project_name,".diff", NULL); + } + else + { + filename = g_strdup("dir.diff"); + } + + if (g_spawn_command_line_sync(command, &std_output, &std_err, &exit_code, &error)) + { + if (! exit_code) + { + if (std_output == NULL || std_output[0] != '\0') + { + if (filename != NULL) + // Be carefull with mixed up encodings + { + text = geany_data->encoding->convert_to_utf8(std_output, -1, &dir_enc); + new_idx = geany_data->document->new_file(filename, NULL, std_output); + geany_data->document->set_encoding(new_idx, dir_enc); + g_free(text); + g_free(dir_enc); + g_free(filename); + } + + } + else + { + ui->set_statusbar(FALSE, _("No changes were made.")); + } + } + else + { // SVN returns some error + ui->set_statusbar(FALSE, + _("Something went really wrong. Is there any svn-binary in your path?")); + } + } + } + else + { + ui->set_statusbar(FALSE, _("Could not determinate a path working in")); + } +} + +/* Callback if menu item for a single file was acitvated */ +static void svnfile_activated(GtkMenuItem *menuitem, gpointer gdata) { gchar *command; gint idx; @@ -145,16 +243,50 @@ /* Called by Geany to initialize the plugin */ void init(GeanyData *data) { - GtkWidget *svndiff_item; + GtkWidget *menu_svndiff = NULL; + GtkWidget *menu_svndiff_menu = NULL; + GtkWidget *menu_svndiff_dir = NULL; + GtkWidget *menu_svndiff_file = NULL; + GtkTooltips *tooltips = NULL; - // Add an item to the Tools menu - svndiff_item = gtk_menu_item_new_with_mnemonic(_("_SVNdiff")); - gtk_widget_show(svndiff_item); - gtk_container_add(GTK_CONTAINER(geany_data->tools_menu), svndiff_item); - g_signal_connect(G_OBJECT(svndiff_item), "activate", G_CALLBACK(item_activated), NULL); + tooltips = gtk_tooltips_new(); + //// Add an item to the Tools menu + //svndiff_item = gtk_menu_item_new_with_mnemonic(_("_SVNdiff")); + //gtk_widget_show(svndiff_item); + //gtk_container_add(GTK_CONTAINER(geany_data->tools_menu), svndiff_item); + //g_signal_connect(G_OBJECT(svndiff_item), "activate", G_CALLBACK(svnfile_activated), NULL); - plugin_fields->menu_item = svndiff_item; + plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE; + + menu_svndiff = gtk_image_menu_item_new_with_mnemonic(_("_SVNdiff")); + gtk_container_add(GTK_CONTAINER(data->tools_menu), menu_svndiff); + + menu_svndiff_menu = gtk_menu_new (); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_svndiff), menu_svndiff_menu); + + // Directory + menu_svndiff_dir = gtk_menu_item_new_with_mnemonic(_("From current _project")); + gtk_container_add(GTK_CONTAINER (menu_svndiff_menu), menu_svndiff_dir); + gtk_tooltips_set_tip (tooltips, menu_svndiff_dir, + _("Makes a svn diff from the a complete projekt or if there is no " + "project avaible of the directory of current activeted file"), NULL); + + g_signal_connect((gpointer) menu_svndiff_dir, "activate", + G_CALLBACK(svndirectory_activated), NULL); + + // Singe file + menu_svndiff_file = gtk_menu_item_new_with_mnemonic(_("From single _file")); + gtk_container_add(GTK_CONTAINER (menu_svndiff_menu), menu_svndiff_file); + gtk_tooltips_set_tip (tooltips, menu_svndiff_file, + _("Makes a svn diff from the of current activeted file"), NULL); + + g_signal_connect((gpointer) menu_svndiff_file, "activate", + G_CALLBACK(svnfile_activated), NULL); + + gtk_widget_show_all(menu_svndiff); + + plugin_fields->menu_item = menu_svndiff; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1976] trunk/po
by frlan＠users.sourceforge.net 25 Oct '07

25 Oct '07

Revision: 1976 http://geany.svn.sourceforge.net/geany/?rev=1976&view=rev Author: frlan Date: 2007-10-25 00:21:31 -0700 (Thu, 25 Oct 2007) Log Message: ----------- Update of Swedish translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/sv.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2007-10-24 16:10:56 UTC (rev 1975) +++ trunk/po/ChangeLog 2007-10-25 07:21:31 UTC (rev 1976) @@ -1,3 +1,8 @@ +2007-10-24 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * sv.po: Update of Swedish translation (Thanks to Tony Mattsson) + + 2007-10-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * svn.po, LINGUAS: @@ -9,6 +14,11 @@ * POTFILES.in: Added new plugin SVNdiff to list of translatable files +2007-10-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * New release: Geany 0.12 "Delurin" + + 2007-10-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * cs.po: Update of Czech translation (Thanks to Petr Messner) @@ -148,6 +158,7 @@ 2007-05-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * it.po: Update of Italian translation (Thanks to M. Baldinelli) + * New release: Geany 0.11 "Bandor" 2007-05-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> @@ -284,6 +295,7 @@ 2006-12-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * vi.po: Update of Vietnamese translation (Thanks to Clytie Siddall) + * New release: Geany 0.10 "Sander" 2006-12-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> @@ -398,6 +410,7 @@ 2006-09-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * ca.po: Update of Catalan translation (thanks to topi) + * New release: Geany 0.9 "Kintaro" 2006-09-29 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> @@ -468,6 +481,11 @@ * de.po: Update of German translation +2006-08-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * New release: Geany 0.8 "Kadir" + + 2006-08-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * de.po: Fixed small mnemonic error in German translation. @@ -571,6 +589,11 @@ * geany.pot: Minor update of strings +2006-06-04 Enrico Troeger <enrico(dot)troeger(at)uvena(dot)de> + + * new release: Geany 0.7 "Ravik" + + 2006-06-01 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Update for final release of geany 0.7 Modified: trunk/po/sv.po =================================================================== --- trunk/po/sv.po 2007-10-24 16:10:56 UTC (rev 1975) +++ trunk/po/sv.po 2007-10-25 07:21:31 UTC (rev 1976) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Geany 0.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-19 15:21+0200\n" -"PO-Revision-Date: 2007-10-11 01:19+0100\n" +"POT-Creation-Date: 2007-10-01 11:49+0200\n" +"PO-Revision-Date: 2007-10-23 22:07+0100\n" "Last-Translator: Tony Mattsson <superxorn(a)gmail.com>\n" "Language-Team: Swedish <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" @@ -19,7 +19,9 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Ett snabbt och lättviktigt IDE som använder GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:278 ../src/interface.c:1628 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:272 +#: ../src/interface.c:1592 msgid "Geany" msgstr "Geany" @@ -27,110 +29,109 @@ msgid "Integrated Development Environment" msgstr "Integrerad utvecklingsmiljö" -#: ../src/about.c:118 +#: ../src/about.c:117 msgid "About Geany" msgstr "Om Geany" -#: ../src/about.c:169 +#: ../src/about.c:168 msgid "A fast and lightweight IDE" msgstr "Ett snabbt och lättviktigt IDE" -#: ../src/about.c:190 +#: ../src/about.c:189 #, c-format msgid "(built on or after %s)" msgstr "(byggd på eller efter %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:221 +#: ../src/about.c:220 msgid "Info" msgstr "Info" -#: ../src/about.c:237 +#: ../src/about.c:236 msgid "Developers" msgstr "Utvecklare" -#: ../src/about.c:246 +#: ../src/about.c:245 msgid "maintainer" -msgstr "" +msgstr "ansvarig" -#: ../src/about.c:254 +#: ../src/about.c:253 msgid "developer" msgstr "utvecklare" -#: ../src/about.c:262 +#: ../src/about.c:261 msgid "translation maintainer" -msgstr "" +msgstr "ansvarig för översättningar" -#: ../src/about.c:271 +#: ../src/about.c:270 msgid "Translators" msgstr "Översättare" -#: ../src/about.c:291 +#: ../src/about.c:290 msgid "Previous Translators" msgstr "Tidigare översättare" -#: ../src/about.c:310 +#: ../src/about.c:309 msgid "Credits" -msgstr "" +msgstr "Tack till ..." -#: ../src/about.c:324 +#: ../src/about.c:323 msgid "License" msgstr "Licens" -#: ../src/about.c:333 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"Licenstexten kunde inte hittas. Var god besök http://www.gnu.org/licenses/" -"gpl-2.0.txt för att se den online." +#: ../src/about.c:332 +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Licenstexten kunde inte hittas. Var god besök http://www.gnu.org/licenses/gpl-2.0.txt för att se den online." #: ../src/build.c:178 #, c-format msgid "Failed to view %s (make sure it is already compiled)" msgstr "Kunde inte visa %s (försäkra dig om att den redan är kompilerad)" -#: ../src/build.c:211 ../src/build.c:749 +#: ../src/build.c:211 +#: ../src/build.c:749 #, c-format -msgid "" -"Could not find terminal \"%s\" (check path for Terminal tool setting in " -"Preferences)" -msgstr "" +msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" +msgstr "Kunde ej hitta terminalen \"%s\" (kontrollera sökvägen till terminalen i Inställningar)" -#: ../src/build.c:223 ../src/build.c:674 +#: ../src/build.c:223 +#: ../src/build.c:674 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "" +msgstr "Misslyckades exekvera \"%s\" (start-skriptet kunde inte skapas)" -#: ../src/build.c:251 ../src/build.c:517 ../src/build.c:774 +#: ../src/build.c:251 +#: ../src/build.c:517 +#: ../src/build.c:774 #: ../src/search.c:1188 #, c-format msgid "Process failed (%s)" -msgstr "" +msgstr "Processen misslyckades (%s)" -#: ../src/build.c:368 ../src/build.c:583 +#: ../src/build.c:368 +#: ../src/build.c:583 msgid "Command stopped because the current file has no extension." -msgstr "" +msgstr "Kommando stoppat därför att vald fil inte har någon filnamnsändelse" #: ../src/build.c:392 #, c-format msgid "Something very strange is occurred, could not stat %s (%s)." -msgstr "" +msgstr "Något underligt hände, kunde inte starta %s (%s)" #: ../src/build.c:504 #, c-format msgid "%s (in directory: %s)" -msgstr "" +msgstr "%s (i sökväg: %s)" #: ../src/build.c:594 #, c-format msgid "Failed to execute \"%s\" (make sure it is already built)" -msgstr "" +msgstr "Misslyckades exekvera \"%s\" (försäkra dig om att den byggts)" #: ../src/build.c:648 #, c-format msgid "Failed to change the working directory to \"%s\"" -msgstr "" +msgstr "Misslyckades ändra arbetssökvägen till \"%s\"" #: ../src/build.c:888 msgid "Compilation failed." @@ -150,60 +151,65 @@ msgstr "Kompilera aktuell fil" #. build the code -#: ../src/build.c:1019 ../src/interface.c:951 +#: ../src/build.c:1019 +#: ../src/interface.c:924 msgid "_Build" msgstr "Bygg" #: ../src/build.c:1023 msgid "Builds the current file (generate an executable file)" -msgstr "" +msgstr "Bygg och generera en exekverbar fil" #. build the code with make all -#: ../src/build.c:1033 ../src/build.c:1155 +#: ../src/build.c:1033 +#: ../src/build.c:1155 msgid "_Make All" msgstr "Kör Make all" -#: ../src/build.c:1036 ../src/build.c:1158 +#: ../src/build.c:1036 +#: ../src/build.c:1158 msgid "Builds the current file with the make tool and the default target" -msgstr "" +msgstr "Bygger filen med Make-verktyget och förinställt mål" #. build the code with make custom -#: ../src/build.c:1044 ../src/build.c:1166 +#: ../src/build.c:1044 +#: ../src/build.c:1166 msgid "Make Custom _Target" -msgstr "" +msgstr "Kör Make med valbara parametrar" -#: ../src/build.c:1048 ../src/build.c:1170 +#: ../src/build.c:1048 +#: ../src/build.c:1170 msgid "Builds the current file with the make tool and the specified target" -msgstr "" +msgstr "Bygger filen med Make-verktyget och ett specificerat mål" #. build the code with make object #: ../src/build.c:1055 msgid "Make _Object" -msgstr "" +msgstr "Kör Make Object" #: ../src/build.c:1059 msgid "Compiles the current file using the make tool" -msgstr "" +msgstr "Kompilerar filen med Make-verktyget" #. next error -#: ../src/build.c:1070 ../src/build.c:1181 +#: ../src/build.c:1070 +#: ../src/build.c:1181 msgid "_Next Error" msgstr "Nästa fel" -#: ../src/build.c:1086 ../src/interface.c:1095 +#: ../src/build.c:1086 +#: ../src/interface.c:1068 msgid "Run or view the current file" -msgstr "" +msgstr "Kör eller visa filen" #. arguments #: ../src/build.c:1097 msgid "_Set Includes and Arguments" -msgstr "" +msgstr "Justera inkluderingar och argument" #: ../src/build.c:1102 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution" -msgstr "" +msgid "Sets the includes and library paths for the compiler and the program arguments for execution" +msgstr "Anger inkluderingar och biblioteks sökvägar (includes, libraries) och programargument vid exekvering" #. DVI #: ../src/build.c:1125 @@ -212,7 +218,7 @@ #: ../src/build.c:1128 msgid "Compiles the current file into a DVI file" -msgstr "" +msgstr "Kompilerar filen till en DVI-fil" #. PDF #: ../src/build.c:1138 @@ -221,14 +227,15 @@ #: ../src/build.c:1141 msgid "Compiles the current file into a PDF file" -msgstr "" +msgstr "Kompilerar filen till en PDF-fil" #. DVI view #: ../src/build.c:1194 msgid "View DVI File" msgstr "Visa DVI-fil" -#: ../src/build.c:1199 ../src/build.c:1212 +#: ../src/build.c:1199 +#: ../src/build.c:1212 msgid "Compile and view the current file" msgstr "Kompilera och visa aktuell fil" @@ -238,17 +245,18 @@ msgstr "Visa PDF-fil" #. arguments -#: ../src/build.c:1227 ../src/build.c:1306 +#: ../src/build.c:1227 +#: ../src/build.c:1306 msgid "Set Arguments" -msgstr "" +msgstr "Ange argument" #: ../src/build.c:1232 msgid "Sets the program paths and arguments" -msgstr "" +msgstr "Ange sökvägar och argument till program" #: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" +msgstr "Anger program och parametrar för att kompilera och visa (La)TeX filer." #: ../src/build.c:1324 msgid "DVI creation:" @@ -266,12 +274,15 @@ msgid "PDF preview:" msgstr "Förhandsvisa PDF:" -#: ../src/build.c:1397 ../src/build.c:1569 +#: ../src/build.c:1397 +#: ../src/build.c:1569 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" "%e will be replaced by the filename without extension, e.g. test_file" msgstr "" +"%f kommer att ersättas med nuvarande filnamn, exempelvis test_fil.c\n" +"%e kommer att ersättas med namn utan filändelse, exempelvis test_fil" #: ../src/build.c:1475 msgid "Set Includes and Arguments" @@ -279,7 +290,7 @@ #: ../src/build.c:1482 msgid "Set the commands for building and running programs." -msgstr "" +msgstr "Anger kommandon för att bygga och köra program." #. in-dialog heading for the "Set Includes and Arguments" dialog #: ../src/build.c:1490 @@ -295,7 +306,8 @@ msgid "Build:" msgstr "Bygg:" -#: ../src/build.c:1547 ../src/dialogs.c:1033 +#: ../src/build.c:1547 +#: ../src/dialogs.c:1033 msgid "Execute:" msgstr "Exekvera:" @@ -304,11 +316,8 @@ msgstr "Skapa användardefinierat mål" #: ../src/build.c:1857 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "" -"Skriv in användardefinierade tillval här, allt text vidarebefordras till " -"Make-kommandot" +msgid "Enter custom options here, all entered text is passed to the make command." +msgstr "Skriv in användardefinierade tillval här, allt text vidarebefordras till Make-kommandot" #: ../src/build.c:1896 msgid "Failed to execute the view program" @@ -327,101 +336,101 @@ msgid "No more build errors." msgstr "Inga fler byggfel." -#: ../src/callbacks.c:178 +#: ../src/callbacks.c:177 msgid "Do you really want to quit?" msgstr "Vill du verkligen avsluta?" -#: ../src/callbacks.c:503 ../src/interface.c:352 ../src/treeviews.c:406 +#: ../src/callbacks.c:502 +#: ../src/interface.c:346 #: ../src/utils.c:340 msgid "_Reload" msgstr "Ladda om" -#: ../src/callbacks.c:504 +#: ../src/callbacks.c:503 msgid "Any unsaved changes will be lost." msgstr "Alla osparade ändringar kommer att förloras." -#: ../src/callbacks.c:505 +#: ../src/callbacks.c:504 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Är du säker på att du vill ladda om '%s'?" -#: ../src/callbacks.c:1315 ../src/callbacks.c:1339 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "" -"Var god och ange filtyp för filen innan du använder den här funktionen." +#: ../src/callbacks.c:1304 +#: ../src/callbacks.c:1328 +msgid "Please set the filetype for the current file before using this function." +msgstr "Var god och ange filtyp för filen innan du använder den här funktionen." -#: ../src/callbacks.c:1456 ../src/ui_utils.c:478 +#: ../src/callbacks.c:1445 +#: ../src/ui_utils.c:459 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1458 ../src/ui_utils.c:479 +#: ../src/callbacks.c:1447 +#: ../src/ui_utils.c:460 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1460 ../src/ui_utils.c:480 +#: ../src/callbacks.c:1449 +#: ../src/ui_utils.c:461 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1462 ../src/ui_utils.c:489 +#: ../src/callbacks.c:1451 +#: ../src/ui_utils.c:470 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1464 ../src/ui_utils.c:490 +#: ../src/callbacks.c:1453 +#: ../src/ui_utils.c:471 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1466 ../src/ui_utils.c:491 +#: ../src/callbacks.c:1455 +#: ../src/ui_utils.c:472 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1468 ../src/ui_utils.c:500 -#, fuzzy -msgid "_Use Custom Date Format" +#: ../src/callbacks.c:1457 +#: ../src/ui_utils.c:481 +msgid "Use Custom Date Format" msgstr "Använd användardefinierat datumformat" -#: ../src/callbacks.c:1479 +#: ../src/callbacks.c:1468 msgid "Custom Date Format" msgstr "Användardefinierat datumformat" -#: ../src/callbacks.c:1480 -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." -msgstr "" -"Skriv in användardefinierat datum- och tidsformat. Du kan använda den syntax " -"som specificeras av ANSI C:s strftime funktion." +#: ../src/callbacks.c:1469 +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." +msgstr "Skriv in användardefinierat datum- och tidsformat. Du kan använda den syntax som specificeras av ANSI C:s strftime funktion." -#: ../src/callbacks.c:1501 +#: ../src/callbacks.c:1489 msgid "Date format string could not be converted (possibly too long)." msgstr "Strängen för datumformat kunde inte konverteras (möjligtvis för lång)." -#: ../src/callbacks.c:1800 +#: ../src/callbacks.c:1786 msgid "No more message items." msgstr "Inga fler meddelanden." #. initialize the dialog -#: ../src/dialogs.c:178 ../src/prefs.c:1254 +#: ../src/dialogs.c:178 +#: ../src/prefs.c:1210 msgid "Open File" msgstr "Öppna fil" -#: ../src/dialogs.c:182 ../src/interface.c:699 +#: ../src/dialogs.c:182 +#: ../src/interface.c:693 msgid "_View" msgstr "Visa" #: ../src/dialogs.c:184 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Öppnar filen i skrivskyddat läge. Om du väljer fler filer, kommer alla " -"öppnas i skrivskyddat läge." +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Öppnar filen i skrivskyddat läge. Om du väljer fler filer, kommer alla öppnas i skrivskyddat läge." #: ../src/dialogs.c:220 msgid "Detect by file extension" msgstr "Upptäck från filändelse" -#: ../src/dialogs.c:231 ../src/interface.c:3555 +#: ../src/dialogs.c:231 msgid "Detect from file" msgstr "Upptäck från fil" @@ -436,17 +445,11 @@ #: ../src/dialogs.c:307 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Definierar teckenkodning för filen, om den inte kan kännas av automatiskt. " -"Detta är användbart när du vet att Geany inte känner av korrekt " -"teckenkodning.\n" -"Notera att om du öppnar många filer, kommer alla öppnas med vald " -"teckenkodning." +"Definierar teckenkodning för filen, om den inte kan kännas av automatiskt. Detta är användbart när du vet att Geany inte känner av korrekt teckenkodning.\n" +"Notera att om du öppnar många filer, kommer alla öppnas med vald teckenkodning." #: ../src/dialogs.c:327 msgid "Set filetype:" @@ -454,15 +457,14 @@ #: ../src/dialogs.c:337 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" "Definierar filtyp, om Geany inte kan känna av filtyp automatiskt.\n" "Notera att om flera filer öppnas, kommer alla att öppnas som vald filtyp." -#: ../src/dialogs.c:405 ../plugins/export.c:328 +#: ../src/dialogs.c:405 +#: ../plugins/export.c:328 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Filen '%s' finns redan. Vill du skriva över den?" @@ -477,23 +479,20 @@ #: ../src/dialogs.c:478 msgid "Save the file and rename it." -msgstr "Spara och byt namn på filen" +msgstr "Spara och byt namn på filen." #: ../src/dialogs.c:489 msgid "_Open file in a new tab" msgstr "Öppna filen i en ny flik" #: ../src/dialogs.c:491 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab." -msgstr "" -"Vill du behålla nuvarande dokument och öppna det nya dokumentet i en ny flik?" +msgid "Keep the current unsaved document open and open the newly saved file in a new tab." +msgstr "Vill du behålla nuvarande dokument och öppna det nya dokumentet i en ny flik?" #: ../src/dialogs.c:609 #, c-format msgid "The file '%s' is not saved." -msgstr "Filen '%s' är inte sparad" +msgstr "Filen '%s' är inte sparad." #: ../src/dialogs.c:611 msgid "Do you want to save it before closing?" @@ -507,7 +506,9 @@ msgid "Choose font" msgstr "Välj font" -#: ../src/dialogs.c:766 ../src/interface.c:2263 ../src/keybindings.c:163 +#: ../src/dialogs.c:766 +#: ../src/interface.c:2222 +#: ../src/keybindings.c:164 msgid "Go to Line" msgstr "Gå till rad" @@ -516,16 +517,18 @@ msgstr "Skriv in radnumret till den rad du vill hoppa till" #: ../src/dialogs.c:820 -msgid "" -"An error occurred or file information could not be retrieved (e.g. from a " -"new file)." -msgstr "" -"Ett fel inträffade, eller så kunde inte fil-informationen hämtas (exempelvis " -"från en ny fil)." +msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." +msgstr "Ett fel inträffade, eller så kunde inte fil-informationen hämtas (exempelvis från en ny fil)." -#: ../src/dialogs.c:844 ../src/dialogs.c:845 ../src/dialogs.c:846 -#: ../src/dialogs.c:852 ../src/dialogs.c:853 ../src/dialogs.c:854 -#: ../src/ui_utils.c:160 ../src/utils.c:502 ../src/utils.c:523 +#: ../src/dialogs.c:844 +#: ../src/dialogs.c:845 +#: ../src/dialogs.c:846 +#: ../src/dialogs.c:852 +#: ../src/dialogs.c:853 +#: ../src/dialogs.c:854 +#: ../src/ui_utils.c:152 +#: ../src/utils.c:502 +#: ../src/utils.c:523 #: ../src/utils.c:576 msgid "unknown" msgstr "okänd" @@ -558,7 +561,8 @@ msgid "Encoding:" msgstr "Kodning:" -#: ../src/dialogs.c:954 ../src/ui_utils.c:162 +#: ../src/dialogs.c:954 +#: ../src/ui_utils.c:154 msgid "(with BOM)" msgstr "(med BOM)" @@ -606,149 +610,137 @@ msgid "Other:" msgstr "Annat:" -#: ../src/document.c:479 +#: ../src/document.c:469 #, c-format msgid "File %s closed." msgstr "Fil %s är stängd." -#: ../src/document.c:578 +#: ../src/document.c:567 #, c-format msgid "New file \"%s\" opened." msgstr "Den nya filen \"%s\" är öppnad." -#: ../src/document.c:744 ../src/document.c:1125 +#: ../src/document.c:733 +#: ../src/document.c:1067 #, c-format msgid "Could not open file %s (%s)" msgstr "Kunde inte öppna fil %s (%s)" -#: ../src/document.c:771 +#: ../src/document.c:760 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"Filen \"%s\" kunde inte öppnas på ett korrekt sätt, och har kortats av. " -"Detta kan inträffa om filen innehåller en NULL byte. Observera att om du " -"sparar den, kan data förloras.\n" +"Filen \"%s\" kunde inte öppnas på ett korrekt sätt, och har kortats av. Detta kan inträffa om filen innehåller en NULL byte. Observera att om du sparar den, kan data förloras.\n" "Filen sattes automatiskt i skrivskyddat läge." -#: ../src/document.c:795 +#: ../src/document.c:784 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Filen \"%s\" är ogiltig %s." -#: ../src/document.c:804 +#: ../src/document.c:793 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Filen \"%s\" verkar inte vara en textfil, eller stöds inte textkodningen." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Filen \"%s\" verkar inte vara en textfil, eller stöds inte textkodningen." -#: ../src/document.c:913 +#: ../src/document.c:870 msgid "Invalid filename" msgstr "Ogiltigt filnamn" -#: ../src/document.c:973 +#: ../src/document.c:965 #, c-format -msgid "Setting %s indentation mode." -msgstr "" - -#: ../src/document.c:974 ../src/interface.c:799 ../src/interface.c:3534 -msgid "Tabs" -msgstr "Tabulatorer" - -#: ../src/document.c:974 ../src/interface.c:804 ../src/interface.c:3541 -msgid "Spaces" -msgstr "" - -#: ../src/document.c:1023 -#, c-format msgid "File %s reloaded." msgstr "Fil %s laddades om" -#: ../src/document.c:1025 +#: ../src/document.c:967 #, c-format msgid "File %s opened(%d%s)." msgstr "Filen %s är öppnad (%d%s)." -#: ../src/document.c:1027 +#: ../src/document.c:969 msgid ", read-only" msgstr ", skrivskyddad" -#: ../src/document.c:1155 ../src/document.c:1242 +#: ../src/document.c:1097 +#: ../src/document.c:1184 msgid "Error saving file." msgstr "Filen kunde ej sparas." -#: ../src/document.c:1202 +#: ../src/document.c:1144 #, c-format msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved.\n" +"An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved.\n" "Error message: %s\n" msgstr "" -"Ett fel inträffade medan filen konverterades från UTF-8 vid \"%s\". Filen " -"sparades inte.\n" +"Ett fel inträffade medan filen konverterades från UTF-8 vid \"%s\". Filen sparades inte.\n" "Felmeddelande: %s\n" -#: ../src/document.c:1230 +#: ../src/document.c:1172 #, c-format msgid "Error saving file (%s)." msgstr "(%s) kunde ej sparas" -#: ../src/document.c:1281 +#: ../src/document.c:1223 #, c-format msgid "File %s saved." msgstr "Fil %s sparad." -#: ../src/document.c:1345 ../src/document.c:1399 ../src/document.c:1407 +#: ../src/document.c:1280 +#: ../src/document.c:1333 +#: ../src/document.c:1341 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" kunde ej hittas." -#: ../src/document.c:1407 +#: ../src/document.c:1341 msgid "Wrap search and find again?" msgstr "Vill du fortsätta sökningen från början av dokumentet?" -#: ../src/document.c:1482 ../src/search.c:876 ../src/search.c:1376 +#: ../src/document.c:1416 +#: ../src/search.c:876 +#: ../src/search.c:1376 #: ../src/search.c:1377 #, c-format msgid "No matches found for \"%s\"." msgstr "Inga träffar hittades för \"%s\"." -#: ../src/document.c:1492 ../src/document.c:1499 +#: ../src/document.c:1426 +#: ../src/document.c:1433 #, c-format msgid "%s: replaced %d occurrence(s) of \"%s\" with \"%s\"." msgstr "%s: utbytt med %d träff(ar) av \"%s\" med \"%s\"." -#: ../src/document.c:1905 +#: ../src/document.c:1839 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/document.c:1906 +#: ../src/document.c:1840 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/document.c:1908 +#: ../src/document.c:1842 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/document.c:2011 +#: ../src/document.c:1945 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" "\n" "%s" msgstr "" +"Filen \"%s\" kommer att skrivas ut med följande kommando:\n" +"\n" +"%s" -#: ../src/document.c:2026 +#: ../src/document.c:1960 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "" +msgstr "Utskriften \"%s\" misslyckades (felkod: %s)." -#: ../src/document.c:2032 +#: ../src/document.c:1966 #, c-format msgid "File %s printed." msgstr "Fil %s utskriven." @@ -757,7 +749,8 @@ msgid "Celtic" msgstr "Keltisk" -#: ../src/encodings.c:56 ../src/encodings.c:57 +#: ../src/encodings.c:56 +#: ../src/encodings.c:57 msgid "Greek" msgstr "Grekisk" @@ -769,21 +762,30 @@ msgid "South European" msgstr "Sydeuropeisk" -#: ../src/encodings.c:60 ../src/encodings.c:61 ../src/encodings.c:62 +#: ../src/encodings.c:60 +#: ../src/encodings.c:61 +#: ../src/encodings.c:62 #: ../src/encodings.c:63 msgid "Western" msgstr "Västeuropeisk" -#: ../src/encodings.c:65 ../src/encodings.c:66 ../src/encodings.c:67 +#: ../src/encodings.c:65 +#: ../src/encodings.c:66 +#: ../src/encodings.c:67 msgid "Baltic" msgstr "Baltisk" -#: ../src/encodings.c:68 ../src/encodings.c:69 ../src/encodings.c:70 +#: ../src/encodings.c:68 +#: ../src/encodings.c:69 +#: ../src/encodings.c:70 msgid "Central European" msgstr "Centraleuropeisk" -#: ../src/encodings.c:71 ../src/encodings.c:72 ../src/encodings.c:73 -#: ../src/encodings.c:74 ../src/encodings.c:75 +#: ../src/encodings.c:71 +#: ../src/encodings.c:72 +#: ../src/encodings.c:73 +#: ../src/encodings.c:74 +#: ../src/encodings.c:75 msgid "Cyrillic" msgstr "Kyrillisk" @@ -799,11 +801,15 @@ msgid "Romanian" msgstr "Rumänsk" -#: ../src/encodings.c:80 ../src/encodings.c:81 ../src/encodings.c:82 +#: ../src/encodings.c:80 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 msgid "Arabic" msgstr "Arabisk" -#: ../src/encodings.c:83 ../src/encodings.c:84 ../src/encodings.c:85 +#: ../src/encodings.c:83 +#: ../src/encodings.c:84 +#: ../src/encodings.c:85 msgid "Hebrew" msgstr "Hebreisk" @@ -823,34 +829,51 @@ msgid "Thai" msgstr "Thailänsk" -#: ../src/encodings.c:91 ../src/encodings.c:92 ../src/encodings.c:93 +#: ../src/encodings.c:91 +#: ../src/encodings.c:92 +#: ../src/encodings.c:93 msgid "Turkish" msgstr "Turkisk" -#: ../src/encodings.c:94 ../src/encodings.c:95 ../src/encodings.c:96 +#: ../src/encodings.c:94 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 msgid "Vietnamese" msgstr "Vietnamesisk" -#: ../src/encodings.c:98 ../src/encodings.c:99 ../src/encodings.c:100 -#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103 -#: ../src/encodings.c:104 ../src/encodings.c:105 +#: ../src/encodings.c:98 +#: ../src/encodings.c:99 +#: ../src/encodings.c:100 +#: ../src/encodings.c:101 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 +#: ../src/encodings.c:104 +#: ../src/encodings.c:105 msgid "Unicode" msgstr "Unicode" -#: ../src/encodings.c:107 ../src/encodings.c:108 ../src/encodings.c:109 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 +#: ../src/encodings.c:109 #: ../src/encodings.c:110 msgid "Chinese Simplified" msgstr "Kinesisk förenklad" -#: ../src/encodings.c:111 ../src/encodings.c:112 ../src/encodings.c:113 +#: ../src/encodings.c:111 +#: ../src/encodings.c:112 +#: ../src/encodings.c:113 msgid "Chinese Traditional" msgstr "Kinesisk traditionell" -#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 msgid "Japanese" msgstr "Japansk" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 +#: ../src/encodings.c:119 #: ../src/encodings.c:120 msgid "Korean" msgstr "Koreansk" @@ -1015,7 +1038,8 @@ msgid "reStructuredText file" msgstr "reStructuredText fil" -#: ../src/filetypes.c:513 ../src/project.c:250 +#: ../src/filetypes.c:513 +#: ../src/project.c:250 msgid "All files" msgstr "Alla filer" @@ -1035,1815 +1059,1806 @@ msgid "M_iscellaneous Languages" msgstr "Diverse språk" -#: ../src/filetypes.c:578 ../src/interface.c:3505 ../src/templates.c:333 +#: ../src/filetypes.c:578 +#: ../src/interface.c:3490 +#: ../src/templates.c:333 msgid "None" msgstr "Inga" -#: ../src/filetypes.c:932 ../src/win32.c:81 +#: ../src/filetypes.c:932 +#: ../src/win32.c:81 msgid "All Source" -msgstr "" +msgstr "All källkod" #: ../src/geany.h:58 msgid "untitled" -msgstr "" +msgstr "odöpt" -#: ../src/interface.c:288 +#: ../src/interface.c:282 msgid "_File" msgstr "Fil" -#: ../src/interface.c:299 +#: ../src/interface.c:293 msgid "New (with _Template)" -msgstr "" +msgstr "Ny (med mall)" -#: ../src/interface.c:310 ../src/interface.c:371 ../src/interface.c:547 -#: ../src/interface.c:607 ../src/interface.c:621 ../src/interface.c:836 -#: ../src/interface.c:846 ../src/interface.c:2156 ../src/interface.c:2216 -#: ../src/interface.c:2230 +#: ../src/interface.c:304 +#: ../src/interface.c:365 +#: ../src/interface.c:541 +#: ../src/interface.c:601 +#: ../src/interface.c:615 +#: ../src/interface.c:807 +#: ../src/interface.c:817 +#: ../src/interface.c:2115 +#: ../src/interface.c:2175 +#: ../src/interface.c:2189 msgid "invisible" msgstr "osynlig" -#: ../src/interface.c:322 ../src/interface.c:2082 +#: ../src/interface.c:316 +#: ../src/interface.c:2041 msgid "Open Selected F_ile" msgstr "Öppna vald fil" -#: ../src/interface.c:326 +#: ../src/interface.c:320 msgid "Recent _Files" msgstr "Senaste filer" -#: ../src/interface.c:343 +#: ../src/interface.c:337 msgid "Save A_ll" msgstr "Spara alla" -#: ../src/interface.c:346 +#: ../src/interface.c:340 msgid "Saves all open files" msgstr "Spara alla öppna filer" -#: ../src/interface.c:360 +#: ../src/interface.c:354 msgid "R_eload As" msgstr "Ladda om som" -#: ../src/interface.c:379 +#: ../src/interface.c:373 msgid "Load Ta_gs" msgstr "Ladda taggar" -#: ../src/interface.c:382 +#: ../src/interface.c:376 msgid "Load global tags file" msgstr "Ladda global tagg-fil" -#: ../src/interface.c:401 +#: ../src/interface.c:395 msgid "Prints the current file" msgstr "Skriv ut" -#: ../src/interface.c:412 +#: ../src/interface.c:406 msgid "C_lose All" msgstr "Stäng alla" -#: ../src/interface.c:415 +#: ../src/interface.c:409 msgid "Closes all open files" msgstr "Stäng alla öppna filer" -#: ../src/interface.c:429 ../src/interface.c:1173 +#: ../src/interface.c:423 +#: ../src/interface.c:1146 msgid "Quit Geany" msgstr "Avsluta Geany" -#: ../src/interface.c:431 +#: ../src/interface.c:425 msgid "_Edit" msgstr "Redigera" -#: ../src/interface.c:472 ../src/interface.c:2073 +#: ../src/interface.c:466 +#: ../src/interface.c:2032 msgid "Select _All" msgstr "Välj allt" -#: ../src/interface.c:481 ../src/interface.c:2091 +#: ../src/interface.c:475 +#: ../src/interface.c:2050 msgid "_Format" msgstr "Format" -#: ../src/interface.c:484 +#: ../src/interface.c:478 msgid "Convert the case of the current selection" -msgstr "" +msgstr "Konvertera mellan versaler och gemener" -#: ../src/interface.c:489 ../src/interface.c:2098 +#: ../src/interface.c:483 +#: ../src/interface.c:2057 msgid "T_oggle Case of Selection" -msgstr "" +msgstr "Justerar gemener och versaler i markeringen" -#: ../src/interface.c:498 ../src/interface.c:2107 +#: ../src/interface.c:492 +#: ../src/interface.c:2066 msgid "_Comment Line(s)" msgstr "Kommentera rader" -#: ../src/interface.c:502 ../src/interface.c:2111 +#: ../src/interface.c:496 +#: ../src/interface.c:2070 msgid "U_ncomment Line(s)" msgstr "Avkommentera rader" -#: ../src/interface.c:506 ../src/interface.c:2115 +#: ../src/interface.c:500 +#: ../src/interface.c:2074 msgid "_Toggle Line Commentation" -msgstr "" +msgstr "Stäng av / på radkommentarer" -#: ../src/interface.c:510 ../src/interface.c:2119 +#: ../src/interface.c:504 +#: ../src/interface.c:2078 msgid "Du_plicate Line or Selection" -msgstr "" +msgstr "Gör en kopia av raden eller markeringen" -#: ../src/interface.c:519 ../src/interface.c:2128 +#: ../src/interface.c:513 +#: ../src/interface.c:2087 msgid "_Increase Indent" -msgstr "" +msgstr "Öka indrag" -#: ../src/interface.c:527 ../src/interface.c:2136 +#: ../src/interface.c:521 +#: ../src/interface.c:2095 msgid "_Decrease Indent" -msgstr "" +msgstr "Minska indrag" -#: ../src/interface.c:540 ../src/interface.c:2149 +#: ../src/interface.c:534 +#: ../src/interface.c:2108 msgid "_Send Selection to" msgstr "Skicka markering till" -#: ../src/interface.c:555 +#: ../src/interface.c:549 msgid "I_nsert Comments" msgstr "Infoga kommentarer" -#: ../src/interface.c:566 ../src/interface.c:2175 +#: ../src/interface.c:560 +#: ../src/interface.c:2134 msgid "Insert ChangeLog Entry" -msgstr "" +msgstr "Infoga ChangeLog" -#: ../src/interface.c:569 ../src/interface.c:2178 +#: ../src/interface.c:563 +#: ../src/interface.c:2137 msgid "Inserts a typical ChangeLog entry in the current file" -msgstr "" +msgstr "Infoga en typisk ChangeLog" -#: ../src/interface.c:571 ../src/interface.c:2180 +#: ../src/interface.c:565 +#: ../src/interface.c:2139 msgid "Insert File Header" -msgstr "" +msgstr "Infoga filhuvud" -#: ../src/interface.c:574 ../src/interface.c:2183 +#: ../src/interface.c:568 +#: ../src/interface.c:2142 msgid "Inserts a file header at the beginning of the file" -msgstr "" +msgstr "Infoga filhuvud i början av filen" -#: ../src/interface.c:576 ../src/interface.c:2185 +#: ../src/interface.c:570 +#: ../src/interface.c:2144 msgid "Insert Function Description" -msgstr "" +msgstr "Infoga funktionsbeskrivning" -#: ../src/interface.c:579 ../src/interface.c:2188 +#: ../src/interface.c:573 +#: ../src/interface.c:2147 msgid "Inserts a description before the current function" -msgstr "" +msgstr "Infoga en beskrivning innan funktionen" -#: ../src/interface.c:581 ../src/interface.c:2190 +#: ../src/interface.c:575 +#: ../src/interface.c:2149 msgid "Insert Multiline Comment" -msgstr "" +msgstr "Infoga flerradskommentar" -#: ../src/interface.c:584 ../src/interface.c:2193 +#: ../src/interface.c:578 +#: ../src/interface.c:2152 msgid "Inserts a multiline comment" -msgstr "" +msgstr "Infoga multipla kommentarer" -#: ../src/interface.c:586 ../src/interface.c:2195 +#: ../src/interface.c:580 +#: ../src/interface.c:2154 msgid "Insert GPL Notice" -msgstr "" +msgstr "Infoga en GPL-beskrivning" -#: ../src/interface.c:589 ../src/interface.c:2198 +#: ../src/interface.c:583 +#: ../src/interface.c:2157 msgid "Inserts a GPL notice (should be done at the beginning of the file)" -msgstr "" +msgstr "Infoga en GPL-beskrivning (bör göras i början av filen)" -#: ../src/interface.c:591 ../src/interface.c:2200 +#: ../src/interface.c:585 +#: ../src/interface.c:2159 msgid "Insert BSD License Notice" -msgstr "" +msgstr "Infoga en BSD-beskrivning" -#: ../src/interface.c:594 ../src/interface.c:2203 -msgid "" -"Inserts a BSD licence notice (should be done at the beginning of the file)" -msgstr "" +#: ../src/interface.c:588 +#: ../src/interface.c:2162 +msgid "Inserts a BSD licence notice (should be done at the beginning of the file)" +msgstr "Infoga en BSD-beskrivning (bör göras i början av filen)" -#: ../src/interface.c:596 ../src/interface.c:2205 +#: ../src/interface.c:590 +#: ../src/interface.c:2164 msgid "Insert Dat_e" -msgstr "" +msgstr "Infoga datum" -#: ../src/interface.c:610 +#: ../src/interface.c:604 msgid "_Insert \"include <...>\"" -msgstr "" +msgstr "Infoga \"include <...>\"" -#: ../src/interface.c:633 +#: ../src/interface.c:627 msgid "_Search" msgstr "Sök" -#: ../src/interface.c:644 +#: ../src/interface.c:638 msgid "Find _Next" msgstr "Sök nästa" -#: ../src/interface.c:648 +#: ../src/interface.c:642 msgid "Find _Previous" msgstr "Sök föregående" -#: ../src/interface.c:652 +#: ../src/interface.c:646 msgid "Find in F_iles" msgstr "Sök i filer" -#: ../src/interface.c:656 ../src/search.c:427 +#: ../src/interface.c:650 +#: ../src/search.c:427 msgid "_Replace" msgstr "Byt ut" -#: ../src/interface.c:669 +#: ../src/interface.c:663 msgid "Find _Selected" msgstr "Sök markerad" -#: ../src/interface.c:673 +#: ../src/interface.c:667 msgid "Find Pre_v Selected" msgstr "Sök föregående markerad" -#: ../src/interface.c:682 +#: ../src/interface.c:676 msgid "Next _Message" msgstr "Nästa meddelande" -#: ../src/interface.c:691 +#: ../src/interface.c:685 msgid "_Go to Line" msgstr "Gå till rad" -#: ../src/interface.c:706 +#: ../src/interface.c:700 msgid "Change _Font" msgstr "Byt teckensnitt" -#: ../src/interface.c:709 +#: ../src/interface.c:703 msgid "Change the default font" msgstr "Byt förvalt teckensnitt" -#: ../src/interface.c:720 +#: ../src/interface.c:714 msgid "Toggle All Additional Widgets" -msgstr "" +msgstr "Justera alla ytterligare gränssnittskomponenter" -#: ../src/interface.c:724 +#: ../src/interface.c:718 msgid "Full_screen" msgstr "Helskärm" -#: ../src/interface.c:728 +#: ../src/interface.c:722 msgid "Show Message _Window" -msgstr "" +msgstr "Visa meddelandefönster" -#: ../src/interface.c:731 +#: ../src/interface.c:725 msgid "Toggle the window with status and compiler messages on and off" -msgstr "" +msgstr "Visa status- och kompilatormeddelanden i fönster" -#: ../src/interface.c:734 +#: ../src/interface.c:728 msgid "Show _Toolbar" -msgstr "" +msgstr "Visa verktygsfält" -#: ../src/interface.c:737 +#: ../src/interface.c:731 msgid "Toggle the toolbar on and off" -msgstr "" +msgstr "Stäng av / på verktygsfältet" -#: ../src/interface.c:740 +#: ../src/interface.c:734 msgid "Show Side_bar" -msgstr "" +msgstr "Visa sidofält" -#: ../src/interface.c:745 +#: ../src/interface.c:739 msgid "Show _Markers Margin" -msgstr "" +msgstr "Visa marginalmarkörer" -#: ../src/interface.c:748 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines." -msgstr "" +#: ../src/interface.c:742 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." +msgstr "Visar eller gömmer den lilla marginalen till höger om radnummren som används för att markera rader." -#: ../src/interface.c:751 +#: ../src/interface.c:745 msgid "Show _Line Numbers" msgstr "Visa radnummer" -#: ../src/interface.c:754 +#: ../src/interface.c:748 msgid "Shows or hides the Line Number margin." -msgstr "" +msgstr "Visar eller gömmer radnummer-marginalen" -#: ../src/interface.c:774 +#: ../src/interface.c:768 msgid "_Document" -msgstr "" +msgstr "Dokument" -#: ../src/interface.c:781 +#: ../src/interface.c:775 msgid "_Line Wrapping" -msgstr "" +msgstr "Radbrytning" -#: ../src/interface.c:784 ../src/interface.c:3584 -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 "" +#: ../src/interface.c:778 +#: ../src/interface.c:3517 +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 "Radbryt rader vid fönsterkant och fortsätt på nästa rad. Observera att radbrytning tar mycket systemresurser vid redigering av stora dokument, och bör därför vara avslagen på långsamma datorer." -#: ../src/interface.c:787 -msgid "_Auto-indentation" -msgstr "" +#: ../src/interface.c:781 +msgid "_Use Auto-indentation" +msgstr "Använd automatiskt indrag" -#: ../src/interface.c:792 -msgid "In_dent Type" -msgstr "" - -#: ../src/interface.c:815 +#: ../src/interface.c:786 msgid "Read _Only" -msgstr "" +msgstr "Skrivskyddad" -#: ../src/interface.c:818 +#: ../src/interface.c:789 msgid "Treat this file as read-only. No changes can be made." -msgstr "" +msgstr "Behandla denna fil som skrivskyddad. Inga ändringar kan sparas." -#: ../src/interface.c:820 +#: ../src/interface.c:791 msgid "_Write Unicode BOM" -msgstr "" +msgstr "Skriv Unicode BOM (bör användas för vanliga textfiler, men inte för skriptfiler)" -#: ../src/interface.c:829 +#: ../src/interface.c:800 msgid "Set File_type" msgstr "Ange filtyp" -#: ../src/interface.c:839 +#: ../src/interface.c:810 msgid "Set _Encoding" msgstr "Ange kodning" -#: ../src/interface.c:849 +#: ../src/interface.c:820 msgid "Set Line E_ndings" msgstr "Ange radslut" -#: ../src/interface.c:856 +#: ../src/interface.c:827 msgid "Convert and Set to _CR/LF (Win)" msgstr "Konvertera till CR/LF (Win)" -#: ../src/interface.c:861 +#: ../src/interface.c:833 msgid "Convert and Set to _LF (Unix)" msgstr "Konvertera till LF (Unix)" -#: ../src/interface.c:866 +#: ../src/interface.c:839 msgid "Convert and Set to CR (_Mac)" msgstr "Konvertera till CR (Mac)" -#: ../src/interface.c:877 +#: ../src/interface.c:850 msgid "_Replace Tabs by Spaces" -msgstr "" +msgstr "Ersätt tab med mellanslag" -#: ../src/interface.c:880 ../src/interface.c:3789 +#: ../src/interface.c:853 +#: ../src/interface.c:3716 msgid "Replaces all tabs in document by spaces." -msgstr "" +msgstr "Ersätter alla tab-tecken i dokumentet med mellanslag (indraget blir lika stort)." -#: ../src/interface.c:887 +#: ../src/interface.c:860 msgid "_Fold All" -msgstr "" +msgstr "Vik ihop alla" -#: ../src/interface.c:890 +#: ../src/interface.c:863 msgid "Folds all contractible code blocks" -msgstr "" +msgstr "Viker ihop alla kodblock som hör ihop" -#: ../src/interface.c:892 +#: ../src/interface.c:865 msgid "_Unfold All" -msgstr "" +msgstr "Vik upp alla" -#: ../src/interface.c:895 +#: ../src/interface.c:868 msgid "Unfolds all contracted code blocks" -msgstr "" +msgstr "Viker upp alla kodblock som hör ihop" -#: ../src/interface.c:902 +#: ../src/interface.c:875 msgid "Remove _Markers" -msgstr "" +msgstr "Ta bort markeringar" -#: ../src/interface.c:906 +#: ../src/interface.c:879 msgid "Remove Error _Indicators" -msgstr "" +msgstr "Ta bort felindikatorer" -#: ../src/interface.c:909 +#: ../src/interface.c:882 msgid "Removes all error indicators in the current document." -msgstr "" +msgstr "Ta bort alla felindikatorer i hela dokumentet" -#: ../src/interface.c:911 +#: ../src/interface.c:884 msgid "_Project" msgstr "Projekt" -#: ../src/interface.c:918 +#: ../src/interface.c:891 msgid "_New" msgstr "Ny" -#: ../src/interface.c:926 +#: ../src/interface.c:899 msgid "_Open" msgstr "Öppna" -#: ../src/interface.c:934 +#: ../src/interface.c:907 msgid "_Close" msgstr "Stäng" -#: ../src/interface.c:955 +#: ../src/interface.c:928 msgid "_Tools" msgstr "Verktyg" -#: ../src/interface.c:962 +#: ../src/interface.c:935 msgid "_Color Chooser" msgstr "Färgväljare" -#: ../src/interface.c:965 ../src/interface.c:1106 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette." -msgstr "" +#: ../src/interface.c:938 +#: ../src/interface.c:1079 +msgid "Open a color chooser dialog, to interactively pick colors from a palette." +msgstr "Öppnar färgväljaren, så du kan välja färger från en palett" -#: ../src/interface.c:971 +#: ../src/interface.c:944 msgid "_Word Count" msgstr "Räkna ord" -#: ../src/interface.c:974 -msgid "" -"Counts the words and characters in the current selection or the whole " -"document" -msgstr "" +#: ../src/interface.c:947 +msgid "Counts the words and characters in the current selection or the whole document" +msgstr "Räknar ord och tecken i markering eller hela dokumentet" -#: ../src/interface.c:976 ../src/interface.c:983 +#: ../src/interface.c:949 +#: ../src/interface.c:956 msgid "_Help" msgstr "Hjälp" -#: ../src/interface.c:991 +#: ../src/interface.c:964 msgid "_Keyboard Shortcuts" -msgstr "" +msgstr "Tangentbordsgenvägar" -#: ../src/interface.c:994 +#: ../src/interface.c:967 msgid "Shows a list of all keyboard shortcuts for Geany." -msgstr "" +msgstr "Visar en lista med alla tangentbordsgenvägar för Geany." -#: ../src/interface.c:996 +#: ../src/interface.c:969 msgid "_Website" msgstr "Webbsite" -#: ../src/interface.c:1019 +#: ../src/interface.c:992 msgid "Create a new file" msgstr "Skapa ny fil" -#: ../src/interface.c:1025 +#: ../src/interface.c:998 msgid "Open an existing file" msgstr "Öppna existerande fil" -#: ../src/interface.c:1030 +#: ../src/interface.c:1003 msgid "Save the current file" msgstr "Spara fil" -#: ../src/interface.c:1032 ../src/keybindings.c:122 +#: ../src/interface.c:1005 +#: ../src/keybindings.c:123 msgid "Save all" msgstr "Spara allt" -#: ../src/interface.c:1035 +#: ../src/interface.c:1008 msgid "Save all open files" msgstr "Spara alla öppna filer" -#: ../src/interface.c:1044 +#: ../src/interface.c:1017 msgid "Reload the current file from disk" msgstr "Ladda om filen från disk" -#: ../src/interface.c:1049 +#: ../src/interface.c:1022 msgid "Close the current file" msgstr "Stäng fil" -#: ../src/interface.c:1058 +#: ../src/interface.c:1031 msgid "Undo the last modification" msgstr "Ångra senaste ändring" -#: ../src/interface.c:1063 +#: ../src/interface.c:1036 msgid "Redo the last modification" msgstr "Gör om senaste ändring" -#: ../src/interface.c:1073 ../src/keybindings.c:234 +#: ../src/interface.c:1046 +#: ../src/keybindings.c:235 msgid "Navigate back a location" -msgstr "" +msgstr "Bläddra bakåt" -#: ../src/interface.c:1079 ../src/keybindings.c:236 +#: ../src/interface.c:1052 +#: ../src/keybindings.c:237 msgid "Navigate forward a location" -msgstr "" +msgstr "Bläddra frammåt" -#: ../src/interface.c:1087 ../src/keybindings.c:193 +#: ../src/interface.c:1060 +#: ../src/keybindings.c:194 msgid "Compile" msgstr "Kompilera" -#: ../src/interface.c:1090 +#: ../src/interface.c:1063 msgid "Compile the current file" msgstr "Kompilera aktuell fil" -#: ../src/interface.c:1103 +#: ../src/interface.c:1076 msgid "Color" msgstr "Färg" -#: ../src/interface.c:1115 +#: ../src/interface.c:1088 msgid "Zoom in the text" msgstr "Förstora texten" -#: ../src/interface.c:1120 +#: ../src/interface.c:1093 msgid "Zoom out the text" msgstr "Förminska texten" -#: ../src/interface.c:1133 ../src/interface.c:1138 +#: ../src/interface.c:1106 +#: ../src/interface.c:1111 msgid "Find the entered text in the current file" msgstr "Sök angiven text i aktuell fil" -#: ../src/interface.c:1151 +#: ../src/interface.c:1124 msgid "Enter a line number and jump to it." msgstr "Skriv in ett radnummer och hoppa till den." -#: ../src/interface.c:1158 +#: ../src/interface.c:1131 msgid "Jump to the entered line number." msgstr "Hoppa till inskrivet radnummer." -#: ../src/interface.c:1201 ../src/treeviews.c:97 +#: ../src/interface.c:1174 +#: ../src/treeviews.c:97 msgid "Symbols" msgstr "Symboler" -#: ../src/interface.c:1214 ../src/treeviews.c:244 +#: ../src/interface.c:1187 +#: ../src/treeviews.c:211 msgid "Open files" msgstr "Öppna filer" -#: ../src/interface.c:1249 +#: ../src/interface.c:1222 msgid "Status" msgstr "Status" -#: ../src/interface.c:1263 +#: ../src/interface.c:1236 msgid "Compiler" msgstr "Kompilator" -#: ../src/interface.c:1277 +#: ../src/interface.c:1250 msgid "Messages" msgstr "Meddelanden" -#: ../src/interface.c:1290 +#: ../src/interface.c:1263 msgid "Scribble" msgstr "Scribble" -#: ../src/interface.c:1890 ../src/interface.c:3286 +#: ../src/interface.c:1849 +#: ../src/interface.c:3236 msgid "Images and text" msgstr "Bilder och text" -#: ../src/interface.c:1896 ../src/interface.c:3318 +#: ../src/interface.c:1855 +#: ../src/interface.c:3268 msgid "Images only" msgstr "Endast bilder" -#: ../src/interface.c:1902 ../src/interface.c:3310 +#: ../src/interface.c:1861 +#: ../src/interface.c:3260 msgid "Text only" msgstr "Endast text" -#: ../src/interface.c:1913 ../src/interface.c:3302 +#: ../src/interface.c:1872 +#: ../src/interface.c:3252 msgid "Large icons" msgstr "Stora ikoner" -#: ../src/interface.c:1918 ../src/interface.c:3294 +#: ../src/interface.c:1877 +#: ../src/interface.c:3244 msgid "Small icons" msgstr "Små ikoner" -#: ../src/interface.c:1928 +#: ../src/interface.c:1887 msgid "Hide toolbar" msgstr "Göm verktygsfält" -#: ../src/interface.c:2164 +#: ../src/interface.c:2123 msgid "Insert Comments" msgstr "Infoga kommentarer" -#: ../src/interface.c:2219 +#: ../src/interface.c:2178 msgid "Insert \"include <...>\"" msgstr "Infoga \"include <...>\"" -#: ../src/interface.c:2238 ../src/keybindings.c:313 +#: ../src/interface.c:2197 +#: ../src/keybindings.c:314 msgid "Find Usage" -msgstr "" +msgstr "Visa användning" -#: ../src/interface.c:2246 ../src/keybindings.c:315 +#: ../src/interface.c:2205 +#: ../src/keybindings.c:316 msgid "Go to Tag Definition" -msgstr "Gå till Tag-definition" +msgstr "Gå till Tagg-definition" -#: ../src/interface.c:2250 ../src/keybindings.c:317 +#: ../src/interface.c:2209 +#: ../src/keybindings.c:318 msgid "Go to Tag Declaration" -msgstr "Gå till Tag-deklaration" +msgstr "Gå till Tagg-deklaration" -#: ../src/interface.c:2254 ../src/keybindings.c:319 +#: ../src/interface.c:2213 +#: ../src/keybindings.c:320 msgid "Context Action" -msgstr "" +msgstr "Snabbmenyhändelse" -#: ../src/interface.c:2266 +#: ../src/interface.c:2225 msgid "Go to the entered line" -msgstr "" +msgstr "Gå till rad" -#: ../src/interface.c:2697 ../src/keybindings.c:143 +#: ../src/interface.c:2652 +#: ../src/keybindings.c:144 msgid "Preferences" msgstr "Inställningar" -#: ../src/interface.c:2730 +#: ../src/interface.c:2685 msgid "Load files from the last session" -msgstr "" +msgstr "Ladda filerna från förra sessionen" -#: ../src/interface.c:2734 +#: ../src/interface.c:2689 msgid "Opens at startup the files from the last session" -msgstr "" +msgstr "Öppnar filerna från förra sessionen vid start" -#: ../src/interface.c:2737 +#: ../src/interface.c:2692 msgid "Load virtual terminal support" -msgstr "" +msgstr "Ladda stöd för virtuell terminal" -#: ../src/interface.c:2739 -msgid "" -"Whether the virtual terminal emulation (VTE) should be loaded at startup. " -"Disable it if you do not need it." -msgstr "" +#: ../src/interface.c:2694 +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup. Disable it if you do not need it." +msgstr "Huruvida den virtuella terminalemuleringen (VTE) skall laddas vid start. Välj bort om du ej behöver det." -#: ../src/interface.c:2742 +#: ../src/interface.c:2697 msgid "Enable plugin support" -msgstr "" +msgstr "Aktivera stöd för insticksmoduler" -#: ../src/interface.c:2746 +#: ../src/interface.c:2701 msgid "Save window position and geometry" -msgstr "" +msgstr "Spara fönsterplacering och storlek" -#: ../src/interface.c:2750 +#: ../src/interface.c:2705 msgid "Saves the window position and geometry and restores it at the start" -msgstr "" +msgstr "Sparar fönstrets position och storlek, och återställer det vid start" -#: ../src/interface.c:2753 +#: ../src/interface.c:2708 msgid "Confirm exit" -msgstr "" +msgstr "Bekräfta avslut" -#: ../src/interface.c:2757 +#: ../src/interface.c:2712 msgid "Shows a confirmation dialog on exit." -msgstr "" +msgstr "Begär bekräftelse vid avslut." -#: ../src/interface.c:2760 +#: ../src/interface.c:2715 msgid "Startup and shutdown" msgstr "Starta och avsluta" -#: ../src/interface.c:2779 +#: ../src/interface.c:2734 msgid "Beep on errors or when compilation has finished" -msgstr "" +msgstr "Piper vid fel och när kompilering har avslutats" -#: ../src/interface.c:2782 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished." -msgstr "" +#: ../src/interface.c:2737 +msgid "Whether to beep if an error occurred or when the compilation process has finished." +msgstr "Om datorn skall avge en ljudsignal när när ett fel hittas eller när kompileringen har avslutats." -#: ../src/interface.c:2785 +#: ../src/interface.c:2740 msgid "Switch to status message list at new message" -msgstr "" +msgstr "Byt till statusmeddelandelistan när ett nytt meddelande visas" -#: ../src/interface.c:2788 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives." -msgstr "" +#: ../src/interface.c:2743 +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." +msgstr "Huruvida Geany skall byta till statusmeddelandefönstret (vid botten) om ett nytt statusmeddelande kommer." -#: ../src/interface.c:2791 +#: ../src/interface.c:2746 msgid "Suppress status messages in the status bar" -msgstr "" +msgstr "Undertryck statusmeddelanden i statusfältet" -#: ../src/interface.c:2794 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" +#: ../src/interface.c:2749 +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Tar bort alla meddelanden från statusfältet. Meddelanden visas fortförande i fönstret för statusmeddelanden." -#: ../src/interface.c:2797 +#: ../src/interface.c:2752 msgid "Auto focus widgets (focus follows mouse)" -msgstr "" +msgstr "Autofokusera gränssnittskomponenter (fokus följer musen)" -#: ../src/interface.c:2800 -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 " -"fields and the VTE." -msgstr "" +#: ../src/interface.c:2755 +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 fields and the VTE." +msgstr "Ger automatiskt fokus till gränssnittskomponenter under muspekaren." -#: ../src/interface.c:2803 +#: ../src/interface.c:2758 msgid "Always wrap search and hide the Find dialog" -msgstr "" +msgstr "Börja alltid om sökning från början och göm Sök-dialogrutan" -#: ../src/interface.c:2807 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" +#: ../src/interface.c:2762 +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Börja alltid om sökningen från början och göm Sök-dialogrutan efter du klickat på Sök Nästa/Föregående" -#: ../src/interface.c:2810 ../src/interface.c:3140 ../src/interface.c:3831 +#: ../src/interface.c:2765 +#: ../src/interface.c:3090 +#: ../src/interface.c:3758 msgid "Miscellaneous" msgstr "Övrigt" -#: ../src/interface.c:2831 +#: ../src/interface.c:2786 msgid "Startup path:" -msgstr "" +msgstr "Sökväg vid start:" -#: ../src/interface.c:2843 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" +#: ../src/interface.c:2798 +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Sökväg att starta i vid öppning eller sparning av filer. Detta måste vara en absolut sökväg. Lämna blankt för att automatiskt välja filens nuvarande sökväg." -#: ../src/interface.c:2856 +#: ../src/interface.c:2811 msgid "Project files:" msgstr "Projektfiler:" -#: ../src/interface.c:2868 +#: ../src/interface.c:2823 msgid "Path to start in when opening project files" -msgstr "" +msgstr "Sökväg att starta i när projektfiler öppnas" -#: ../src/interface.c:2881 +#: ../src/interface.c:2836 msgid "Paths" msgstr "Sökvägar" -#: ../src/interface.c:2886 +#: ../src/interface.c:2841 msgid "General" -msgstr "" +msgstr "Generellt" -#: ../src/interface.c:2908 +#: ../src/interface.c:2863 msgid "Show symbol list" -msgstr "" +msgstr "Visa symbollista" -#: ../src/interface.c:2911 +#: ../src/interface.c:2866 msgid "Toggle the symbol list on and off" -msgstr "" +msgstr "Stäng av / på symbollistan" -#: ../src/interface.c:2914 +#: ../src/interface.c:2869 msgid "Show open files list" -msgstr "" +msgstr "Visa listan för öppna filer" -#: ../src/interface.c:2917 +#: ../src/interface.c:2872 msgid "Toggle the open files list on and off" -msgstr "" +msgstr "Stäng av / på listan med öppna filer" -#: ../src/interface.c:2920 -msgid "Show full path name in open files list" -msgstr "" - -#: ../src/interface.c:2925 +#: ../src/interface.c:2875 msgid "Sidebar" msgstr "Sidofält" -#: ../src/interface.c:2946 +#: ../src/interface.c:2896 msgid "Symbol list:" -msgstr "" +msgstr "Symbollista:" -#: ../src/interface.c:2953 ../src/interface.c:3065 +#: ../src/interface.c:2903 +#: ../src/interface.c:3015 msgid "Message window:" -msgstr "" +msgstr "Meddelandefönster:" -#: ../src/interface.c:2960 ../src/interface.c:3099 +#: ../src/interface.c:2910 +#: ../src/interface.c:3049 msgid "Editor:" -msgstr "" +msgstr "Editor:" -#: ../src/interface.c:2972 +#: ../src/interface.c:2922 msgid "Sets the font for the message window" -msgstr "" +msgstr "Justerar teckensnittet för meddelandefönstret" -#: ../src/interface.c:2980 +#: ../src/interface.c:2930 msgid "Sets the font for the symbol list" -msgstr "" +msgstr "Justerar teckensnittet för symbollistan" -#: ../src/interface.c:2988 +#: ../src/interface.c:2938 msgid "Sets the editor font" -msgstr "Anger textredigerarens teckensnitt" +msgstr "Anger texteditorns teckensnitt" -#: ../src/interface.c:2990 +#: ../src/interface.c:2940 msgid "Fonts" msgstr "Teckensnitt" -#: ../src/interface.c:3009 +#: ../src/interface.c:2959 msgid "Show editor tabs" -msgstr "" +msgstr "Visa editorns flikar" -#: ../src/interface.c:3013 +#: ../src/interface.c:2963 msgid "Show close buttons" -msgstr "" +msgstr "Visa knappar för stängning" -#: ../src/interface.c:3017 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)." -msgstr "" +#: ../src/interface.c:2967 +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)." +msgstr "Visar ett litet kors i filflikarna, som kan användas att enkelt stänga filer om du klickar på det (kräver att du startar om Geany)." -#: ../src/interface.c:3024 +#: ../src/interface.c:2974 msgid "Placement of new file tabs:" -msgstr "" +msgstr "Placering av nya filflikar:" -#: ../src/interface.c:3029 ../src/interface.c:3077 ../src/interface.c:3094 -#: ../src/interface.c:3111 +#: ../src/interface.c:2979 +#: ../src/interface.c:3027 +#: ../src/interface.c:3044 +#: ../src/interface.c:3061 msgid "Left" msgstr "Vänster" -#: ../src/interface.c:3032 +#: ../src/interface.c:2982 msgid "File tabs will be placed on the left of the notebook" msgstr "" -#: ../src/interface.c:3037 ../src/interface.c:3078 ../src/interface.c:3095 -#: ../src/interface.c:3112 +#: ../src/interface.c:2987 +#: ../src/interface.c:3028 +#: ../src/interface.c:3045 +#: ../src/interface.c:3062 msgid "Right" msgstr "Höger" -#: ../src/interface.c:3040 +#: ../src/interface.c:2990 msgid "File tabs will be placed on the right of the notebook" msgstr "" -#: ../src/interface.c:3044 +#: ../src/interface.c:2994 msgid "Editor tabs" -msgstr "" +msgstr "Editorns flikar" -#: ../src/interface.c:3079 ../src/interface.c:3096 ../src/interface.c:3113 +#: ../src/interface.c:3029 +#: ../src/interface.c:3046 +#: ../src/interface.c:3063 msgid "Top" msgstr "Topp" -#: ../src/interface.c:3080 ../src/interface.c:3097 ../src/interface.c:3114 +#: ../src/interface.c:3030 +#: ../src/interface.c:3047 +#: ../src/interface.c:3064 msgid "Bottom" msgstr "Botten" -#: ../src/interface.c:3082 +#: ../src/interface.c:3032 msgid "Sidebar:" msgstr "Sidofält:" -#: ../src/interface.c:3116 +#: ../src/interface.c:3066 msgid "Tab positions" msgstr "Tab positioner" -#: ../src/interface.c:3135 +#: ../src/interface.c:3085 msgid "Show status bar" msgstr "Visa statusfält" -#: ../src/interface.c:3138 +#: ../src/interface.c:3088 msgid "Whether to show the status bar at the bottom of the main window." -msgstr "" +msgstr "Huruvida statusfältet skall visas längst ner i huvudfönstret." -#: ../src/interface.c:3145 +#: ../src/interface.c:3095 msgid "Interface" msgstr "Gränssnitt" -#: ../src/interface.c:3163 +#: ../src/interface.c:3113 msgid "Show Toolbar" msgstr "Visa verktygsfält" -#: ../src/interface.c:3169 +#: ../src/interface.c:3119 msgid "Toolbar" msgstr "Verktygsfält" -#: ../src/interface.c:3188 +#: ../src/interface.c:3138 msgid "Show file operation buttons" -msgstr "" +msgstr "Visa filhanteringsknappar" -#: ../src/interface.c:3192 +#: ../src/interface.c:3142 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -msgstr "" +msgstr "Visa Ny, Öppna, Stäng, Spara och Ladda Om-knapparna i verktygsfältet" -#: ../src/interface.c:3195 +#: ../src/interface.c:3145 msgid "Show Redo and Undo buttons" -msgstr "" +msgstr "Visa Gör Om- och Ångra-knapparna" -#: ../src/interface.c:3199 +#: ../src/interface.c:3149 msgid "Display the Redo and Undo buttons in the toolbar" -msgstr "" +msgstr "Visa Gör Om- och Ångra-knapparna i verktygsfältet" -#: ../src/interface.c:3202 +#: ../src/interface.c:3152 msgid "Show Back and Forward buttons" -msgstr "" +msgstr "Visa bakåt- och framåtknappar" -#: ../src/interface.c:3206 -msgid "" -"Display the Back and Forward buttons in the toolbar used for code navigation" -msgstr "" +#: ../src/interface.c:3156 +msgid "Display the Back and Forward buttons in the toolbar used for code navigation" +msgstr "Visa bakåt- och framåtknapparna i verktygsfältet som används för kodnavigering" -#: ../src/interface.c:3209 +#: ../src/interface.c:3159 msgid "Show Compile and Run buttons" -msgstr "" +msgstr "Visa Kompilera och Kör-knappar" -#: ../src/interface.c:3213 +#: ../src/interface.c:3163 msgid "Display the Compile and Run buttons in the toolbar" -msgstr "" +msgstr "Visa kompilera- och körknapparna i verktygsfältet" -#: ../src/interface.c:3216 +#: ../src/interface.c:3166 msgid "Show Color Chooser button" -msgstr "" +msgstr "Visa knapp för färgväljaren" -#: ../src/interface.c:3220 +#: ../src/interface.c:3170 msgid "Display the Color Chooser button in the toolbar" -msgstr "" +msgstr "Visa knappen för färgväljaren i verktygsfältet" -#: ../src/interface.c:3223 +#: ../src/interface.c:3173 msgid "Show Zoom In and Zoom Out buttons" -msgstr "" +msgstr "Visa förstoring- och förminskningsknappar" -#: ../src/interface.c:3227 +#: ../src/interface.c:3177 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" -msgstr "" +msgstr "Visa förstoringsknapparna i verktygsfältet" -#: ../src/interface.c:3230 +#: ../src/interface.c:3180 msgid "Show Search field" -msgstr "" +msgstr "Visa sökfältet" -#: ../src/interface.c:3234 +#: ../src/interface.c:3184 msgid "Display the search field and button in the toolbar" -msgstr "" +msgstr "Visa sökfält och sökknapp i verktygsfältet" -#: ../src/interface.c:3237 +#: ../src/interface.c:3187 msgid "Show Go to Line field" -msgstr "" +msgstr "Visa Gå Till Rad fältet" -#: ../src/interface.c:3241 +#: ../src/interface.c:3191 msgid "Display the line number field and button in the toolbar" -msgstr "" +msgstr "Visa radnummer och knapp i verktygsfältet" -#: ../src/interface.c:3244 +#: ../src/interface.c:3194 msgid "Show Quit button" msgstr "Visa Avsluta-knappen" -#: ../src/interface.c:3248 +#: ../src/interface.c:3198 msgid "Display the quit button in the toolbar" msgstr "Visa Avsluta-knappen i verktygsfältet" -#: ../src/interface.c:3251 +#: ../src/interface.c:3201 msgid "Items" -msgstr "" +msgstr "Artiklar" -#: ../src/interface.c:3272 +#: ../src/interface.c:3222 msgid "Icon style:" msgstr "Ikonstil" -#: ../src/interface.c:3279 +#: ../src/interface.c:3229 msgid "Icon size:" msgstr "Ikonstorlek" -#: ../src/interface.c:3326 +#: ../src/interface.c:3276 msgid "Appearance" -msgstr "" +msgstr "Utseende" -#: ../src/interface.c:3331 +#: ../src/interface.c:3281 msgid "Toolbar" msgstr "Verktygsfält" -#: ../src/interface.c:3353 +#: ../src/interface.c:3303 msgid "Invert syntax highlighting colors" msgstr "Invertera syntaxfärgningen" -#: ../src/interface.c:3355 +#: ../src/interface.c:3305 msgid "Use white text on a black background." msgstr "Använd vit text på svart bakgrund" -#: ../src/interface.c:3357 +#: ../src/interface.c:3307 msgid "Show indentation guides" -msgstr "" +msgstr "Visa indragsmarkörer" -#: ../src/interface.c:3360 +#: ../src/interface.c:3310 msgid "Shows small dotted lines to help you to use the right indentation." -msgstr "" +msgstr "Visar små prickade linjer för att hjälpa dig se rätt indrag." -#: ../src/interface.c:3363 +#: ../src/interface.c:3313 msgid "Show white space" -msgstr "" +msgstr "Visa tomrum" -#: ../src/interface.c:3366 +#: ../src/interface.c:3316 msgid "Marks spaces with dots and tabs with arrows." -msgstr "" +msgstr "Markera mellanslag med prickar och tabbar med pilar." -#: ../src/interface.c:3369 +#: ../src/interface.c:3319 msgid "Show line endings" msgstr "Visa radslut" -#: ../src/interface.c:3372 +#: ../src/interface.c:3322 msgid "Show the line ending character" -msgstr "" +msgstr "Visa radslutstecknet" -#: ../src/interface.c:3375 +#: ../src/interface.c:3325 msgid "Display" msgstr "Visa" -#: ../src/interface.c:3396 +#: ../src/interface.c:3346 msgid "Long line marker:" msgstr "Markör för lång rad" -#: ../src/interface.c:3403 +#: ../src/interface.c:3353 msgid "Long line marker color:" msgstr "Färg på markören för lång rad" -#: ../src/interface.c:3410 ../src/interface.c:3548 +#: ../src/interface.c:3360 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3422 +#: ../src/interface.c:3372 msgid "Sets the color of the long line marker" msgstr "Väljer färgen på markören för långa rader" -#: ../src/interface.c:3423 ../src/tools.c:652 ../src/vte.c:602 -#: ../src/vte.c:609 +#: ../src/interface.c:3373 +#: ../src/tools.c:652 +#: ../src/vte.c:599 +#: ../src/vte.c:606 msgid "Color Chooser" msgstr "Färgväljare" -#: ../src/interface.c:3431 -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 " -"greater than 0 to specify the column where it should appear." -msgstr "" +#: ../src/interface.c:3381 +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 greater than 0 to specify the column where it should appear." +msgstr "Markören för långa rader är en tunn vertikal linje som visas i editorn. Den hjälper till att visa var det är läge att bryta rader. Värdert anger i vilken kolumn markören visas." -#: ../src/interface.c:3441 +#: ../src/interface.c:3391 msgid "Line" msgstr "Rad" -#: ../src/interface.c:3444 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)." -msgstr "" +#: ../src/interface.c:3394 +msgid "Prints a vertical line in the editor window at the given cursor position (see below)." +msgstr "Visar en vertikal linje i editor-fönstret vid en given position (se nedan)." -#: ../src/interface.c:3448 +#: ../src/interface.c:3398 msgid "Background" msgstr "Bakgrund" -#: ../src/interface.c:3451 -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 " -"proportional fonts)" -msgstr "" +#: ../src/interface.c:3401 +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 proportional fonts)" +msgstr "Bakgrundsfärgen ändras vid en given kolumn för att indikera var radbrytning bör ske. Detta är lämpligt for proportionella teckensnitt." -#: ../src/interface.c:3455 +#: ../src/interface.c:3405 msgid "Disabled" -msgstr "" +msgstr "Avaktiverad" -#: ../src/interface.c:3461 +#: ../src/interface.c:3411 msgid "Long line marker" msgstr "Markör för lång rad" -#: ../src/interface.c:3466 +#: ../src/interface.c:3416 msgid "Display" msgstr "Visa" -#: ../src/interface.c:3494 -msgid "Auto-indent mode:" -msgstr "" +#: ../src/interface.c:3442 +msgid "Tabs" +msgstr "Tabulatorer" -#: ../src/interface.c:3506 -msgid "Basic" -msgstr "" +#: ../src/interface.c:3445 +msgid "Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces." +msgstr "När tomrumstecken infogas av Geany kommer tab-tecken att användas, om tillvalet är påslaget, annars används mellanslag att användas. " -#: ../src/interface.c:3507 -msgid "Current chars" -msgstr "Nuvarande täcken" +#: ../src/interface.c:3449 +msgid "Spaces" +msgstr "Mellanslag" -#: ../src/interface.c:3508 -msgid "Match braces" -msgstr "" +#: ../src/interface.c:3461 +msgid "Tab Width:" +msgstr "Tab-bredd:" -#: ../src/interface.c:3516 +#: ../src/interface.c:3468 +msgid "Auto indentation mode:" +msgstr "Automatiskt indrag:" + +#: ../src/interface.c:3480 msgid "The width in chars, which one tab character will take" -msgstr "" +msgstr "Bredd (antal mellanslag) på ett tab-tecken" -#: ../src/interface.c:3521 -msgid "Tab width:" -msgstr "" +#: ../src/interface.c:3491 +msgid "Basic" +msgstr "Grundläggande" -#: ../src/interface.c:3537 ../src/interface.c:3544 -msgid "Whether to use tabs or spaces when indentation is inserted." -msgstr "" +#: ../src/interface.c:3492 +msgid "Current chars" +msgstr "Nuvarande täcken" -#: ../src/interface.c:3560 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened." +#: ../src/interface.c:3493 +msgid "Match braces" msgstr "" -#: ../src/interface.c:3562 +#: ../src/interface.c:3495 msgid "Indentation" -msgstr "" +msgstr "Indrag" -#: ../src/interface.c:3581 +#: ../src/interface.c:3514 msgid "Line wrapping" msgstr "Radbrytning" -#: ../src/interface.c:3586 +#: ../src/interface.c:3519 msgid "Enable \"smart\" home key" -msgstr "" +msgstr "Aktivera \"smart\" home-tangent" -#: ../src/interface.c:3589 -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 " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" +#: ../src/interface.c:3522 +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 to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "När \"smart\" home-tangent är aktiverad kommer HOME tangenten flytta tecken teckenmarkören till det första icke-blanka tecknet på raden, om den inte redan är där. När denna funktion är avaktiverad kommer HOME tangenten alltid flytta teckenmarkören till början av raden, oavsett dess nuvarande position." -#: ../src/interface.c:3592 +#: ../src/interface.c:3525 msgid "Disable Drag and Drop" msgstr "Avaktivera drag-och-släpp" -#: ../src/interface.c:3595 -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." -msgstr "" +#: ../src/interface.c:3528 +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." +msgstr "Väljer bort drag-och-släpp funktionen i editorfönstret." -#: ../src/interface.c:3598 +#: ../src/interface.c:3531 msgid "Enable folding" -msgstr "" +msgstr "Aktivera ihopvikning" -#: ../src/interface.c:3601 +#: ../src/interface.c:3534 msgid "Whether to enable folding the code" -msgstr "" +msgstr "Specificerar om koden skall vikas ihop för att spara utrymme och underlätta läsning" -#: ../src/interface.c:3604 +#: ../src/interface.c:3537 msgid "Unfold all children of a fold point" msgstr "" -#: ../src/interface.c:3607 +#: ../src/interface.c:3540 msgid "Unfold all children of a fold point when unfolding it." msgstr "" -#: ../src/interface.c:3610 +#: ../src/interface.c:3543 msgid "Use indicators to show compile errors" -msgstr "" +msgstr "Använd indikatorer för att visa kompileringsfel" -#: ../src/interface.c:3613 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error." -msgstr "" +#: ../src/interface.c:3546 +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." +msgstr "Huruvida indikatorer skall användas (taggiga understrykningar) skall användas för att markera rader där kompilatorn hittat fel eller varningar." -#: ../src/interface.c:3616 -msgid "Newline strips trailing spaces" -msgstr "" - -#: ../src/interface.c:3619 -msgid "Enable newline to strip the trailing spaces on the previous line." -msgstr "" - -#: ../src/interface.c:3622 +#: ../src/interface.c:3549 msgid "Features" -msgstr "" +msgstr "Kännetecken" -#: ../src/interface.c:3641 +#: ../src/interface.c:3568 msgid "Construct autocompletion" -msgstr "" +msgstr "Autokomplettera konstruktioner" -#: ../src/interface.c:3644 +#: ../src/interface.c:3571 msgid "Automatic completion of often used constructs like if and for" msgstr "" -#: ../src/interface.c:3647 +#: ../src/interface.c:3574 msgid "XML tag autocompletion" -msgstr "" +msgstr "Komplettera XML-taggar automatiskt" -#: ../src/interface.c:3650 +#: ../src/interface.c:3577 msgid "Automatic completion of open XML tags (includes HTML tags)" msgstr "" -#: ../src/interface.c:3653 +#: ../src/interface.c:3580 msgid "Symbol autocompletion" -msgstr "" +msgstr "Komplettera symboler automatiskt" -#: ../src/interface.c:3656 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" +#: ../src/interface.c:3583 +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" msgstr "" -#: ../src/interface.c:3663 +#: ../src/interface.c:3590 msgid "Rows of autocompletion list:" msgstr "" -#: ../src/interface.c:3672 +#: ../src/interface.c:3599 msgid "Number of rows to display in the autocompletion list." -msgstr "" +msgstr "Antal rader att visa i autokompletteringslistan." -#: ../src/interface.c:3675 +#: ../src/interface.c:3602 msgid "Autocompletion" -msgstr "" +msgstr "Autokomplettering" -#: ../src/interface.c:3680 +#: ../src/interface.c:3607 msgid "Editor" -msgstr "" +msgstr "Editor" -#: ../src/interface.c:3713 +#: ../src/interface.c:3640 msgid "Sets the default encoding for newly created files." -msgstr "" +msgstr "Anger förvald kodning för nyskapade filer." -#: ../src/interface.c:3719 +#: ../src/interface.c:3646 msgid "Default encoding (new files):" -msgstr "" +msgstr "Förvald kodning (nya filer):" -#: ../src/interface.c:3726 +#: ../src/interface.c:3653 msgid "Use fixed encoding when opening files" -msgstr "" +msgstr "Använd fast kodning när filer öppnas" -#: ../src/interface.c:3731 -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)." -msgstr "" +#: ../src/interface.c:3658 +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)." +msgstr "Detta tillval väljer bort automatisk igenkänning av kodning när nya filer öppnas, och använder i stället en specificerad kodning (behövs vanligen inte)." -#: ../src/interface.c:3734 +#: ../src/interface.c:3661 msgid "Default encoding (existing files):" -msgstr "" +msgstr "Förvald teckenkodning (existerande filer):" -#: ../src/interface.c:3746 +#: ../src/interface.c:3673 msgid "Sets the default encoding for opening existing files." -msgstr "" +msgstr "Anger förvald teckenkodning för nyöppnade filer:" -#: ../src/interface.c:3752 +#: ../src/interface.c:3679 msgid "New files" -msgstr "" +msgstr "Nya filer" -#: ../src/interface.c:3771 +#: ../src/interface.c:3698 msgid "Ensure new line at file end" -msgstr "" +msgstr "Skriver alltid nyradstecken i slutet av filen" -#: ../src/interface.c:3775 +#: ../src/interface.c:3702 msgid "Ensures that at the end of the file is a new line" -msgstr "" +msgstr "Lägger till ett nyradstecken vid slutet av filen om det inte redan finns något" -#: ../src/interface.c:3778 +#: ../src/interface.c:3705 msgid "Strip trailing spaces" -msgstr "" +msgstr "Ta bort överflödiga mellanslag i slutet av filen" -#: ../src/interface.c:3782 +#: ../src/interface.c:3709 msgid "Removes trailing spaces and tabs and the end of lines" -msgstr "" +msgstr "Tar bort överflödiga mellanslag och tab-tecken i slutet av filen" -#: ../src/interface.c:3785 ../src/keybindings.c:184 +#: ../src/interface.c:3712 +#: ../src/keybindings.c:185 msgid "Replace tabs by space" -msgstr "" +msgstr "Ersätt tab-tecken med mellanslag" -#: ../src/interface.c:3792 +#: ../src/interface.c:3719 msgid "Saving files" msgstr "Sparar filer" -#: ../src/interface.c:3813 +#: ../src/interface.c:3740 msgid "Recent files list length:" msgstr "Senaste längd på fil-listan:" -#: ../src/interface.c:3827 -msgid "" -"Specifies the number of files which are stored in the Recent files list." +#: ../src/interface.c:3754 +msgid "Specifies the number of files which are stored in the Recent files list." msgstr "Anger antalet filer som lagras i Senaste-filer listan." -#: ../src/interface.c:3836 ../src/symbols.c:513 +#: ../src/interface.c:3763 +#: ../src/symbols.c:503 msgid "Files" msgstr "Filer" -#: ../src/interface.c:3858 +#: ../src/interface.c:3785 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"Skriv in sökvägarna till verktygen nedan. Sökvägarna till verktyg som du " -"inte behöver kan lämnas tomma." +msgstr "Skriv in sökvägarna till verktygen nedan. Sökvägarna till verktyg som du inte behöver kan lämnas tomma." -#: ../src/interface.c:3870 +#: ../src/interface.c:3797 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:3877 +#: ../src/interface.c:3804 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:3884 +#: ../src/interface.c:3811 msgid "Browser:" msgstr "Webbläsare:" -#: ../src/interface.c:3896 +#: ../src/interface.c:3823 msgid "Path and options for the make tool" msgstr "Sökväg och tillval för Make-verktyget" -#: ../src/interface.c:3903 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"En terminal som Xterm, Gnome-terminal eller Konsole (måste acceptera -e " -"argumentet)" +#: ../src/interface.c:3830 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "En terminal som Xterm, Gnome-terminal eller Konsole (måste acceptera -e argumentet)" -#: ../src/interface.c:3910 +#: ../src/interface.c:3837 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Sökväg (och eventuella argument) till din favoritwebbläsare." -#: ../src/interface.c:3942 +#: ../src/interface.c:3869 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:3965 +#: ../src/interface.c:3892 msgid "Tool paths" msgstr "Sökvägar till verktyg" -#: ../src/interface.c:3991 +#: ../src/interface.c:3918 #, c-format msgid "Path to the command for printing files (use %f for the filename)." -msgstr "" +msgstr "Sökvägen till kommandot för att skriva ut filer (%f ersätts med filnamnet)." -#: ../src/interface.c:4003 +#: ../src/interface.c:3930 msgid "Print:" msgstr "Skriv ut:" -#: ../src/interface.c:4015 +#: ../src/interface.c:3942 #, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Snabbmenykommando. Det markerade ordet kan användas med %s. Det kan infogas var som helst i kommandot och kommer att ersättas innan exekvering." -#: ../src/interface.c:4018 +#: ../src/interface.c:3945 msgid "Context action:" -msgstr "" +msgstr "Snabbmenyhändelse:" -#: ../src/interface.c:4034 +#: ../src/interface.c:3961 msgid "Commands" msgstr "Kommandon" -#: ../src/interface.c:4039 +#: ../src/interface.c:3966 msgid "Tools" msgstr "Verktyg" -#: ../src/interface.c:4057 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." -msgstr "" +#: ../src/interface.c:3984 +msgid "Set the information to be used in templates. See the documentation for details." +msgstr "Anger vilken information som skall användas i mallar." -#: ../src/interface.c:4075 +#: ../src/interface.c:4002 msgid "email address of the developer" msgstr "emailadressen till utvecklaren" -#: ../src/interface.c:4082 +#: ../src/interface.c:4009 msgid "Initials of the developer name" msgstr "Utvecklarens initialer" -#: ../src/interface.c:4084 +#: ../src/interface.c:4011 msgid "Initial version:" msgstr "Inledande version:" -#: ../src/interface.c:4096 +#: ../src/interface.c:4023 msgid "Version number, which a new file initially has" msgstr "Versionnummret som filen börjar med" -#: ../src/interface.c:4103 +#: ../src/interface.c:4030 msgid "Company name" msgstr "Företagets namn" -#: ../src/interface.c:4105 +#: ../src/interface.c:4032 msgid "Developer:" msgstr "Utvecklare:" -#: ../src/interface.c:4112 +#: ../src/interface.c:4039 msgid "Company:" msgstr "Företag:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4046 msgid "Mail address:" msgstr "Postadress:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4053 msgid "Initials:" msgstr "Initialer:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4065 msgid "The name of the developer" msgstr "Utvecklarens namn" -#: ../src/interface.c:4140 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany." -msgstr "" -"Observera: För att dina ändringar skall verkställas, måste du starta om " -"Geany." +#: ../src/interface.c:4067 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany." +msgstr "Observera: För att dina ändringar skall verkställas, måste du starta om Geany." -#: ../src/interface.c:4147 +#: ../src/interface.c:4074 msgid "Template data" msgstr "Mall-data" -#: ../src/interface.c:4152 +#: ../src/interface.c:4079 msgid "Templates" msgstr "Mallar" -#: ../src/interface.c:4170 -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 " -"action to edit the string representation of the shortcut directly." -msgstr "" +#: ../src/interface.c:4097 +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 action to edit the string representation of the shortcut directly." +msgstr "Här kan du ändra tangentbordsgenvägar. Välj en och tryck på Ändra-knappen för att ange en ny tangentbordsgenväg. Dubbelklicka för att skriva in värdet manuellt." -#: ../src/interface.c:4193 +#: ../src/interface.c:4120 msgid "C_hange" -msgstr "" +msgstr "Ändra" -#: ../src/interface.c:4197 +#: ../src/interface.c:4124 msgid "Keyboard shortcuts" -msgstr "" +msgstr "Tangentbordsgenvägar" -#: ../src/interface.c:4202 +#: ../src/interface.c:4129 msgid "Keybindings" msgstr "Genvägar" -#: ../src/keybindings.c:112 +#: ../src/keybindings.c:113 msgid "New" msgstr "Ny" -#: ../src/keybindings.c:114 +#: ../src/keybindings.c:115 msgid "Open" msgstr "Öppna" -#: ../src/keybindings.c:116 +#: ../src/keybindings.c:117 msgid "Open selected file" msgstr "Öppna vald fil" -#: ../src/keybindings.c:118 +#: ../src/keybindings.c:119 msgid "Save" msgstr "Spara" -#: ../src/keybindings.c:120 +#: ../src/keybindings.c:121 msgid "Save as" msgstr "Spara som" -#: ../src/keybindings.c:124 +#: ../src/keybindings.c:125 msgid "Print" msgstr "Skriv ut" -#: ../src/keybindings.c:126 +#: ../src/keybindings.c:127 msgid "Close" msgstr "Stäng" -#: ../src/keybindings.c:128 +#: ../src/keybindings.c:129 msgid "Close all" msgstr "Stäng allt" -#: ../src/keybindings.c:130 +#: ../src/keybindings.c:131 msgid "Reload file" msgstr "Ladda om fil" -#: ../src/keybindings.c:132 +#: ../src/keybindings.c:133 msgid "Project properties" msgstr "Projektets egenskaper" -#: ../src/keybindings.c:135 +#: ../src/keybindings.c:136 msgid "Undo" msgstr "Ångra" -#: ../src/keybindings.c:137 +#: ../src/keybindings.c:138 msgid "Redo" msgstr "Gör om" -#: ../src/keybindings.c:139 +#: ../src/keybindings.c:140 msgid "Select All" msgstr "Markera allt" -#: ../src/keybindings.c:141 +#: ../src/keybindings.c:142 msgid "Insert date" msgstr "Klistra in datum" -#: ../src/keybindings.c:147 ../src/search.c:297 +#: ../src/keybindings.c:148 +#: ../src/search.c:297 msgid "Find" msgstr "Sök" -#: ../src/keybindings.c:149 +#: ../src/keybindings.c:150 msgid "Find Next" msgstr "Sök nästa" -#: ../src/keybindings.c:151 +#: ../src/keybindings.c:152 msgid "Find Previous" msgstr "Sök föregående" -#: ../src/keybindings.c:153 +#: ../src/keybindings.c:154 msgid "Find Next Selection" msgstr "Sök nästa markering" -#: ../src/keybindings.c:155 +#: ../src/keybindings.c:156 msgid "Find Previous Selection" msgstr "Sök föregående markering" -#: ../src/keybindings.c:157 ../src/search.c:417 +#: ../src/keybindings.c:158 +#: ../src/search.c:417 msgid "Replace" msgstr "Byt ut" -#: ../src/keybindings.c:159 ../src/search.c:566 +#: ../src/keybindings.c:160 +#: ../src/search.c:566 msgid "Find in Files" msgstr "Sök i filer" -#: ../src/keybindings.c:161 +#: ../src/keybindings.c:162 msgid "Next Message" msgstr "Nästa meddelande" -#: ../src/keybindings.c:166 +#: ../src/keybindings.c:167 msgid "Toggle all additional widgets" -msgstr "" +msgstr "Stäng av / på alla ytterligare gränssnittskomponenter" -#: ../src/keybindings.c:168 +#: ../src/keybindings.c:169 msgid "Fullscreen" msgstr "Helskärm" -#: ../src/keybindings.c:170 +#: ../src/keybindings.c:171 msgid "Toggle Messages Window" -msgstr "" +msgstr "Stäng av / på meddelandefönstret" -#: ../src/keybindings.c:172 +#: ../src/keybindings.c:173 msgid "Toggle Sidebar" -msgstr "" +msgstr "Stäng av / på sidofältet" -#: ../src/keybindings.c:174 +#: ../src/keybindings.c:175 msgid "Zoom In" msgstr "Förstora" -#: ../src/keybindings.c:176 +#: ../src/keybindings.c:177 msgid "Zoom Out" msgstr "Förminska" -#: ../src/keybindings.c:179 +#: ../src/keybindings.c:180 msgid "Show Color Chooser" msgstr "Visa färgväljaren" -#: ../src/keybindings.c:181 +#: ../src/keybindings.c:182 msgid "Insert Special HTML Characters" msgstr "Klistra in speciella HTML-tecken" -#: ../src/keybindings.c:186 +#: ../src/keybindings.c:187 msgid "Fold all" -msgstr "" +msgstr "Vik ihop alla" -#: ../src/keybindings.c:188 +#: ../src/keybindings.c:189 msgid "Unfold all" -msgstr "" +msgstr "Vik upp alla" -#: ../src/keybindings.c:190 +#: ../src/keybindings.c:191 msgid "Reload symbol list" -msgstr "" +msgstr "Ladda om symbollistan" -#: ../src/keybindings.c:195 +#: ../src/keybindings.c:196 msgid "Build" msgstr "Bygg" -#: ../src/keybindings.c:197 +#: ../src/keybindings.c:198 msgid "Make all" msgstr "Kör Make all" -#: ../src/keybindings.c:200 +#: ../src/keybindings.c:201 msgid "Make custom target" msgstr "Kör Make på valbart mål" -#: ../src/keybindings.c:202 +#: ../src/keybindings.c:203 msgid "Make object" msgstr "Kör Make på objekt" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:205 msgid "Next error" msgstr "Nästa fel" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:207 msgid "Run" msgstr "Kör" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:209 msgid "Run (alternative command)" msgstr "Kör (alternativt kommando)" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:211 msgid "Build options" msgstr "Bygg-inställningar" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:214 msgid "Help" msgstr "Hjälp" -#: ../src/keybindings.c:216 +#: ../src/keybindings.c:217 msgid "Switch to Editor" -msgstr "Byt till textredigerare" +msgstr "Byt till editor" -#: ../src/keybindings.c:218 +#: ../src/keybindings.c:219 msgid "Switch to Scribble" msgstr "Byt till Scribble" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:221 msgid "Switch to VTE" msgstr "Byt till VTE" -#: ../src/keybindings.c:222 +#: ../src/keybindings.c:223 msgid "Switch to Search Bar" msgstr "Växla till sökfältet" -#: ../src/keybindings.c:224 +#: ../src/keybindings.c:225 msgid "Switch to left document" msgstr "Byt till det vänstra dokumentet" -#: ../src/keybindings.c:226 +#: ../src/keybindings.c:227 msgid "Switch to right document" msgstr "Byt till det högra dokumentet" -#: ../src/keybindings.c:228 +#: ../src/keybindings.c:229 msgid "Switch to last used document" msgstr "Byt till det sist använda dokumentet" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:231 msgid "Move document left" msgstr "Flytta dokumentet till vänster" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:233 msgid "Move document right" msgstr "Flytta dokumentet till höger" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:240 msgid "Duplicate line or selection" -msgstr "" +msgstr "Duplicera raden eller markeringen" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:242 msgid "Delete current line(s)" msgstr "Radera rad(er)" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:244 msgid "Copy current line(s)" msgstr "Kopiera rad(er)" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:246 msgid "Cut current line(s)" msgstr "Klipp ut rad(er)" -#: ../src/keybindings.c:247 +#: ../src/keybindings.c:248 msgid "Transpose current line" -msgstr "" +msgstr "Förflytta raden" -#: ../src/keybindings.c:249 +#: ../src/keybindings.c:250 msgid "Toggle Case of Selection" -msgstr "" +msgstr "Växla mellan versaler och gemener" -#: ../src/keybindings.c:251 +#: ../src/keybindings.c:252 msgid "Toggle line commentation" -msgstr "" +msgstr "Stäng av / på radkommentarer" -#: ../src/keybindings.c:253 +#: ../src/keybindings.c:254 msgid "Comment line(s)" msgstr "Kommentera rad(er)" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:256 msgid "Uncomment line(s)" msgstr "Ta bort kommentarer från rad(er)" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:258 msgid "Increase indent" msgstr "Öka indrag" -#: ../src/keybindings.c:259 +#: ../src/keybindings.c:260 msgid "Decrease indent" msgstr "Minska indrag" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:262 msgid "Increase indent by one space" msgstr "Öka indrag med ett blanksteg" -#: ../src/keybindings.c:263 +#: ../src/keybindings.c:264 msgid "Decrease indent by one space" msgstr "Minska indrag med ett blanksteg" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:266 msgid "Smart line indent" msgstr "Smart radindrag" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:268 msgid "Send to Custom Command 1" msgstr "Definiera användarkommando 1" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:270 msgid "Send to Custom Command 2" msgstr "Definiera användarkommando 2" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:272 msgid "Send to Custom Command 3" msgstr "Definiera användarkommando 3" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:275 msgid "Go to matching brace" msgstr "" -#: ../src/keybindings.c:277 +#: ../src/keybindings.c:278 msgid "Toggle marker" -msgstr "" +msgstr "Stäng av / på markör" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:281 msgid "Go to next marker" msgstr "Gå till nästa markör" -#: ../src/keybindings.c:283 +#: ../src/keybindings.c:284 msgid "Go to previous marker" msgstr "Gå till föregående markör" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:287 msgid "Complete word" msgstr "Komplettera ord" -#: ../src/keybindings.c:288 +#: ../src/keybindings.c:289 msgid "Show calltip" msgstr "Visa calltip" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:291 msgid "Show macro list" msgstr "Visa macrolistan" #. has special callback -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:293 msgid "Complete construct" msgstr "Färdigställ konstruktion" -#: ../src/keybindings.c:294 +#: ../src/keybindings.c:295 msgid "Suppress construct completion" -msgstr "" +msgstr "Undertryck construct completion" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:298 msgid "Select current word" msgstr "Välj ord" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:300 msgid "Select current line(s)" msgstr "Välj rad(er)" -#: ../src/keybindings.c:301 +#: ../src/keybindings.c:302 msgid "Select current paragraph" msgstr "Välj paragraf" -#: ../src/keybindings.c:303 +#: ../src/keybindings.c:304 msgid "Scroll to current line" msgstr "Flytta till vald rad" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:306 msgid "Scroll up the view by one line" msgstr "Flytta upp en rad" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:308 msgid "Scroll down the view by one line" msgstr "Flytta ned en rad" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:311 msgid "Insert alternative whitespace" msgstr "Infoga alternativt tomt tecken" #. set section name -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:361 msgid "File menu" msgstr "Filmeny" -#: ../src/keybindings.c:359 +#: ../src/keybindings.c:362 msgid "Edit menu" msgstr "Redigeringsmeny" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:363 msgid "Search menu" msgstr "Sökmeny" -#: ../src/keybindings.c:361 +#: ../src/keybindings.c:364 msgid "View menu" msgstr "Visningsmeny" -#: ../src/keybindings.c:362 +#: ../src/keybindings.c:365 msgid "Document menu" msgstr "Dokumentmeny" -#: ../src/keybindings.c:363 +#: ../src/keybindings.c:366 msgid "Build menu" msgstr "Byggmeny" -#: ../src/keybindings.c:364 +#: ../src/keybindings.c:367 msgid "Tools menu" msgstr "Verktygsmeny" -#: ../src/keybindings.c:365 +#: ../src/keybindings.c:368 msgid "Help menu" msgstr "Hjälpmeny" -#: ../src/keybindings.c:366 +#: ../src/keybindings.c:369 msgid "Focus commands" msgstr "Fokuskommandon" -#: ../src/keybindings.c:367 +#: ../src/keybindings.c:370 msgid "Editing commands" msgstr "Redigeringskommandon" -#: ../src/keybindings.c:368 +#: ../src/keybindings.c:371 msgid "Tag commands" msgstr "Märkningskommandon" -#: ../src/keybindings.c:551 +#: ../src/keybindings.c:554 msgid "Keyboard Shortcuts" msgstr "Tangentgenvägar" -#: ../src/keybindings.c:563 +#: ../src/keybindings.c:566 msgid "The following keyboard shortcuts are configurable:" -msgstr "" +msgstr "Följande tangentbordsgenvägar kan konfigureras:" -#: ../src/keyfile.c:625 +#: ../src/keyfile.c:603 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "" +msgstr "Skriv vad du vill här, använd den som ett klotterplank" -#: ../src/keyfile.c:762 +#: ../src/keyfile.c:740 msgid "Failed to load one or more session files." -msgstr "" +msgstr "Kunde ej ladda en eller fler av sessionens filer" #: ../src/main.c:114 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" msgstr "" #: ../src/main.c:115 msgid "Use an alternate configuration directory" -msgstr "" +msgstr "Använd en alternativ sökväg till konfigurationsfiler" #: ../src/main.c:116 msgid "Runs in debug mode (means being verbose)" -msgstr "" +msgstr "Kör i felsökningsläge (skriv ut extra information)" #: ../src/main.c:117 msgid "Print internal filetype names" -msgstr "" +msgstr "Skriv interna filtypsnamn" #: ../src/main.c:118 msgid "Generate global tags file (see documentation)" -msgstr "" +msgstr "Generera globala tagg-filer (se dokumentationen)" #: ../src/main.c:122 msgid "Don't open files in a running instance, force opening a new instance" -msgstr "" +msgstr "Öppna inte filer i en existerande session, tvinga istället filen att öppnas i en ny session" #: ../src/main.c:124 msgid "Set initial line number for the first opened file" -msgstr "" +msgstr "Ange inledande radnummer för den först öppnade filen" #: ../src/main.c:125 msgid "Don't show message window at startup" @@ -2890,21 +2905,21 @@ "Start Geany anyway?" msgstr "" "Konfigureringsmappen kunde inte skapas (%s).\n" -"Det kan uppstå problem om du försöker använda Geany utan " -"konfigureringsmapp.\n" +"Det kan uppstå problem om du försöker använda Geany utan konfigureringsmapp.\n" "Starta Geany ändå?" -#: ../src/main.c:560 ../src/socket.c:143 +#: ../src/main.c:560 +#: ../src/socket.c:143 #, c-format msgid "Could not find file '%s'." msgstr "Kunde inte hitta fil '%s'." -#: ../src/main.c:708 +#: ../src/main.c:707 #, c-format msgid "This is Geany %s." msgstr "Detta är Geany %s." -#: ../src/main.c:710 +#: ../src/main.c:709 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigureringsmappen kunde inte skapas (%s)" @@ -2917,28 +2932,27 @@ msgid "_Hide Message Window" msgstr "Dölj meddelandefönster" -#: ../src/prefs.c:391 +#: ../src/prefs.c:380 msgid "Action" -msgstr "" +msgstr "Händelse" -#: ../src/prefs.c:396 +#: ../src/prefs.c:385 msgid "Shortcut" -msgstr "" +msgstr "Genväg" -#: ../src/prefs.c:971 +#: ../src/prefs.c:937 msgid "Grab Key" -msgstr "" +msgstr "Läs av tangent" -#: ../src/prefs.c:977 +#: ../src/prefs.c:943 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" -msgstr "" +msgstr "Skriv in den tangentbordskombination du vill använda för \"%s\"" -#: ../src/prefs.c:1102 +#: ../src/prefs.c:1068 #, c-format -msgid "" -"The combination '%s' is already used for \"%s\". Please choose another one." -msgstr "" +msgid "The combination '%s' is already used for \"%s\". Please choose another one." +msgstr "Kombinationen '%s' används redan för \"%s\".Var god och använd en annan kombination." #. "projects" is part of the default project base path so be careful when translating #. please avoid special characters and spaces, look at the source for details or ask Frank @@ -2954,34 +2968,38 @@ msgid "C_reate" msgstr "Skapa" -#: ../src/project.c:126 ../src/project.c:328 +#: ../src/project.c:126 +#: ../src/project.c:328 msgid "Name:" msgstr "Namn:" -#: ../src/project.c:134 ../src/project.c:340 +#: ../src/project.c:134 +#: ../src/project.c:340 msgid "Filename:" msgstr "Filnamn:" -#: ../src/project.c:150 ../src/project.c:369 +#: ../src/project.c:150 +#: ../src/project.c:369 msgid "Base path:" msgstr "Bassökväg:" #: ../src/project.c:155 -msgid "" -"Base directory of all files that make up the project. This can be a new " -"path, or an existing directory tree." -msgstr "" +msgid "Base directory of all files that make up the project. This can be a new path, or an existing directory tree." +msgstr "Grundläggande sökväg för alla filer i projektet. Detta kan vara en ny sökväg eller ett existerande mappträd." -#: ../src/project.c:157 ../src/project.c:379 +#: ../src/project.c:157 +#: ../src/project.c:379 msgid "Choose Project Base Path" msgstr "Välj projektets sökväg" -#: ../src/project.c:202 ../src/project.c:769 +#: ../src/project.c:202 +#: ../src/project.c:769 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Projektfilen \"%s\" kunde inte laddas." -#: ../src/project.c:226 ../src/project.c:234 +#: ../src/project.c:226 +#: ../src/project.c:234 msgid "Open Project" msgstr "Öppna projekt" @@ -3004,18 +3022,15 @@ #: ../src/project.c:377 msgid "Directory to run Make All from. Leave blank to use the default command." -msgstr "" -"Sökväg att köra Make All från. Lämna tom om du vill köra förvalt kommando." +msgstr "Sökväg att köra Make All från. Lämna tom om du vill köra förvalt kommando." #: ../src/project.c:385 msgid "Run command:" msgstr "Kör kommando:" #: ../src/project.c:393 -msgid "" -"Command-line to run in the project base directory. Options can be appended " -"to the command. Leave blank to use the default run command." -msgstr "" +msgid "Command-line to run in the project base directory. Options can be appended to the command. Leave blank to use the default run command." +msgstr "Kommandorad att köra i projektets grundläggande sökväg." #: ../src/project.c:409 msgid "File patterns:" @@ -3067,12 +3082,14 @@ msgstr "Projekt \"%s\" sparad." #. initialise the dialog -#: ../src/project.c:659 ../src/project.c:670 +#: ../src/project.c:659 +#: ../src/project.c:670 msgid "Choose Project Filename" msgstr "Välj projektets filnamn" #. initialise the dialog -#: ../src/project.c:688 ../src/project.c:699 +#: ../src/project.c:688 +#: ../src/project.c:699 msgid "Choose Project Run Command" msgstr "Välj projektets körkommando" @@ -3086,10 +3103,8 @@ msgstr "Använd regular expressions" #: ../src/search.c:142 -msgid "" @@ 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: [1975] trunk
by ntrel＠users.sourceforge.net 24 Oct '07

24 Oct '07

Revision: 1975 http://geany.svn.sourceforge.net/geany/?rev=1975&view=rev Author: ntrel Date: 2007-10-24 09:10:56 -0700 (Wed, 24 Oct 2007) Log Message: ----------- Fix bug with choosing 'show full path name' from documents list popup menu when there is no selected item (can happen after using the command twice). Fix hiding the sidebar/documents list from the popup menu when there's no selected item. Modified Paths: -------------- trunk/ChangeLog trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-24 12:04:15 UTC (rev 1974) +++ trunk/ChangeLog 2007-10-24 16:10:56 UTC (rev 1975) @@ -19,6 +19,12 @@ plugins/pluginmacros.h: Add pluginmacros.h to define common macros for app, utils, etc. Add more documentation/comments to demoplugin.c. + * src/treeviews.c: + Fix bug with choosing 'show full path name' from documents list popup + menu when there is no selected item (can happen after using the command + twice). + Fix hiding the sidebar/documents list from the popup menu when there's + no selected item. 2007-10-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2007-10-24 12:04:15 UTC (rev 1974) +++ trunk/src/treeviews.c 2007-10-24 16:10:56 UTC (rev 1975) @@ -53,7 +53,6 @@ OPENFILES_ACTION_REMOVE = 0, OPENFILES_ACTION_SAVE, OPENFILES_ACTION_RELOAD, - OPENFILES_ACTION_FULLPATH, OPENFILES_ACTION_HIDE, OPENFILES_ACTION_HIDE_ALL, SYMBOL_ACTION_SORT_BY_NAME, @@ -69,7 +68,8 @@ /* callback prototypes */ static void on_taglist_tree_popup_clicked(GtkMenuItem *menuitem, gpointer user_data); static void on_openfiles_tree_selection_changed(GtkTreeSelection *selection, gpointer data); -static void on_openfiles_tree_popup_clicked(GtkMenuItem *menuitem, gpointer user_data); +static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data); +static void on_openfiles_hide_item_clicked(GtkMenuItem *menuitem, gpointer user_data); static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection); static gboolean on_treeviews_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer user_data); @@ -381,6 +381,13 @@ } +static void on_openfiles_fullpath_activate(GtkCheckMenuItem *item) +{ + prefs.sidebar_openfiles_fullpath = gtk_check_menu_item_get_active(item); + treeviews_openfiles_update_all(); +} + + static void create_openfiles_popup_menu() { GtkWidget *item; @@ -391,7 +398,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), item); g_signal_connect((gpointer) item, "activate", - G_CALLBACK(on_openfiles_tree_popup_clicked), GINT_TO_POINTER(OPENFILES_ACTION_REMOVE)); + G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_REMOVE)); item = gtk_separator_menu_item_new(); gtk_widget_show(item); @@ -401,7 +408,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), item); g_signal_connect((gpointer) item, "activate", - G_CALLBACK(on_openfiles_tree_popup_clicked), GINT_TO_POINTER(OPENFILES_ACTION_SAVE)); + G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_SAVE)); item = gtk_image_menu_item_new_with_mnemonic(_("_Reload")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), @@ -409,7 +416,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), item); g_signal_connect((gpointer) item, "activate", - G_CALLBACK(on_openfiles_tree_popup_clicked), GINT_TO_POINTER(OPENFILES_ACTION_RELOAD)); + G_CALLBACK(on_openfiles_document_action), GINT_TO_POINTER(OPENFILES_ACTION_RELOAD)); item = gtk_separator_menu_item_new(); gtk_widget_show(item); @@ -418,15 +425,15 @@ tv.popup_openfiles_fullpath = gtk_check_menu_item_new_with_mnemonic(_("Show _full path name")); gtk_widget_show(tv.popup_openfiles_fullpath); gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), tv.popup_openfiles_fullpath); - g_signal_connect((gpointer) tv.popup_openfiles_fullpath, "toggled", - G_CALLBACK(on_openfiles_tree_popup_clicked), GINT_TO_POINTER(OPENFILES_ACTION_FULLPATH)); + g_signal_connect((gpointer) tv.popup_openfiles_fullpath, "activate", + G_CALLBACK(on_openfiles_fullpath_activate), NULL); item = gtk_image_menu_item_new_with_mnemonic(_("_Hide")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), item); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_openfiles_tree_popup_clicked), + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_openfiles_hide_item_clicked), GINT_TO_POINTER(OPENFILES_ACTION_HIDE)); item = gtk_image_menu_item_new_with_mnemonic(_("H_ide sidebar")); @@ -434,7 +441,7 @@ gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), item); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_openfiles_tree_popup_clicked), + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_openfiles_hide_item_clicked), GINT_TO_POINTER(OPENFILES_ACTION_HIDE_ALL)); } @@ -467,7 +474,7 @@ /* callbacks */ -static void on_openfiles_tree_popup_clicked(GtkMenuItem *menuitem, gpointer user_data) +static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data) { GtkTreeIter iter; GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); @@ -496,33 +503,32 @@ on_toolbutton23_clicked(NULL, NULL); break; } - case OPENFILES_ACTION_FULLPATH: - { - if (! app->ignore_callback) - { - prefs.sidebar_openfiles_fullpath = ! prefs.sidebar_openfiles_fullpath; - treeviews_openfiles_update_all(); - } - break; - } - case OPENFILES_ACTION_HIDE: - { - prefs.sidebar_openfiles_visible = FALSE; - ui_treeviews_show_hide(FALSE); - break; - } - case OPENFILES_ACTION_HIDE_ALL: - { - ui_prefs.sidebar_visible = FALSE; - ui_treeviews_show_hide(TRUE); - break; - } } } } } +static void on_openfiles_hide_item_clicked(GtkMenuItem *menuitem, gpointer user_data) +{ + switch (GPOINTER_TO_INT(user_data)) + { + case OPENFILES_ACTION_HIDE: + { + prefs.sidebar_openfiles_visible = FALSE; + ui_treeviews_show_hide(FALSE); + break; + } + case OPENFILES_ACTION_HIDE_ALL: + { + ui_prefs.sidebar_visible = FALSE; + ui_treeviews_show_hide(TRUE); + break; + } + } +} + + static gboolean change_focus(gpointer data) { gint idx = (gint) data; @@ -627,10 +633,8 @@ { // popupmenu to hide or clear the active treeview if (GPOINTER_TO_INT(user_data) == TREEVIEW_OPENFILES) { - app->ignore_callback = TRUE; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(tv.popup_openfiles_fullpath), prefs.sidebar_openfiles_fullpath); - app->ignore_callback = FALSE; gtk_menu_popup(GTK_MENU(tv.popup_openfiles), NULL, NULL, NULL, NULL, event->button, event->time); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1974] trunk
by ntrel＠users.sourceforge.net 24 Oct '07

24 Oct '07

Revision: 1974 http://geany.svn.sourceforge.net/geany/?rev=1974&view=rev Author: ntrel Date: 2007-10-24 05:04:15 -0700 (Wed, 24 Oct 2007) Log Message: ----------- Add pluginmacros.h to define common macros for app, utils, etc. Add more documentation/comments to demoplugin.c. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/Makefile.am trunk/plugins/demoplugin.c trunk/plugins/filebrowser.c Added Paths: ----------- trunk/plugins/pluginmacros.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-24 11:15:00 UTC (rev 1973) +++ trunk/ChangeLog 2007-10-24 12:04:15 UTC (rev 1974) @@ -15,6 +15,10 @@ Separate toolbar code from init(). * plugins/filebrowser.c: Add 'Show hidden files' checkbox in the popup menu. + * plugins/demoplugin.c, plugins/filebrowser.c, plugins/Makefile.am, + plugins/pluginmacros.h: + Add pluginmacros.h to define common macros for app, utils, etc. + Add more documentation/comments to demoplugin.c. 2007-10-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/Makefile.am =================================================================== --- trunk/plugins/Makefile.am 2007-10-24 11:15:00 UTC (rev 1973) +++ trunk/plugins/Makefile.am 2007-10-24 12:04:15 UTC (rev 1974) @@ -1,7 +1,8 @@ # Adapted from Pidgin's plugins/Makefile.am, thanks EXTRA_DIST = \ - makefile.win32 + makefile.win32 \ + pluginmacros.h plugindir = $(libdir)/geany Modified: trunk/plugins/demoplugin.c =================================================================== --- trunk/plugins/demoplugin.c 2007-10-24 11:15:00 UTC (rev 1973) +++ trunk/plugins/demoplugin.c 2007-10-24 12:04:15 UTC (rev 1974) @@ -22,33 +22,47 @@ * $Id$ */ -/* Demo plugin. */ +/** + * Demo plugin - example of a basic plugin for Geany. Adds a menu item to the + * Tools menu. + * + * Note: This is not installed by default, but (on *nix) you can build it as follows: + * cd plugins + * make demoplugin.so + * + * Then copy or symlink the plugins/demoplugin.so file to ~/.geany/plugins + * - it will be loaded at next startup. + */ -#include "geany.h" -#include "support.h" -#include "plugindata.h" +#include "geany.h" // for the GeanyApp data type +#include "support.h" // for the _() translation macro (see also po/POTFILES.in) +#include "plugindata.h" // this defines the plugin API +#include "pluginmacros.h" // some useful macros to avoid typing geany_data so often + + +/* These items are set by Geany before init() is called. */ PluginFields *plugin_fields; GeanyData *geany_data; -/* Check that Geany supports plugin API version 2 or later, and check +/* Check that Geany supports plugin API version 7 or later, and check * for binary compatibility. */ VERSION_CHECK(7) -/* All plugins must set name, description and version */ +/* All plugins must set name, description and version. */ PLUGIN_INFO(_("Demo"), _("Example plugin."), "0.1") -/* Callback when the menu item is clicked */ +/* Callback when the menu item is clicked. */ static void item_activate(GtkMenuItem *menuitem, gpointer gdata) { GtkWidget *dialog; dialog = gtk_message_dialog_new( - GTK_WINDOW(geany_data->app->window), + GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, @@ -61,7 +75,8 @@ } -/* Called by Geany to initialize the plugin */ +/* Called by Geany to initialize the plugin. + * Note: data is the same as geany_data. */ void init(GeanyData *data) { GtkWidget *demo_item; @@ -78,7 +93,7 @@ /* Called by Geany before unloading the plugin. - * Here any UI changes should be removed, memory freed and any other finalization done */ + * Here any UI changes should be removed, memory freed and any other finalization done. */ void cleanup() { // remove the menu item added in init() Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2007-10-24 11:15:00 UTC (rev 1973) +++ trunk/plugins/filebrowser.c 2007-10-24 12:04:15 UTC (rev 1974) @@ -33,7 +33,9 @@ #include "document.h" #include "utils.h" #include "keybindings.h" + #include "plugindata.h" +#include "pluginmacros.h" PluginFields *plugin_fields; @@ -45,14 +47,6 @@ PLUGIN_INFO(_("File Browser"), _("Adds a file browser tab to the sidebar."), "0.1") -#define doc_array geany_data->doc_array -#define documents geany_data->document -#define utils geany_data->utils -#define ui geany_data->ui -#define support geany_data->support -#define tm geany_data->tm - - enum { FILEVIEW_COLUMN_ICON = 0, @@ -310,7 +304,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect_swapped((gpointer) item, "activate", - G_CALLBACK(geany_data->keybindings->send_command), + G_CALLBACK(keybindings->send_command), GINT_TO_POINTER(GEANY_KEYS_MENU_SIDEBAR)); return menu; @@ -391,7 +385,7 @@ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(file_view), TRUE); gtk_tree_view_set_search_column(GTK_TREE_VIEW(file_view), FILEVIEW_COLUMN_NAME); - pfd = pango_font_description_from_string(geany_data->prefs->tagbar_font); + pfd = pango_font_description_from_string(prefs->tagbar_font); gtk_widget_modify_font(file_view, pfd); pango_font_description_free(pfd); @@ -411,7 +405,7 @@ { GtkWidget *wid, *toolbar; GtkTooltips *tooltips = GTK_TOOLTIPS(support->lookup_widget( - geany_data->app->window, "tooltips")); + app->window, "tooltips")); toolbar = gtk_toolbar_new(); gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); @@ -467,7 +461,7 @@ gtk_container_add(GTK_CONTAINER(vbox), scrollwin); gtk_widget_show_all(vbox); - gtk_notebook_append_page(GTK_NOTEBOOK(data->app->treeview_notebook), vbox, + gtk_notebook_append_page(GTK_NOTEBOOK(app->treeview_notebook), vbox, gtk_label_new(_("Files"))); } Added: trunk/plugins/pluginmacros.h =================================================================== --- trunk/plugins/pluginmacros.h (rev 0) +++ trunk/plugins/pluginmacros.h 2007-10-24 12:04:15 UTC (rev 1974) @@ -0,0 +1,46 @@ +/* + * pluginmacros.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * $Id$ + */ + +/* Useful macros to avoid typing geany_data so often. */ + +#ifndef PLUGINMACROS_H +#define PLUGINMACROS_H + +#define app geany_data->app +#define doc_array geany_data->doc_array +#define prefs geany_data->prefs + +#define dialogs geany_data->dialogs +#define documents geany_data->document +#define encoding geany_data->encoding +#define keybindings geany_data->keybindings +#define msgwindow geany_data->msgwindow +#define scintilla geany_data->sci +#define support geany_data->support +#define templates geany_data->templates +#define tm geany_data->tm +#define ui geany_data->ui +#define utils geany_data->utils + +#endif Property changes on: trunk/plugins/pluginmacros.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1973] trunk
by ntrel＠users.sourceforge.net 24 Oct '07

24 Oct '07

Revision: 1973 http://geany.svn.sourceforge.net/geany/?rev=1973&view=rev Author: ntrel Date: 2007-10-24 04:15:00 -0700 (Wed, 24 Oct 2007) Log Message: ----------- Add 'Show hidden files' checkbox in the popup menu. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-24 11:02:43 UTC (rev 1972) +++ trunk/ChangeLog 2007-10-24 11:15:00 UTC (rev 1973) @@ -13,6 +13,8 @@ Use the current directory when there are no documents open. Add popup menu with Open command. Separate toolbar code from init(). + * plugins/filebrowser.c: + Add 'Show hidden files' checkbox in the popup menu. 2007-10-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2007-10-24 11:02:43 UTC (rev 1972) +++ trunk/plugins/filebrowser.c 2007-10-24 11:15:00 UTC (rev 1973) @@ -271,6 +271,13 @@ } +static void on_hidden_files_clicked(GtkCheckMenuItem *item) +{ + show_hidden_files = gtk_check_menu_item_get_active(item); + refresh(); +} + + static GtkWidget *create_popup_menu() { GtkWidget *item, *menu; @@ -287,6 +294,16 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); + item = gtk_check_menu_item_new_with_mnemonic(_("Show _hidden files")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect((gpointer) item, "activate", + G_CALLBACK(on_hidden_files_clicked), NULL); + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + item = gtk_image_menu_item_new_with_mnemonic(_("H_ide sidebar")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1972] trunk
by ntrel＠users.sourceforge.net 24 Oct '07

24 Oct '07

Revision: 1972 http://geany.svn.sourceforge.net/geany/?rev=1972&view=rev Author: ntrel Date: 2007-10-24 04:02:43 -0700 (Wed, 24 Oct 2007) Log Message: ----------- Use the current directory when there are no documents open. Add popup menu with Open command. Separate toolbar code from init(). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-24 10:52:48 UTC (rev 1971) +++ trunk/ChangeLog 2007-10-24 11:02:43 UTC (rev 1972) @@ -9,6 +9,10 @@ Make ui_set_statusbar() take a log argument for whether to record the message in the Status window. (Plugin API functions already do this). + * plugins/filebrowser.c: + Use the current directory when there are no documents open. + Add popup menu with Open command. + Separate toolbar code from init(). 2007-10-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2007-10-24 10:52:48 UTC (rev 1971) +++ trunk/plugins/filebrowser.c 2007-10-24 11:02:43 UTC (rev 1972) @@ -32,6 +32,7 @@ #include "prefs.h" #include "document.h" #include "utils.h" +#include "keybindings.h" #include "plugindata.h" @@ -181,14 +182,16 @@ gchar *dir; gint idx = documents->get_cur_idx(); - if (! DOC_IDX_VALID(idx)) - return; + if (DOC_IDX_VALID(idx)) + { + fname = DOC_FILENAME(idx); + fname = utils->get_locale_from_utf8(fname); + dir = g_path_get_dirname(fname); + g_free(fname); + } + else + dir = g_strdup("."); - fname = DOC_FILENAME(idx); - fname = utils->get_locale_from_utf8(fname); - dir = g_path_get_dirname(fname); - g_free(fname); - setptr(current_dir, dir); refresh(); } @@ -268,10 +271,51 @@ } +static GtkWidget *create_popup_menu() +{ + GtkWidget *item, *menu; + + menu = gtk_menu_new(); + + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_OPEN, NULL); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect((gpointer) item, "activate", + G_CALLBACK(open_selected_files), NULL); + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + item = gtk_image_menu_item_new_with_mnemonic(_("H_ide sidebar")); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), + gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect_swapped((gpointer) item, "activate", + G_CALLBACK(geany_data->keybindings->send_command), + GINT_TO_POINTER(GEANY_KEYS_MENU_SIDEBAR)); + + return menu; +} + + static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event, gpointer user_data) { if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) open_selected_files(); + else + if (event->button == 3) + { + static GtkWidget *popup_menu = NULL; + + if (popup_menu == NULL) + popup_menu = create_popup_menu(); + + gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL, + event->button, event->time); + return TRUE; + } return FALSE; } @@ -346,17 +390,12 @@ } -void init(GeanyData *data) +static GtkWidget *make_toolbar() { - GtkWidget *scrollwin, *wid, *vbox, *toolbar; + GtkWidget *wid, *toolbar; GtkTooltips *tooltips = GTK_TOOLTIPS(support->lookup_widget( geany_data->app->window, "tooltips")); - file_view = gtk_tree_view_new(); - prepare_file_view(); - - vbox = gtk_vbox_new(FALSE, 0); - toolbar = gtk_toolbar_new(); gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); @@ -384,12 +423,25 @@ g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(on_current_path), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); + return toolbar; +} + + +void init(GeanyData *data) +{ + GtkWidget *scrollwin, *toolbar, *vbox; + + vbox = gtk_vbox_new(FALSE, 0); + toolbar = make_toolbar(); gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); path_entry = gtk_entry_new(); gtk_editable_set_editable(GTK_EDITABLE(path_entry), FALSE); gtk_box_pack_start(GTK_BOX(vbox), path_entry, FALSE, FALSE, 2); + file_view = gtk_tree_view_new(); + prepare_file_view(); + scrollwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(scrollwin), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1971] trunk
by ntrel＠users.sourceforge.net 24 Oct '07

24 Oct '07

Revision: 1971 http://geany.svn.sourceforge.net/geany/?rev=1971&view=rev Author: ntrel Date: 2007-10-24 03:52:48 -0700 (Wed, 24 Oct 2007) Log Message: ----------- Make msgwin_status_add() only log a message, not display it on the status bar. Make ui_set_statusbar() take a log argument for whether to record the message in the Status window. (Plugin API functions already do this). Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/document.c trunk/src/geany.h trunk/src/keyfile.c trunk/src/main.c trunk/src/msgwindow.c trunk/src/plugins.c trunk/src/project.c trunk/src/search.c trunk/src/symbols.c trunk/src/tools.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/ChangeLog 2007-10-24 10:52:48 UTC (rev 1971) @@ -1,3 +1,16 @@ +2007-10-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c, src/ui_utils.h, src/tools.c, src/project.c, src/geany.h, + src/msgwindow.c, src/callbacks.c, src/keyfile.c, src/search.c, + src/document.c, src/plugins.c, src/main.c, src/symbols.c, + src/ui_utils.c: + Make msgwin_status_add() only log a message, not display it on the + status bar. + Make ui_set_statusbar() take a log argument for whether to record the + message in the Status window. + (Plugin API functions already do this). + + 2007-10-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/svndiff.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/build.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -175,7 +175,7 @@ // check wether view_file exists if (g_stat(locale_filename, &st) != 0) { - msgwin_status_add(_("Failed to view %s (make sure it is already compiled)"), view_file); + ui_set_statusbar(TRUE, _("Failed to view %s (make sure it is already compiled)"), view_file); utils_free_pointers(executable, view_file, locale_filename, NULL); return (GPid) 1; @@ -207,7 +207,7 @@ } if (term_argv[0] == NULL) { - msgwin_status_add( + ui_set_statusbar(TRUE, _("Could not find terminal \"%s\" " "(check path for Terminal tool setting in Preferences)"), prefs.tools_term_cmd); @@ -220,7 +220,7 @@ // (RUN_SCRIPT_CMD should be ok in UTF8 without converting in locale because it contains no umlauts) if (! build_create_shellscript(RUN_SCRIPT_CMD, locale_cmd_string, TRUE)) { - msgwin_status_add(_("Failed to execute \"%s\" (start-script could not be created)"), + ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), executable); utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, locale_term_cmd, NULL); @@ -248,7 +248,7 @@ NULL, NULL, &(run_info.pid), NULL, NULL, NULL, &error)) { geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); - msgwin_status_add(_("Process failed (%s)"), error->message); + ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, locale_term_cmd, NULL); @@ -365,7 +365,7 @@ // check for filename extension and abort if filename doesn't have one if (utils_str_equal(locale_filename, executable)) { - msgwin_status_add(_("Command stopped because the current file has no extension.")); + ui_set_statusbar(TRUE, _("Command stopped because the current file has no extension.")); utils_beep(); utils_free_pointers(locale_filename, executable, NULL); return (GPid) 1; @@ -514,7 +514,7 @@ NULL, NULL, &(build_info.pid), NULL, &stdout_fd, &stderr_fd, &error)) { geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); - msgwin_status_add(_("Process failed (%s)"), error->message); + ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); g_strfreev(argv); g_error_free(error); g_free(working_dir); @@ -580,7 +580,7 @@ // check for filename extension and abort if filename doesn't have one if (utils_str_equal(locale_filename, check_executable)) { - msgwin_status_add(_("Command stopped because the current file has no extension.")); + ui_set_statusbar(TRUE, _("Command stopped because the current file has no extension.")); utils_beep(); g_free(check_executable); return NULL; @@ -591,7 +591,7 @@ { gchar *utf8_check_executable = utils_get_utf8_from_locale(check_executable); - msgwin_status_add(_("Failed to execute \"%s\" (make sure it is already built)"), + ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (make sure it is already built)"), utf8_check_executable); g_free(utf8_check_executable); g_free(check_executable); @@ -645,7 +645,7 @@ gchar *utf8_working_dir = utils_get_utf8_from_locale(working_dir); - msgwin_status_add(_("Failed to change the working directory to \"%s\""), utf8_working_dir); + ui_set_statusbar(TRUE, _("Failed to change the working directory to \"%s\""), utf8_working_dir); g_free(utf8_working_dir); g_free(working_dir); g_free(executable); @@ -671,7 +671,7 @@ { gchar *utf8_cmd = utils_get_utf8_from_locale(cmd); - msgwin_status_add(_("Failed to execute \"%s\" (start-script could not be created)"), + ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), utf8_cmd); g_free(utf8_cmd); } @@ -745,7 +745,7 @@ } if (term_argv[0] == NULL) { - msgwin_status_add( + ui_set_statusbar(TRUE, _("Could not find terminal \"%s\" " "(check path for Terminal tool setting in Preferences)"), prefs.tools_term_cmd); run_info.pid = (GPid) 1; @@ -771,7 +771,7 @@ NULL, NULL, &(run_info.pid), NULL, NULL, NULL, &error)) { geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); - msgwin_status_add(_("Process failed (%s)"), error->message); + ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); unlink(RUN_SCRIPT_CMD); g_error_free(error); error = NULL; @@ -895,7 +895,7 @@ } else if (gtk_notebook_get_current_page(GTK_NOTEBOOK(msgwindow.notebook)) != MSG_COMPILER) - ui_set_statusbar("%s", msg); + ui_set_statusbar(FALSE, "%s", msg); } else { @@ -903,7 +903,7 @@ msgwin_compiler_add(COLOR_BLUE, msg); if (! ui_prefs.msgwindow_visible || gtk_notebook_get_current_page(GTK_NOTEBOOK(msgwindow.notebook)) != MSG_COMPILER) - ui_set_statusbar("%s", msg); + ui_set_statusbar(FALSE, "%s", msg); } } #endif @@ -1893,7 +1893,7 @@ { // run LaTeX file if (build_view_tex_file(idx, GPOINTER_TO_INT(user_data)) == (GPid) 0) { - msgwin_status_add(_("Failed to execute the view program")); + ui_set_statusbar(TRUE, _("Failed to execute the view program")); } } else if (doc_list[idx].file_type->id == GEANY_FILETYPES_HTML) @@ -1912,7 +1912,7 @@ if (build_run_cmd(idx) == (GPid) 0) { - msgwin_status_add(_("Failed to execute the terminal program")); + ui_set_statusbar(TRUE, _("Failed to execute the terminal program")); } } } @@ -1960,7 +1960,7 @@ result = kill(*pid, SIGQUIT); if (result != 0) - msgwin_status_add(_("Process could not be stopped (%s)."), g_strerror(errno)); + ui_set_statusbar(TRUE, _("Process could not be stopped (%s)."), g_strerror(errno)); else { *pid = 0; @@ -1980,7 +1980,7 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); } else - ui_set_statusbar(_("No more build errors.")); + ui_set_statusbar(FALSE, _("No more build errors.")); } Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/callbacks.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -1312,7 +1312,7 @@ if (doc_list[idx].file_type == NULL) { - ui_set_statusbar(_("Please set the filetype for the current file before using this function.")); + ui_set_statusbar(FALSE, _("Please set the filetype for the current file before using this function.")); return; } @@ -1336,7 +1336,7 @@ if (! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) { - ui_set_statusbar(_("Please set the filetype for the current file before using this function.")); + ui_set_statusbar(FALSE, _("Please set the filetype for the current file before using this function.")); return; } @@ -1497,7 +1497,7 @@ else { utils_beep(); - msgwin_status_add( + ui_set_statusbar(TRUE, _("Date format string could not be converted (possibly too long).")); } } @@ -1797,7 +1797,7 @@ { if (! ui_tree_view_find_next(GTK_TREE_VIEW(msgwindow.tree_msg), msgwin_goto_messages_file_line)) - ui_set_statusbar(_("No more message items.")); + ui_set_statusbar(FALSE, _("No more message items.")); } @@ -2012,7 +2012,7 @@ if (! g_spawn_command_line_async(command, &error)) { - msgwin_status_add("Context action command failed: %s", error->message); + ui_set_statusbar(TRUE, "Context action command failed: %s", error->message); g_error_free(error); } } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/document.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -80,8 +80,6 @@ static gboolean delay_colourise = FALSE; -void msgwin_status_add_new(const gchar *format, ...) G_GNUC_PRINTF(1, 2); // temporary for v0.12 - static void document_undo_clear(gint idx); static void document_redo_add(gint idx, guint type, gpointer data); @@ -476,7 +474,7 @@ } notebook_remove_page(page_num); treeviews_remove_document(idx); - msgwin_status_add_new(_("File %s closed."), DOC_FILENAME(idx)); + msgwin_status_add(_("File %s closed."), DOC_FILENAME(idx)); g_free(doc_list[idx].encoding); g_free(doc_list[idx].saved_encoding.encoding); g_free(doc_list[idx].file_name); @@ -575,7 +573,7 @@ g_signal_emit_by_name(geany_object, "document-new", idx); } - msgwin_status_add_new(_("New file \"%s\" opened."), + msgwin_status_add(_("New file \"%s\" opened."), (doc_list[idx].file_name != NULL) ? doc_list[idx].file_name : GEANY_STRING_UNTITLED); return idx; @@ -741,7 +739,7 @@ if (g_stat(locale_filename, &st) != 0) { - msgwin_status_add(_("Could not open file %s (%s)"), utf8_filename, g_strerror(errno)); + ui_set_statusbar(TRUE, _("Could not open file %s (%s)"), utf8_filename, g_strerror(errno)); return FALSE; } @@ -749,7 +747,7 @@ if (! g_file_get_contents(locale_filename, &filedata->data, NULL, &err)) { - msgwin_status_add(err->message); + ui_set_statusbar(TRUE, err->message); g_error_free(err); return FALSE; } @@ -775,7 +773,7 @@ if (main_status.main_window_realized) dialogs_show_msgbox(GTK_MESSAGE_WARNING, warn_msg, utf8_filename); - msgwin_status_add(warn_msg, utf8_filename); + ui_set_statusbar(TRUE, warn_msg, utf8_filename); // set the file to read-only mode because saving it is probably dangerous filedata->readonly = TRUE; @@ -792,7 +790,7 @@ } else if (! handle_forced_encoding(filedata, forced_enc)) { - msgwin_status_add(_("The file \"%s\" is not valid %s."), utf8_filename, forced_enc); + ui_set_statusbar(TRUE, _("The file \"%s\" is not valid %s."), utf8_filename, forced_enc); utils_beep(); g_free(filedata->data); return FALSE; @@ -800,7 +798,7 @@ } else if (! handle_encoding(filedata)) { - msgwin_status_add( + ui_set_statusbar(TRUE, _("The file \"%s\" does not look like a text file or the file encoding is not supported."), utf8_filename); utils_beep(); @@ -910,7 +908,7 @@ // filename must not be NULL when opening a file if (filename == NULL) { - ui_set_statusbar(_("Invalid filename")); + ui_set_statusbar(FALSE, _("Invalid filename")); return -1; } @@ -970,7 +968,7 @@ gboolean use_tabs = detect_use_tabs(doc_list[idx].sci); if (use_tabs != editor_prefs.use_tabs) - msgwin_status_add(_("Setting %s indentation mode."), + ui_set_statusbar(TRUE, _("Setting %s indentation mode."), (use_tabs) ? _("Tabs") : _("Spaces")); document_set_use_tabs(idx, use_tabs); } @@ -1020,9 +1018,9 @@ g_signal_emit_by_name(geany_object, "document-open", idx); if (reload) - msgwin_status_add(_("File %s reloaded."), utf8_filename); + ui_set_statusbar(TRUE, _("File %s reloaded."), utf8_filename); else - msgwin_status_add_new(_("File %s opened(%d%s)."), + msgwin_status_add(_("File %s opened(%d%s)."), utf8_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)), (readonly) ? _(", read-only") : ""); @@ -1122,7 +1120,7 @@ #endif if (g_stat(locale_filename, &st) != 0) { - msgwin_status_add(_("Could not open file %s (%s)"), doc_list[idx].file_name, + ui_set_statusbar(TRUE, _("Could not open file %s (%s)"), doc_list[idx].file_name, g_strerror(errno)); g_free(locale_filename); return FALSE; @@ -1152,7 +1150,7 @@ if (doc_list[idx].file_name == NULL) { - msgwin_status_add(_("Error saving file.")); + ui_set_statusbar(TRUE, _("Error saving file.")); utils_beep(); return FALSE; } @@ -1227,7 +1225,7 @@ #endif if (fp == NULL) { - msgwin_status_add(_("Error saving file (%s)."), g_strerror(errno)); + ui_set_statusbar(TRUE, _("Error saving file (%s)."), g_strerror(errno)); utils_beep(); g_free(data); return FALSE; @@ -1239,7 +1237,7 @@ if (len != bytes_written) { - msgwin_status_add(_("Error saving file.")); + ui_set_statusbar(TRUE, _("Error saving file.")); utils_beep(); return FALSE; } @@ -1278,7 +1276,7 @@ tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); gtk_label_set_text(GTK_LABEL(doc_list[idx].tab_label), base_name); gtk_label_set_text(GTK_LABEL(doc_list[idx].tabmenu_label), base_name); - msgwin_status_add_new(_("File %s saved."), doc_list[idx].file_name); + msgwin_status_add(_("File %s saved."), doc_list[idx].file_name); ui_update_statusbar(idx, -1); g_free(base_name); #ifdef HAVE_VTE @@ -1342,7 +1340,7 @@ { if (! inc) { - ui_set_statusbar(_("\"%s\" was not found."), text); + ui_set_statusbar(FALSE, _("\"%s\" was not found."), text); } utils_beep(); sci_goto_pos(doc_list[idx].sci, start_pos, FALSE); // clear selection @@ -1396,7 +1394,7 @@ if ((selection_end == 0 && ! search_backwards) || (selection_end == sci_len && search_backwards)) { - ui_set_statusbar(_("\"%s\" was not found."), text); + ui_set_statusbar(FALSE, _("\"%s\" was not found."), text); utils_beep(); return -1; } @@ -1479,7 +1477,7 @@ if (count == 0) { - ui_set_statusbar(_("No matches found for \"%s\"."), find_text); + ui_set_statusbar(FALSE, _("No matches found for \"%s\"."), find_text); return; } @@ -1489,14 +1487,14 @@ { // escape special characters for showing escaped_find_text = g_strescape(find_text, NULL); escaped_replace_text = g_strescape(replace_text, NULL); - msgwin_status_add(_("%s: replaced %d occurrence(s) of \"%s\" with \"%s\"."), + ui_set_statusbar(TRUE, _("%s: replaced %d occurrence(s) of \"%s\" with \"%s\"."), filename, count, escaped_find_text, escaped_replace_text); g_free(escaped_find_text); g_free(escaped_replace_text); } else { - msgwin_status_add(_("%s: replaced %d occurrence(s) of \"%s\" with \"%s\"."), + ui_set_statusbar(TRUE, _("%s: replaced %d occurrence(s) of \"%s\" with \"%s\"."), filename, count, find_text, replace_text); } g_free(filename); @@ -2029,7 +2027,7 @@ } else { - msgwin_status_add(_("File %s printed."), doc_list[idx].file_name); + ui_set_statusbar(TRUE, _("File %s printed."), doc_list[idx].file_name); } #ifndef G_OS_WIN32 g_free(tmp_cmdline); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/geany.h 2007-10-24 10:52:48 UTC (rev 1971) @@ -100,7 +100,7 @@ GtkWidget *toolbar; GtkWidget *treeview_notebook; GtkWidget *notebook; - GtkWidget *statusbar; // use ui_set_statusbar() or msgwin_status_add() to set + GtkWidget *statusbar; // use ui_set_statusbar() to set GtkWidget *popup_menu; } GeanyApp; Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/keyfile.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -759,7 +759,7 @@ g_ptr_array_free(session_files, TRUE); if (failure) - msgwin_status_add(_("Failed to load one or more session files.")); + ui_set_statusbar(TRUE, _("Failed to load one or more session files.")); else if (session_notebook_page >= 0) { // exlicitly allow notebook switch page callback to be called for window title, Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/main.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -561,7 +561,7 @@ g_printerr(msg, filename); // also print to the terminal g_printerr("\n"); - msgwin_status_add(msg, filename); + ui_set_statusbar(TRUE, msg, filename); } g_free(filename); } @@ -705,9 +705,9 @@ #endif ui_create_recent_menu(); - msgwin_status_add(_("This is Geany %s."), VERSION); + ui_set_statusbar(TRUE, _("This is Geany %s."), VERSION); if (config_dir_result != 0) - msgwin_status_add(_("Configuration directory could not be created (%s)."), + ui_set_statusbar(TRUE, _("Configuration directory could not be created (%s)."), g_strerror(config_dir_result)); // apply all configuration options Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/msgwindow.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -291,27 +291,7 @@ /* Log a status message *without* setting the status bar. - * This is a temporary function for the plugin API for Geany 0.12. - * In future, msgwin_status_add() will act like this. */ -void msgwin_status_add_new(const gchar *format, ...) -{ - gchar string[512]; - va_list args; - gboolean suppress; - - va_start(args, format); - g_vsnprintf(string, 512, format, args); - va_end(args); - - // hack to prevent setting the status bar - suppress = prefs.suppress_status_messages; - prefs.suppress_status_messages = TRUE; - msgwin_status_add("%s", string); - prefs.suppress_status_messages = suppress; -} - - -// logs a status message (use ui_set_statusbar() to just display text on the statusbar) + * (Use ui_set_statusbar() to display text on the statusbar) */ void msgwin_status_add(const gchar *format, ...) { GtkTreeIter iter; @@ -324,10 +304,6 @@ g_vsnprintf(string, 512, format, args); va_end(args); - // display status message in status bar - if (! prefs.suppress_status_messages) - ui_set_statusbar("%s", string); - // add a timestamp to status messages time_str = utils_get_current_time_string(); if (time_str == NULL) Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/plugins.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -139,28 +139,10 @@ &utils_remove_ext_from_filename }; - -/* This is a temporary function for the plugin API for Geany 0.12. - * In future, ui_set_statusbar() will act like this. */ -static void plugin_ui_set_statusbar(gboolean log, const gchar *format, ...) -{ - gchar string[512]; - va_list args; - - va_start(args, format); - g_vsnprintf(string, 512, format, args); - va_end(args); - - if (log) - msgwin_status_add("%s", string); // currently does both - else - ui_set_statusbar("%s", string); -} - static UIUtilsFuncs uiutils_funcs = { &ui_dialog_vbox_new, &ui_frame_new_with_alignment, - &plugin_ui_set_statusbar + &ui_set_statusbar }; static DialogFuncs dialog_funcs = { @@ -173,15 +155,11 @@ &lookup_widget }; - -void msgwin_status_add_new(const gchar *format, ...) G_GNUC_PRINTF(1, 2); // temporary for v0.12 - static MsgWinFuncs msgwin_funcs = { - &msgwin_status_add_new, + &msgwin_status_add, &msgwin_compiler_add_fmt }; - static EncodingFuncs encoding_funcs = { &encodings_convert_to_utf8, &encodings_convert_to_utf8_from_charset Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/project.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -280,7 +280,7 @@ /// TODO handle open project files write_config(); - msgwin_status_add(_("Project \"%s\" closed."), app->project->name); + ui_set_statusbar(TRUE, _("Project \"%s\" closed."), app->project->name); g_free(app->project->name); g_free(app->project->description); @@ -610,9 +610,9 @@ } write_config(); if (new_project) - msgwin_status_add(_("Project \"%s\" created."), p->name); + ui_set_statusbar(TRUE, _("Project \"%s\" created."), p->name); else - msgwin_status_add(_("Project \"%s\" saved."), p->name); + ui_set_statusbar(TRUE, _("Project \"%s\" saved."), p->name); return TRUE; } @@ -759,14 +759,14 @@ if (load_config(locale_file_name)) { - msgwin_status_add(_("Project \"%s\" opened."), app->project->name); + ui_set_statusbar(TRUE, _("Project \"%s\" opened."), app->project->name); return TRUE; } else { gchar *utf8_filename = utils_get_utf8_from_locale(locale_file_name); - msgwin_status_add(_("Project file \"%s\" could not be loaded."), utf8_filename); + ui_set_statusbar(TRUE, _("Project file \"%s\" could not be loaded."), utf8_filename); g_free(utf8_filename); } return FALSE; Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/search.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -873,9 +873,9 @@ gint count = search_mark(idx, search_data.text, search_data.flags); if (count == 0) - ui_set_statusbar(_("No matches found for \"%s\"."), search_data.text); + ui_set_statusbar(FALSE, _("No matches found for \"%s\"."), search_data.text); else - ui_set_statusbar(_("Found %d matches for \"%s\"."), count, + ui_set_statusbar(FALSE, _("Found %d matches for \"%s\"."), count, search_data.text); } break; @@ -994,7 +994,7 @@ if (document_replace_all(ix, find, replace, search_flags_re, search_replace_escape_re)) count++; } - ui_set_statusbar(_("Replaced text in %u files."), count); + ui_set_statusbar(FALSE, _("Replaced text in %u files."), count); // show which docs had replacements: gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_STATUS); @@ -1095,7 +1095,7 @@ lookup_widget(widgets.find_in_files_dialog, "entry_extra")))); if (utf8_dir == NULL || utils_str_equal(utf8_dir, "")) - ui_set_statusbar(_("Invalid directory for find in files.")); + ui_set_statusbar(FALSE, _("Invalid directory for find in files.")); else if (search_text && *search_text) { gchar *locale_dir; @@ -1113,7 +1113,7 @@ g_string_free(opts, TRUE); } else - ui_set_statusbar(_("No text to find.")); + ui_set_statusbar(FALSE, _("No text to find.")); } else gtk_widget_hide(widgets.find_in_files_dialog); @@ -1134,7 +1134,7 @@ if (! g_file_test(prefs.tools_grep_cmd, G_FILE_TEST_IS_EXECUTABLE)) { - msgwin_status_add(_("Cannot execute grep tool '%s';" + ui_set_statusbar(TRUE, _("Cannot execute grep tool '%s';" " check the path setting in Preferences."), prefs.tools_grep_cmd); return FALSE; } @@ -1185,7 +1185,7 @@ NULL, &stdout_fd, NULL, &error)) { geany_debug("%s: g_spawn_async_with_pipes() failed: %s", __func__, error->message); - msgwin_status_add(_("Process failed (%s)"), error->message); + ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); g_error_free(error); ret = FALSE; } @@ -1227,7 +1227,7 @@ list = utils_get_file_list(dir, &list_len, &error); if (error) { - msgwin_status_add(_("Could not open directory (%s)"), error->message); + ui_set_statusbar(TRUE, _("Could not open directory (%s)"), error->message); g_error_free(error); return NULL; } @@ -1289,7 +1289,7 @@ msgwin_msg_add_fmt(COLOR_BLUE, -1, -1, _("Search completed with %d matches."), count); - ui_set_statusbar(_("Search completed with %d matches."), count); + ui_set_statusbar(FALSE, _("Search completed with %d matches."), count); break; } case 1: @@ -1297,7 +1297,7 @@ color = COLOR_BLUE; default: msgwin_msg_add(color, -1, -1, msg); - ui_set_statusbar("%s", msg); + ui_set_statusbar(FALSE, "%s", msg); break; } } @@ -1374,14 +1374,14 @@ if (! found) // no matches were found { - ui_set_statusbar(_("No matches found for \"%s\"."), search_text); + ui_set_statusbar(FALSE, _("No matches found for \"%s\"."), search_text); msgwin_msg_add_fmt(COLOR_BLUE, -1, -1, _("No matches found for \"%s\"."), search_text); } else { gint count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(msgwindow.store_msg), NULL); - ui_set_statusbar(_("Found %d matches for \"%s\"."), count, search_text); + ui_set_statusbar(FALSE, _("Found %d matches for \"%s\"."), count, search_text); msgwin_msg_add_fmt(COLOR_BLUE, -1, -1, _("Found %d matches for \"%s\"."), count, search_text); } Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/symbols.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -950,9 +950,9 @@ ft = detect_global_tags_filetype(utf8_fname); if (ft != NULL && tm_workspace_load_global_tags(fname, ft->lang)) - msgwin_status_add(_("Loaded %s tags file '%s'."), ft->name, utf8_fname); + ui_set_statusbar(TRUE, _("Loaded %s tags file '%s'."), ft->name, utf8_fname); else - msgwin_status_add(_("Could not load tags file '%s'."), utf8_fname); + ui_set_statusbar(TRUE, _("Could not load tags file '%s'."), utf8_fname); g_free(utf8_fname); g_free(fname); @@ -1068,9 +1068,9 @@ // if we are here, there was no match and we are beeping ;-) utils_beep(); if (type == forward_types) - ui_set_statusbar(_("Forward declaration \"%s\" not found."), name); + ui_set_statusbar(FALSE, _("Forward declaration \"%s\" not found."), name); else - ui_set_statusbar(_("Definition of \"%s\" not found."), name); + ui_set_statusbar(FALSE, _("Definition of \"%s\" not found."), name); return FALSE; } Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/tools.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -163,7 +163,7 @@ return; argv = g_strsplit(command, " ", -1); - msgwin_status_add(_("Passing data and executing custom command: %s"), command); + ui_set_statusbar(TRUE, _("Passing data and executing custom command: %s"), command); if (g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &pid, &stdin_fd, &stdout_fd, &stderr_fd, &error)) Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/ui_utils.c 2007-10-24 10:52:48 UTC (rev 1971) @@ -74,6 +74,9 @@ GTimeVal timeval; const gint GEANY_STATUS_TIMEOUT = 1; + if (! prefs.statusbar_visible) + return; // just do nothing if statusbar is not visible + g_get_current_time(&timeval); if (! allow_override) @@ -91,24 +94,22 @@ } -/* Display text on the statusbar or log it to the Status window if - * prefs.suppress_status_messages is set */ -void ui_set_statusbar(const gchar *format, ...) +/* Display text on the statusbar. + * log is whether the message should be recorded in the Status window. */ +void ui_set_statusbar(gboolean log, const gchar *format, ...) { gchar string[512]; va_list args; - if (! prefs.statusbar_visible) - return; // just do nothing if statusbar is not visible - va_start(args, format); g_vsnprintf(string, 512, format, args); va_end(args); - if (prefs.suppress_status_messages) + if (! prefs.suppress_status_messages) + set_statusbar(string, FALSE); + + if (log || prefs.suppress_status_messages) msgwin_status_add("%s", string); - else - set_statusbar(string, FALSE); } @@ -256,7 +257,7 @@ } pango_font_description_free(font_desc); - msgwin_status_add(_("Font updated (%s)."), prefs.editor_font); + ui_set_statusbar(TRUE, _("Font updated (%s)."), prefs.editor_font); g_free(fname); } Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2007-10-23 15:23:08 UTC (rev 1970) +++ trunk/src/ui_utils.h 2007-10-24 10:52:48 UTC (rev 1971) @@ -102,8 +102,7 @@ void ui_init(); -// Display text on the statusbar without logging it to the Status window. -void ui_set_statusbar(const gchar *format, ...) G_GNUC_PRINTF (1, 2); +void ui_set_statusbar(gboolean log, const gchar *format, ...) G_GNUC_PRINTF (2, 3); void ui_update_statusbar(gint idx, gint pos); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1970] trunk/src/search.c
by ntrel＠users.sourceforge.net 23 Oct '07

23 Oct '07

Revision: 1970 http://geany.svn.sourceforge.net/geany/?rev=1970&view=rev Author: ntrel Date: 2007-10-23 08:23:08 -0700 (Tue, 23 Oct 2007) Log Message: ----------- Remove unused variable. Modified Paths: -------------- trunk/src/search.c Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2007-10-23 15:20:38 UTC (rev 1969) +++ trunk/src/search.c 2007-10-23 15:23:08 UTC (rev 1970) @@ -1126,7 +1126,7 @@ gchar **argv_prefix, **argv, **opts_argv; guint opts_argv_len, i; GPid child_pid; - gint stdout_fd, stdin_fd; + gint stdout_fd; GError *error = NULL; gboolean ret = FALSE; @@ -1182,7 +1182,7 @@ if (! g_spawn_async_with_pipes(dir, (gchar**)argv, NULL, G_SPAWN_STDERR_TO_DEV_NULL | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &child_pid, - &stdin_fd, &stdout_fd, NULL, &error)) + NULL, &stdout_fd, NULL, &error)) { geany_debug("%s: g_spawn_async_with_pipes() failed: %s", __func__, error->message); msgwin_status_add(_("Process failed (%s)"), error->message); @@ -1287,7 +1287,8 @@ gint count = gtk_tree_model_iter_n_children( GTK_TREE_MODEL(msgwindow.store_msg), NULL) - 1; - msgwin_msg_add_fmt(COLOR_BLUE, -1, -1, _("Search completed with %d matches."), count); + msgwin_msg_add_fmt(COLOR_BLUE, -1, -1, + _("Search completed with %d matches."), count); ui_set_statusbar(_("Search completed with %d matches."), count); break; } 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 2007