Commits November 2008

commits@lists.geany.org

4 participants
134 discussions

SF.net SVN: geany:[3258] trunk
by ntrel＠users.sourceforge.net 20 Nov '08

20 Nov '08

Revision: 3258 http://geany.svn.sourceforge.net/geany/?rev=3258&view=rev Author: ntrel Date: 2008-11-20 16:52:46 +0000 (Thu, 20 Nov 2008) Log Message: ----------- Use radio buttons for symbol list popup menu sort items. Modified Paths: -------------- trunk/ChangeLog trunk/src/documentprivate.h trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-19 18:41:37 UTC (rev 3257) +++ trunk/ChangeLog 2008-11-20 16:52:46 UTC (rev 3258) @@ -1,3 +1,9 @@ +2008-11-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/documentprivate.h, src/symbols.c: + Use radio buttons for symbol list popup menu sort items. + + 2008-11-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/search.c: Modified: trunk/src/documentprivate.h =================================================================== --- trunk/src/documentprivate.h 2008-11-19 18:41:37 UTC (rev 3257) +++ trunk/src/documentprivate.h 2008-11-20 16:52:46 UTC (rev 3258) @@ -66,6 +66,7 @@ FileEncoding saved_encoding; gboolean colourise_needed; /* use document.c:queue_colourise() instead */ gint line_count; /* Number of lines in the document. */ + gint symbol_list_sort_mode; } GeanyDocumentPrivate; Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-11-19 18:41:37 UTC (rev 3257) +++ trunk/src/symbols.c 2008-11-20 16:52:46 UTC (rev 3258) @@ -91,7 +91,14 @@ static GPtrArray *top_level_iter_names = NULL; +static struct +{ + GtkWidget *sort_by_name; + GtkWidget *sort_by_appearance; +} +symbol_menu = {NULL, NULL}; + static void html_tags_loaded(void); static void load_user_tags(filetype_id ft_id); @@ -1169,6 +1176,7 @@ prev_sort_mode = sort_mode; sort_tree(doc->priv->tag_store, sort_mode == SYMBOLS_SORT_BY_NAME); + doc->priv->symbol_list_sort_mode = sort_mode; /* Re-attach model to view */ gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), @@ -1662,34 +1670,60 @@ } -static void on_taglist_tree_popup_clicked(GtkMenuItem *menuitem, gpointer user_data) +static void on_symbol_tree_sort_clicked(GtkMenuItem *menuitem, gpointer user_data) { gint sort_mode = GPOINTER_TO_INT(user_data); GeanyDocument *doc = document_get_current(); + if (ignore_callback) + return; + if (doc != NULL) doc->has_tags = symbols_recreate_tag_list(doc, sort_mode); } +static void on_symbol_tree_menu_show(GtkWidget *widget, + gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + if (!doc) + return; + + ignore_callback = TRUE; + + if (doc->priv->symbol_list_sort_mode == SYMBOLS_SORT_BY_NAME) + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(symbol_menu.sort_by_name), TRUE); + else + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(symbol_menu.sort_by_appearance), TRUE); + + ignore_callback = FALSE; +} + + static void create_taglist_popup_menu(void) { - GtkWidget *item; + GtkWidget *item, *menu; - tv.popup_taglist = gtk_menu_new(); + tv.popup_taglist = menu = gtk_menu_new(); - item = gtk_menu_item_new_with_mnemonic(_("Sort by _Name")); + symbol_menu.sort_by_name = item = gtk_radio_menu_item_new_with_mnemonic(NULL, + _("Sort by _Name")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); - g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), + g_signal_connect(item, "activate", G_CALLBACK(on_symbol_tree_sort_clicked), GINT_TO_POINTER(SYMBOLS_SORT_BY_NAME)); - item = gtk_menu_item_new_with_mnemonic(_("Sort by _Appearance")); + symbol_menu.sort_by_appearance = item = gtk_radio_menu_item_new_with_mnemonic_from_widget( + GTK_RADIO_MENU_ITEM(item), _("Sort by _Appearance")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item); - g_signal_connect(item, "activate", G_CALLBACK(on_taglist_tree_popup_clicked), + g_signal_connect(item, "activate", G_CALLBACK(on_symbol_tree_sort_clicked), GINT_TO_POINTER(SYMBOLS_SORT_BY_APPEARANCE)); + g_signal_connect(menu, "show", G_CALLBACK(on_symbol_tree_menu_show), NULL); + sidebar_add_common_menu_items(GTK_MENU(tv.popup_taglist)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3257] trunk
by eht16＠users.sourceforge.net 19 Nov '08

19 Nov '08

Revision: 3257 http://geany.svn.sourceforge.net/geany/?rev=3257&view=rev Author: eht16 Date: 2008-11-19 18:41:37 +0000 (Wed, 19 Nov 2008) Log Message: ----------- Fix broken LaTeX view commands (closes #2315014). Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-19 18:04:16 UTC (rev 3256) +++ trunk/ChangeLog 2008-11-19 18:41:37 UTC (rev 3257) @@ -8,6 +8,8 @@ * geany.nsi: Properly support silent installations with the Windows installer (closes #2204671). + * src/build.c: + Fix broken LaTeX view commands (closes #2315014). 2008-11-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2008-11-19 18:04:16 UTC (rev 3256) +++ trunk/src/build.c 2008-11-19 18:41:37 UTC (rev 3257) @@ -232,7 +232,7 @@ g_strfreev(term_argv); return (GPid) 1; } - g_free(working_dir); + g_free(script_name); argv = g_new0(gchar *, term_argv_len + 3); for (i = 0; i < term_argv_len; i++) @@ -244,28 +244,27 @@ if (strstr(argv[0], "cmd.exe") != NULL) { argv[term_argv_len ] = g_strdup("/Q /C"); - argv[term_argv_len + 1] = script_name; + argv[term_argv_len + 1] = g_strconcat("/bin/sh ", RUN_SCRIPT_CMD, NULL); } else { - argv[term_argv_len ] = script_name; + argv[term_argv_len ] = g_strconcat("/bin/sh ", RUN_SCRIPT_CMD, NULL); argv[term_argv_len + 1] = NULL; } #else argv[term_argv_len ] = g_strdup("-e"); - argv[term_argv_len + 1] = script_name; + argv[term_argv_len + 1] = g_strconcat("/bin/sh ", RUN_SCRIPT_CMD, NULL); #endif argv[term_argv_len + 2] = NULL; - - if (! g_spawn_async(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, + if (! g_spawn_async(working_dir, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &(run_info.pid), &error)) { geany_debug("g_spawn_async() failed: %s", error->message); ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); - utils_free_pointers(6, executable, view_file, locale_filename, cmd_string, locale_cmd_string, - locale_term_cmd, NULL); + utils_free_pointers(7, executable, view_file, locale_filename, cmd_string, + locale_cmd_string, locale_term_cmd, working_dir, NULL); g_strfreev(argv); g_strfreev(term_argv); g_error_free(error); @@ -280,8 +279,8 @@ build_menu_update(doc); } - utils_free_pointers(6, executable, view_file, locale_filename, cmd_string, locale_cmd_string, - locale_term_cmd, NULL); + utils_free_pointers(7, executable, view_file, locale_filename, cmd_string, + locale_cmd_string, locale_term_cmd, working_dir, NULL); g_strfreev(argv); g_strfreev(term_argv); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3256] trunk/ChangeLog
by eht16＠users.sourceforge.net 19 Nov '08

19 Nov '08

Revision: 3256 http://geany.svn.sourceforge.net/geany/?rev=3256&view=rev Author: eht16 Date: 2008-11-19 18:04:16 +0000 (Wed, 19 Nov 2008) Log Message: ----------- Oops, forgot the ChangeLog Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-19 18:03:32 UTC (rev 3255) +++ trunk/ChangeLog 2008-11-19 18:04:16 UTC (rev 3256) @@ -5,6 +5,9 @@ command was killed externally. Fix wrong encoding handling when the chosen encoding was UTF-8 and properly skip any conversions in this case. + * geany.nsi: + Properly support silent installations with the Windows installer + (closes #2204671). 2008-11-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3255] trunk/geany.nsi
by eht16＠users.sourceforge.net 19 Nov '08

19 Nov '08

Revision: 3255 http://geany.svn.sourceforge.net/geany/?rev=3255&view=rev Author: eht16 Date: 2008-11-19 18:03:32 +0000 (Wed, 19 Nov 2008) Log Message: ----------- Properly support silent installations with the Windows installer (closes #2204671). Modified Paths: -------------- trunk/geany.nsi Modified: trunk/geany.nsi =================================================================== --- trunk/geany.nsi 2008-11-19 17:32:24 UTC (rev 3254) +++ trunk/geany.nsi 2008-11-19 18:03:32 UTC (rev 3255) @@ -20,7 +20,11 @@ !define RESOURCEDIR "geany-${PRODUCT_VERSION}" SetCompressor /SOLID lzma + XPStyle on +; set execution level for Windows Vista +RequestExecutionLevel user + Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" InstallDir "$PROGRAMFILES\Geany" @@ -51,23 +55,33 @@ ; Init code ; ;;;;;;;;;;;;;;;; Function .onInit + SetShellVarContext all + ; prevent running multiple instances of the installer System::Call 'kernel32::CreateMutexA(i 0, i 0, t "geany_installer") i .r1 ?e' Pop $R0 StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." + MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK Abort ; warn about a new install over an existing installation ReadRegStr $R0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" StrCmp $R0 "" done MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "Geany has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?" \ - IDNO done + "Geany has already been installed. $\nDo you want to remove the previous version before installing $(^Name) ?" \ + /SD IDYES IDYES remove IDNO done + remove: ;Run the uninstaller ClearErrors - ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file + IfSilent dosilent nonsilent + dosilent: + ;TODO read $INSTDIR from registry, the instdir of the old installation might be different + ; from the new one (command line arg /D=...) + ExecWait '$R0 /S _?=$INSTDIR' ;Do not copy the uninstaller to a temp file + Goto done + nonsilent: + ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file done: FunctionEnd @@ -258,11 +272,11 @@ ;;;;;;;;;;;;;;;;;;;;; Function un.onUninstSuccess HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK FunctionEnd Function un.onInit - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2 Abort FunctionEnd @@ -276,7 +290,7 @@ notPossible: RMDir "$INSTDIR" ; removes folder if empty - MessageBox MB_OK "The given directory is not writeable. Please choose another one!" + MessageBox MB_OK "The given directory is not writeable. Please choose another one!" /SD IDOK Abort possible: FileClose $0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3254] trunk
by eht16＠users.sourceforge.net 19 Nov '08

19 Nov '08

Revision: 3254 http://geany.svn.sourceforge.net/geany/?rev=3254&view=rev Author: eht16 Date: 2008-11-19 17:32:24 +0000 (Wed, 19 Nov 2008) Log Message: ----------- Fix wrong encoding handling when the chosen encoding was UTF-8 and properly skip any conversions in this case. Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-19 17:31:54 UTC (rev 3253) +++ trunk/ChangeLog 2008-11-19 17:32:24 UTC (rev 3254) @@ -3,6 +3,8 @@ * src/search.c: Rework search_close_pid() and let it handle the case when the grep command was killed externally. + Fix wrong encoding handling when the chosen encoding was UTF-8 and + properly skip any conversions in this case. 2008-11-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-11-19 17:31:54 UTC (rev 3253) +++ trunk/src/search.c 2008-11-19 17:32:24 UTC (rev 3254) @@ -1374,15 +1374,24 @@ utf8_msg = NULL; g_strstrip(msg); - if (! g_utf8_validate(msg, -1, NULL)) + /* enc is NULL when encoding is set to UTF-8, so we can skip any conversion */ + if (enc != NULL) { - utf8_msg = g_convert(msg, -1, "UTF-8", enc, NULL, NULL, NULL); + if (! g_utf8_validate(msg, -1, NULL)) + { + utf8_msg = g_convert(msg, -1, "UTF-8", enc, NULL, NULL, NULL); + } + if (utf8_msg == NULL) + utf8_msg = msg; } - if (utf8_msg == NULL) - utf8_msg = g_strdup(msg); + else + utf8_msg = msg; + msgwin_msg_add(COLOR_BLACK, -1, NULL, utf8_msg); + + if (utf8_msg != msg) + g_free(utf8_msg); g_free(msg); - g_free(utf8_msg); } } if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) @@ -1404,15 +1413,24 @@ utf8_msg = NULL; g_strstrip(msg); - if (! g_utf8_validate(msg, -1, NULL)) + /* enc is NULL when encoding is set to UTF-8, so we can skip any conversion */ + if (enc != NULL) { - utf8_msg = g_convert(msg, -1, "UTF-8", enc, NULL, NULL, NULL); + if (! g_utf8_validate(msg, -1, NULL)) + { + utf8_msg = g_convert(msg, -1, "UTF-8", enc, NULL, NULL, NULL); + } + if (utf8_msg == NULL) + utf8_msg = msg; } - if (utf8_msg == NULL) - utf8_msg = g_strdup(msg); + else + utf8_msg = msg; + g_warning("Find in Files: %s", utf8_msg); + + if (utf8_msg != msg) + g_free(utf8_msg); g_free(msg); - g_free(utf8_msg); } } if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3253] trunk
by eht16＠users.sourceforge.net 19 Nov '08

19 Nov '08

Revision: 3253 http://geany.svn.sourceforge.net/geany/?rev=3253&view=rev Author: eht16 Date: 2008-11-19 17:31:54 +0000 (Wed, 19 Nov 2008) Log Message: ----------- Rework search_close_pid() and let it handle the case when the grep command was killed externally. Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-18 23:12:23 UTC (rev 3252) +++ trunk/ChangeLog 2008-11-19 17:31:54 UTC (rev 3253) @@ -1,3 +1,10 @@ +2008-11-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/search.c: + Rework search_close_pid() and let it handle the case when the grep + command was killed externally. + + 2008-11-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/notebook.c: Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-11-18 23:12:23 UTC (rev 3252) +++ trunk/src/search.c 2008-11-19 17:31:54 UTC (rev 3253) @@ -1428,34 +1428,39 @@ #ifdef G_OS_UNIX const gchar *msg = _("Search failed (see Help->Debug Messages for details)."); gint color = COLOR_DARK_RED; + gint exit_status = 1; if (WIFEXITED(status)) { - switch (WEXITSTATUS(status)) + exit_status = WEXITSTATUS(status); + } + else if (WIFSIGNALED(status)) + { + exit_status = -1; + g_warning("Find in Files: The command failed unexpectedly (signal received)."); + } + + switch (exit_status) + { + case 0: { - case 0: - { - gint count = gtk_tree_model_iter_n_children( - GTK_TREE_MODEL(msgwindow.store_msg), NULL) - 1; + gint count = gtk_tree_model_iter_n_children( + GTK_TREE_MODEL(msgwindow.store_msg), NULL) - 1; + gchar *text = ngettext( + "Search completed with %d match.", + "Search completed with %d matches.", count); - msgwin_msg_add_fmt(COLOR_BLUE, -1, NULL, - ngettext("Search completed with %d match.", - "Search completed with %d matches.", count), - count); - ui_set_statusbar(FALSE, - ngettext("Search completed with %d match.", - "Search completed with %d matches.", count), - count); - break; - } - case 1: - msg = _("No matches found."); - color = COLOR_BLUE; - default: - msgwin_msg_add(color, -1, NULL, msg); - ui_set_statusbar(FALSE, "%s", msg); - break; + msgwin_msg_add_fmt(COLOR_BLUE, -1, NULL, text, count); + ui_set_statusbar(FALSE, text, count); + break; } + case 1: + msg = _("No matches found."); + color = COLOR_BLUE; + default: + msgwin_msg_add(color, -1, NULL, msg); + ui_set_statusbar(FALSE, "%s", msg); + break; } #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3252] trunk/po
by frlan＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3252 http://geany.svn.sourceforge.net/geany/?rev=3252&view=rev Author: frlan Date: 2008-11-18 23:12:23 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Update of Swedish translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/sv.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-11-18 20:14:58 UTC (rev 3251) +++ trunk/po/ChangeLog 2008-11-18 23:12:23 UTC (rev 3252) @@ -1,3 +1,8 @@ +2008-11-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * sv.po: Update of Swedish translation (Thanks to Tony Mattsson). + + 2008-11-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * hu.po: Corrected a little typo in Hungarian translation. Thanks to Modified: trunk/po/sv.po =================================================================== --- trunk/po/sv.po 2008-11-18 20:14:58 UTC (rev 3251) +++ trunk/po/sv.po 2008-11-18 23:12:23 UTC (rev 3252) @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: Geany 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-14 00:33+0200\n" -"PO-Revision-Date: 2008-10-14 00:34+0100\n" -"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" +"POT-Creation-Date: 2008-11-19 00:08+0100\n" +"PO-Revision-Date: 2008-11-18 13:50+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" "Content-Type: text/plain; charset=utf-8\n" @@ -20,7 +20,7 @@ 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:291 ../src/interface.c:1744 +#: ../geany.desktop.in.h:2 ../src/interface.c:297 ../src/interface.c:1785 msgid "Geany" msgstr "Geany" @@ -117,7 +117,7 @@ msgstr "Misslyckades exekvera \"%s\" (start-skriptet kunde inte skapas)" #: ../src/build.c:265 ../src/build.c:497 ../src/build.c:805 -#: ../src/search.c:1230 +#: ../src/search.c:1295 #, c-format msgid "Process failed (%s)" msgstr "Processen misslyckades (%s)" @@ -166,7 +166,7 @@ msgstr "Kompilera aktuell fil" #. build the code -#: ../src/build.c:1051 ../src/interface.c:992 +#: ../src/build.c:1051 ../src/interface.c:998 msgid "_Build" msgstr "Bygg" @@ -210,7 +210,7 @@ msgid "_Previous Error" msgstr "Föregående fel" -#: ../src/build.c:1124 ../src/interface.c:1154 +#: ../src/build.c:1124 ../src/interface.c:1184 msgid "Run or view the current file" msgstr "Kör eller visa filen" @@ -323,7 +323,7 @@ msgid "Build:" msgstr "Bygg:" -#: ../src/build.c:1593 ../src/dialogs.c:1242 +#: ../src/build.c:1593 ../src/dialogs.c:1215 msgid "Execute:" msgstr "Exekvera:" @@ -355,59 +355,67 @@ msgid "Do you really want to quit?" msgstr "Vill du verkligen avsluta?" -#: ../src/callbacks.c:460 ../src/document.c:2537 ../src/interface.c:365 -#: ../src/treeviews.c:454 +#: ../src/callbacks.c:462 ../src/document.c:2588 ../src/interface.c:371 +#: ../src/treeviews.c:455 msgid "_Reload" msgstr "Ladda om" -#: ../src/callbacks.c:461 +#: ../src/callbacks.c:463 msgid "Any unsaved changes will be lost." msgstr "Alla osparade ändringar kommer att förloras." -#: ../src/callbacks.c:462 +#: ../src/callbacks.c:464 #, 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:1287 ../src/callbacks.c:1312 +#: ../src/callbacks.c:1178 ../src/keybindings.c:348 +msgid "Go to Line" +msgstr "Gå till rad" + +#: ../src/callbacks.c:1178 +msgid "Enter the line you want to go to:" +msgstr "Skriv in radnumret till den rad du vill gå till" + +#: ../src/callbacks.c:1295 ../src/callbacks.c:1320 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:1423 ../src/ui_utils.c:516 +#: ../src/callbacks.c:1431 ../src/ui_utils.c:516 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1425 ../src/ui_utils.c:517 +#: ../src/callbacks.c:1433 ../src/ui_utils.c:517 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1427 ../src/ui_utils.c:518 +#: ../src/callbacks.c:1435 ../src/ui_utils.c:518 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1429 ../src/ui_utils.c:527 +#: ../src/callbacks.c:1437 ../src/ui_utils.c:527 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1431 ../src/ui_utils.c:528 +#: ../src/callbacks.c:1439 ../src/ui_utils.c:528 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1433 ../src/ui_utils.c:529 +#: ../src/callbacks.c:1441 ../src/ui_utils.c:529 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1435 ../src/ui_utils.c:538 +#: ../src/callbacks.c:1443 ../src/ui_utils.c:538 msgid "_Use Custom Date Format" msgstr "Använd användardefinierat datumformat" -#: ../src/callbacks.c:1446 +#: ../src/callbacks.c:1454 msgid "Custom Date Format" msgstr "Användardefinierat datumformat" -#: ../src/callbacks.c:1447 +#: ../src/callbacks.c:1455 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." @@ -415,24 +423,24 @@ "Skriv in användardefinierat datum- och tidsformat. Du kan använda den syntax " "som specificeras av ANSI C:s strftime funktion." -#: ../src/callbacks.c:1466 +#: ../src/callbacks.c:1474 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:1748 ../src/callbacks.c:1758 +#: ../src/callbacks.c:1756 ../src/callbacks.c:1766 msgid "No more message items." msgstr "Inga fler meddelanden." #. initialize the dialog -#: ../src/dialogs.c:178 ../src/prefs.c:1689 +#: ../src/dialogs.c:177 ../src/prefs.c:1699 msgid "Open File" msgstr "Öppna fil" -#: ../src/dialogs.c:182 ../src/interface.c:718 +#: ../src/dialogs.c:181 ../src/interface.c:724 msgid "_View" msgstr "Visa" -#: ../src/dialogs.c:185 +#: ../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." @@ -440,24 +448,24 @@ "Öppnar filen i skrivskyddat läge. Om du väljer fler filer, kommer alla " "öppnas i skrivskyddat läge." -#: ../src/dialogs.c:220 +#: ../src/dialogs.c:222 msgid "Detect by file extension" msgstr "Upptäck från filändelse" -#: ../src/dialogs.c:231 ../src/interface.c:3697 +#: ../src/dialogs.c:233 ../src/interface.c:3755 msgid "Detect from file" msgstr "Upptäck från fil" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:295 +#: ../src/dialogs.c:296 msgid "Show _hidden files" msgstr "Visa gömda filer" -#: ../src/dialogs.c:306 +#: ../src/dialogs.c:307 msgid "Set encoding:" msgstr "Välj teckenkodning:" -#: ../src/dialogs.c:316 +#: ../src/dialogs.c:317 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 " @@ -471,11 +479,11 @@ "Notera att om du öppnar många filer, kommer alla öppnas med vald " "teckenkodning." -#: ../src/dialogs.c:336 +#: ../src/dialogs.c:337 msgid "Set filetype:" msgstr "Ange filtyp:" -#: ../src/dialogs.c:346 +#: ../src/dialogs.c:347 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -485,7 +493,7 @@ "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:451 ../plugins/export.c:333 +#: ../src/dialogs.c:452 ../plugins/export.c:334 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Filen '%s' finns redan. Vill du skriva över den?" @@ -498,47 +506,39 @@ msgid "R_ename" msgstr "Byt namn" -#: ../src/dialogs.c:487 +#: ../src/dialogs.c:486 msgid "Save the file and rename it." msgstr "Spara och byt namn på filen." -#: ../src/dialogs.c:495 +#: ../src/dialogs.c:494 msgid "_Open file in a new tab" msgstr "Öppna filen i en ny flik" -#: ../src/dialogs.c:497 +#: ../src/dialogs.c:496 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:673 +#: ../src/dialogs.c:672 msgid "_Don't save" msgstr "Spara _inte" -#: ../src/dialogs.c:707 +#: ../src/dialogs.c:706 #, c-format msgid "The file '%s' is not saved." msgstr "Filen '%s' är inte sparad." -#: ../src/dialogs.c:709 +#: ../src/dialogs.c:708 msgid "Do you want to save it before closing?" msgstr "Vill du spara innan du stänger?" -#: ../src/dialogs.c:784 +#: ../src/dialogs.c:783 msgid "Choose font" msgstr "Välj font" -#: ../src/dialogs.c:972 ../src/keybindings.c:348 -msgid "Go to Line" -msgstr "Gå till rad" - -#: ../src/dialogs.c:979 -msgid "Enter the line you want to go to:" -msgstr "Skriv in radnumret till den rad du vill hoppa till" - -#: ../src/dialogs.c:1026 +#: ../src/dialogs.c:999 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -546,106 +546,106 @@ "Ett fel inträffade, eller så kunde inte fil-informationen hämtas (exempelvis " "från en ny fil)." -#: ../src/dialogs.c:1045 ../src/dialogs.c:1046 ../src/dialogs.c:1047 -#: ../src/dialogs.c:1053 ../src/dialogs.c:1054 ../src/dialogs.c:1055 -#: ../src/symbols.c:1388 ../src/symbols.c:1409 ../src/symbols.c:1461 +#: ../src/dialogs.c:1018 ../src/dialogs.c:1019 ../src/dialogs.c:1020 +#: ../src/dialogs.c:1026 ../src/dialogs.c:1027 ../src/dialogs.c:1028 +#: ../src/symbols.c:1585 ../src/symbols.c:1606 ../src/symbols.c:1658 #: ../src/ui_utils.c:195 msgid "unknown" msgstr "okänd" -#: ../src/dialogs.c:1059 +#: ../src/dialogs.c:1032 msgid "Properties" msgstr "Egenskaper" -#: ../src/dialogs.c:1089 +#: ../src/dialogs.c:1062 msgid "Type:" msgstr "Typ:" -#: ../src/dialogs.c:1103 +#: ../src/dialogs.c:1076 msgid "Size:" msgstr "Storlek:" -#: ../src/dialogs.c:1119 +#: ../src/dialogs.c:1092 msgid "Location:" msgstr "Plats:" -#: ../src/dialogs.c:1133 +#: ../src/dialogs.c:1106 msgid "Read-only:" msgstr "Endast läsbar:" -#: ../src/dialogs.c:1140 +#: ../src/dialogs.c:1113 msgid "(only inside Geany)" msgstr "(endast inom Geany)" -#: ../src/dialogs.c:1149 +#: ../src/dialogs.c:1122 msgid "Encoding:" msgstr "Kodning:" #. BOM = byte order mark -#: ../src/dialogs.c:1159 ../src/ui_utils.c:198 +#: ../src/dialogs.c:1132 ../src/ui_utils.c:198 msgid "(with BOM)" msgstr "(med BOM)" -#: ../src/dialogs.c:1159 +#: ../src/dialogs.c:1132 msgid "(without BOM)" msgstr "(utan BOM)" -#: ../src/dialogs.c:1170 +#: ../src/dialogs.c:1143 msgid "Modified:" msgstr "Modifierad:" -#: ../src/dialogs.c:1184 +#: ../src/dialogs.c:1157 msgid "Changed:" msgstr "Ändrad:" -#: ../src/dialogs.c:1198 +#: ../src/dialogs.c:1171 msgid "Accessed:" msgstr "Skapad:" -#: ../src/dialogs.c:1220 +#: ../src/dialogs.c:1193 msgid "Permissions:" msgstr "Behörighet:" #. Header -#: ../src/dialogs.c:1228 +#: ../src/dialogs.c:1201 msgid "Read:" msgstr "Läs:" -#: ../src/dialogs.c:1235 +#: ../src/dialogs.c:1208 msgid "Write:" msgstr "Skriv:" #. Owner -#: ../src/dialogs.c:1250 +#: ../src/dialogs.c:1223 msgid "Owner:" msgstr "Ägare:" #. Group -#: ../src/dialogs.c:1286 +#: ../src/dialogs.c:1259 msgid "Group:" msgstr "Grupp:" #. Other -#: ../src/dialogs.c:1322 +#: ../src/dialogs.c:1295 msgid "Other:" msgstr "Annat:" -#: ../src/document.c:472 +#: ../src/document.c:492 #, c-format msgid "File %s closed." msgstr "Fil %s är stängd." -#: ../src/document.c:586 +#: ../src/document.c:606 #, c-format msgid "New file \"%s\" opened." msgstr "Den nya filen \"%s\" är öppnad." -#: ../src/document.c:761 ../src/document.c:1225 +#: ../src/document.c:779 ../src/document.c:1260 #, c-format msgid "Could not open file %s (%s)" msgstr "Kunde inte öppna fil %s (%s)" -#: ../src/document.c:791 +#: ../src/document.c:808 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -658,12 +658,12 @@ "sparar den, kan data förloras.\n" "Filen sattes automatiskt i skrivskyddat läge." -#: ../src/document.c:815 +#: ../src/document.c:832 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Filen \"%s\" är ogiltig %s." -#: ../src/document.c:824 +#: ../src/document.c:842 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -671,44 +671,44 @@ msgstr "" "Filen \"%s\" verkar inte vara en textfil, eller stöds inte textkodningen." -#: ../src/document.c:961 +#: ../src/document.c:979 msgid "Spaces" msgstr "Mellanslag" -#: ../src/document.c:964 +#: ../src/document.c:982 msgid "Tabs" msgstr "Tabulatorer" -#: ../src/document.c:967 +#: ../src/document.c:985 msgid "Tabs and Spaces" msgstr "Tab och mellanslag" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:972 +#: ../src/document.c:990 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Inställning %s indragsinställning för %s" -#: ../src/document.c:1009 +#: ../src/document.c:1042 msgid "Invalid filename" msgstr "Ogiltigt filnamn" -#: ../src/document.c:1120 +#: ../src/document.c:1153 #, c-format msgid "File %s reloaded." msgstr "Fil %s laddades om" -#: ../src/document.c:1122 +#: ../src/document.c:1155 #, c-format msgid "File %s opened(%d%s)." msgstr "Filen %s är öppnad (%d%s)." -#: ../src/document.c:1124 +#: ../src/document.c:1157 msgid ", read-only" msgstr ", skrivskyddad" -#: ../src/document.c:1351 +#: ../src/document.c:1386 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -717,7 +717,7 @@ "Ett fel inträffade medan filen konverterades från UTF-8 vid \"%s\". Filen " "sparades inte." -#: ../src/document.c:1373 +#: ../src/document.c:1408 #, c-format msgid "" "Error message: %s\n" @@ -726,52 +726,52 @@ "Felmeddelande: %s\n" "Felet inträffade vid \"%s\" (rad: %d, kolumn: %d)." -#: ../src/document.c:1378 +#: ../src/document.c:1413 #, c-format msgid "Error message: %s." msgstr "Felmeddelande: %s" -#: ../src/document.c:1454 ../src/document.c:1510 +#: ../src/document.c:1489 ../src/document.c:1545 msgid "Error saving file." msgstr "Filen kunde ej sparas." -#: ../src/document.c:1508 +#: ../src/document.c:1543 #, c-format msgid "Error saving file (%s)." msgstr "(%s) kunde ej sparas" -#: ../src/document.c:1541 +#: ../src/document.c:1573 #, c-format msgid "File %s saved." msgstr "Fil %s sparad." -#: ../src/document.c:1609 ../src/document.c:1664 ../src/document.c:1672 +#: ../src/document.c:1640 ../src/document.c:1695 ../src/document.c:1703 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" kunde ej hittas." -#: ../src/document.c:1672 +#: ../src/document.c:1703 msgid "Wrap search and find again?" msgstr "Vill du fortsätta sökningen från början av dokumentet?" -#: ../src/document.c:1749 ../src/search.c:913 ../src/search.c:1426 -#: ../src/search.c:1427 +#: ../src/document.c:1780 ../src/search.c:961 ../src/search.c:1534 +#: ../src/search.c:1535 #, c-format msgid "No matches found for \"%s\"." msgstr "Inga träffar hittades för \"%s\"." -#: ../src/document.c:1760 ../src/document.c:1769 +#: ../src/document.c:1791 ../src/document.c:1800 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: ersatt %d förekomst av \"%s\" med \"%s\"." msgstr[1] "%s: ersatt %d förekomster av \"%s\" med \"%s\"." -#: ../src/document.c:2538 +#: ../src/document.c:2589 msgid "Do you want to reload it?" msgstr "Vill du ladda om det?" -#: ../src/document.c:2539 +#: ../src/document.c:2590 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -780,32 +780,32 @@ "Filen '%s' på disken är nyare än\n" "uvarande i editorn." -#: ../src/document.c:2583 +#: ../src/document.c:2634 msgid "Try to resave the file?" msgstr "Vill du försöka spara om filen?" -#: ../src/document.c:2584 +#: ../src/document.c:2635 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Filen \"%s\" kunde ej hittas." -#: ../src/editor.c:3504 ../src/utils.c:291 +#: ../src/editor.c:3579 ../src/utils.c:291 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/editor.c:3505 ../src/utils.c:292 +#: ../src/editor.c:3580 ../src/utils.c:292 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/editor.c:3506 ../src/utils.c:293 +#: ../src/editor.c:3581 ../src/utils.c:293 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/editor.c:3632 +#: ../src/editor.c:3707 msgid "Enter Tab Width" msgstr "Ange Tab-bredd:" -#: ../src/editor.c:3633 +#: ../src/editor.c:3708 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Ange antalet mellanslag som skall ersätta en tab." @@ -944,88 +944,89 @@ #: ../src/filetypes.c:85 ../src/filetypes.c:96 ../src/filetypes.c:108 #: ../src/filetypes.c:119 ../src/filetypes.c:130 ../src/filetypes.c:141 -#: ../src/filetypes.c:153 ../src/filetypes.c:164 ../src/filetypes.c:175 +#: ../src/filetypes.c:152 ../src/filetypes.c:164 ../src/filetypes.c:175 #: ../src/filetypes.c:186 ../src/filetypes.c:197 ../src/filetypes.c:208 -#: ../src/filetypes.c:219 ../src/filetypes.c:231 ../src/filetypes.c:243 +#: ../src/filetypes.c:219 ../src/filetypes.c:230 ../src/filetypes.c:242 #: ../src/filetypes.c:254 ../src/filetypes.c:265 ../src/filetypes.c:276 #: ../src/filetypes.c:287 ../src/filetypes.c:298 ../src/filetypes.c:309 -#: ../src/filetypes.c:356 ../src/filetypes.c:367 ../src/filetypes.c:401 -#: ../src/filetypes.c:412 ../src/filetypes.c:423 ../src/filetypes.c:468 +#: ../src/filetypes.c:320 ../src/filetypes.c:367 ../src/filetypes.c:378 +#: ../src/filetypes.c:412 ../src/filetypes.c:423 ../src/filetypes.c:434 +#: ../src/filetypes.c:479 ../src/filetypes.c:513 #, c-format msgid "%s source file" msgstr "%s källfil" -#: ../src/filetypes.c:320 +#: ../src/filetypes.c:331 msgid "Shell script file" msgstr "Shell script källkodsfil" -#: ../src/filetypes.c:332 +#: ../src/filetypes.c:343 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:344 +#: ../src/filetypes.c:355 msgid "XML document" msgstr "XML dokument" -#: ../src/filetypes.c:379 +#: ../src/filetypes.c:390 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:390 +#: ../src/filetypes.c:401 msgid "SQL Dump file" msgstr "SQL dumpfil" -#: ../src/filetypes.c:434 +#: ../src/filetypes.c:445 msgid "Diff file" msgstr "Diff-fil" -#: ../src/filetypes.c:445 +#: ../src/filetypes.c:456 msgid "Config file" msgstr "Config-fil" -#: ../src/filetypes.c:457 +#: ../src/filetypes.c:468 msgid "Gettext translation file" msgstr "Gettext översättningsfil" -#: ../src/filetypes.c:479 +#: ../src/filetypes.c:490 #, c-format msgid "%s script file" msgstr "%s skriptfil" -#: ../src/filetypes.c:490 +#: ../src/filetypes.c:501 msgid "reStructuredText file" msgstr "reStructuredText fil" -#: ../src/filetypes.c:502 ../src/project.c:272 +#: ../src/filetypes.c:524 ../src/project.c:271 msgid "All files" msgstr "Alla filer" -#: ../src/filetypes.c:580 +#: ../src/filetypes.c:602 msgid "_Programming Languages" msgstr "Programmeringsspråk" -#: ../src/filetypes.c:581 +#: ../src/filetypes.c:603 msgid "_Scripting Languages" msgstr "Skriptspråk" -#: ../src/filetypes.c:582 +#: ../src/filetypes.c:604 msgid "_Markup Languages" msgstr "Märkningsspråk" -#: ../src/filetypes.c:583 +#: ../src/filetypes.c:605 msgid "M_iscellaneous Languages" msgstr "Diverse språk" -#: ../src/filetypes.c:612 ../src/interface.c:3616 ../src/templates.c:347 +#: ../src/filetypes.c:634 ../src/interface.c:3674 ../src/templates.c:359 #: ../src/ui_utils.c:148 msgid "None" msgstr "Inget" -#: ../src/filetypes.c:1149 ../src/win32.c:107 +#: ../src/filetypes.c:1183 ../src/win32.c:107 msgid "All Source" msgstr "All källkod" -#: ../src/filetypes.c:1227 +#: ../src/filetypes.c:1261 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Felaktig rexex för filtypen %s: %s" @@ -1034,255 +1035,255 @@ msgid "untitled" msgstr "odöpt" -#: ../src/interface.c:301 +#: ../src/interface.c:307 msgid "_File" msgstr "Fil" -#: ../src/interface.c:312 +#: ../src/interface.c:318 msgid "New (with _Template)" msgstr "Ny (med mall)" -#: ../src/interface.c:323 ../src/interface.c:384 ../src/interface.c:562 -#: ../src/interface.c:622 ../src/interface.c:636 ../src/interface.c:866 -#: ../src/interface.c:876 ../src/interface.c:2287 ../src/interface.c:2347 -#: ../src/interface.c:2361 +#: ../src/interface.c:329 ../src/interface.c:390 ../src/interface.c:568 +#: ../src/interface.c:628 ../src/interface.c:642 ../src/interface.c:872 +#: ../src/interface.c:882 ../src/interface.c:2333 ../src/interface.c:2393 +#: ../src/interface.c:2407 msgid "invisible" msgstr "osynlig" -#: ../src/interface.c:335 ../src/interface.c:2213 +#: ../src/interface.c:341 ../src/interface.c:2259 msgid "Open Selected F_ile" msgstr "Öppna vald fil" -#: ../src/interface.c:339 +#: ../src/interface.c:345 msgid "Recent _Files" msgstr "Senaste filer" -#: ../src/interface.c:356 +#: ../src/interface.c:362 msgid "Save A_ll" msgstr "Spara alla" -#: ../src/interface.c:359 +#: ../src/interface.c:365 msgid "Saves all open files" msgstr "Spara alla öppna filer" -#: ../src/interface.c:373 +#: ../src/interface.c:379 msgid "R_eload As" msgstr "Ladda om som" -#: ../src/interface.c:401 +#: ../src/interface.c:407 msgid "Page Set_up" msgstr "Sidinställningar" -#: ../src/interface.c:408 +#: ../src/interface.c:414 msgid "Prints the current file" msgstr "Skriv ut" -#: ../src/interface.c:419 +#: ../src/interface.c:425 msgid "Close Ot_her Documents" msgstr "Stäng andra dokument" -#: ../src/interface.c:427 +#: ../src/interface.c:433 msgid "C_lose All" msgstr "Stäng alla" -#: ../src/interface.c:430 +#: ../src/interface.c:436 msgid "Closes all open files" msgstr "Stäng alla öppna filer" -#: ../src/interface.c:444 ../src/interface.c:1246 +#: ../src/interface.c:450 ../src/interface.c:1278 msgid "Quit Geany" msgstr "Avsluta Geany" -#: ../src/interface.c:446 +#: ../src/interface.c:452 msgid "_Edit" msgstr "Redigera" -#: ../src/interface.c:487 ../src/interface.c:2204 +#: ../src/interface.c:493 ../src/interface.c:2250 msgid "Select _All" msgstr "Markera allt" -#: ../src/interface.c:496 ../src/interface.c:2222 +#: ../src/interface.c:502 ../src/interface.c:2268 msgid "_Format" msgstr "Format" -#: ../src/interface.c:499 +#: ../src/interface.c:505 msgid "Convert the case of the current selection" msgstr "Konvertera mellan versaler och gemener" -#: ../src/interface.c:504 ../src/interface.c:2229 +#: ../src/interface.c:510 ../src/interface.c:2275 msgid "T_oggle Case of Selection" msgstr "Ändra mellan gemener och versaler" -#: ../src/interface.c:513 ../src/interface.c:2238 +#: ../src/interface.c:519 ../src/interface.c:2284 msgid "_Comment Line(s)" msgstr "Kommentera rader" -#: ../src/interface.c:517 ../src/interface.c:2242 +#: ../src/interface.c:523 ../src/interface.c:2288 msgid "U_ncomment Line(s)" msgstr "Avkommentera rader" -#: ../src/interface.c:521 ../src/interface.c:2246 +#: ../src/interface.c:527 ../src/interface.c:2292 msgid "_Toggle Line Commentation" msgstr "Stäng av / på radkommentarer" -#: ../src/interface.c:525 ../src/interface.c:2250 +#: ../src/interface.c:531 ../src/interface.c:2296 msgid "Du_plicate Line or Selection" msgstr "Gör en kopia av raden eller markeringen" -#: ../src/interface.c:534 ../src/interface.c:2259 +#: ../src/interface.c:540 ../src/interface.c:2305 msgid "_Increase Indent" msgstr "Öka indrag" -#: ../src/interface.c:542 ../src/interface.c:2267 +#: ../src/interface.c:548 ../src/interface.c:2313 msgid "_Decrease Indent" msgstr "Minska indrag" -#: ../src/interface.c:555 ../src/interface.c:2280 +#: ../src/interface.c:561 ../src/interface.c:2326 msgid "_Send Selection to" msgstr "Skicka markering till" -#: ../src/interface.c:570 ../src/interface.c:2295 +#: ../src/interface.c:576 ../src/interface.c:2341 msgid "I_nsert Comments" msgstr "Infoga kommentarer" -#: ../src/interface.c:581 ../src/interface.c:2306 +#: ../src/interface.c:587 ../src/interface.c:2352 msgid "Insert _ChangeLog Entry" msgstr "Infoga ChangeLog" -#: ../src/interface.c:584 ../src/interface.c:2309 +#: ../src/interface.c:590 ../src/interface.c:2355 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Infoga en typisk ChangeLog" -#: ../src/interface.c:586 ../src/interface.c:2311 +#: ../src/interface.c:592 ../src/interface.c:2357 msgid "Insert File _Header" msgstr "Infoga filhuvud" -#: ../src/interface.c:589 ../src/interface.c:2314 +#: ../src/interface.c:595 ../src/interface.c:2360 msgid "Inserts a file header at the beginning of the file" msgstr "Infoga filhuvud i början av filen" -#: ../src/interface.c:591 ../src/interface.c:2316 +#: ../src/interface.c:597 ../src/interface.c:2362 msgid "Insert _Function Description" msgstr "Infoga funktionsbeskrivning" -#: ../src/interface.c:594 ../src/interface.c:2319 +#: ../src/interface.c:600 ../src/interface.c:2365 msgid "Inserts a description before the current function" msgstr "Infoga en beskrivning innan funktionen" -#: ../src/interface.c:596 ../src/interface.c:2321 +#: ../src/interface.c:602 ../src/interface.c:2367 msgid "Insert _Multiline Comment" msgstr "Infoga flerradskommentar" -#: ../src/interface.c:599 ../src/interface.c:2324 +#: ../src/interface.c:605 ../src/interface.c:2370 msgid "Inserts a multiline comment" msgstr "Infoga multipla kommentarer" -#: ../src/interface.c:601 ../src/interface.c:2326 +#: ../src/interface.c:607 ../src/interface.c:2372 msgid "Insert _GPL Notice" msgstr "Infoga en GPL-beskrivning" -#: ../src/interface.c:604 ../src/interface.c:2329 +#: ../src/interface.c:610 ../src/interface.c:2375 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "Infoga en GPL-beskrivning (bör göras i början av filen)" -#: ../src/interface.c:606 ../src/interface.c:2331 +#: ../src/interface.c:612 ../src/interface.c:2377 msgid "Insert _BSD License Notice" msgstr "Infoga en BSD-beskrivning" -#: ../src/interface.c:609 ../src/interface.c:2334 +#: ../src/interface.c:615 ../src/interface.c:2380 msgid "" "Inserts a BSD license notice (should be done at the beginning of the file)" msgstr "Infogar en BSD-licensbeskrivning (bör göras i början av filen)" -#: ../src/interface.c:611 ../src/interface.c:2336 +#: ../src/interface.c:617 ../src/interface.c:2382 msgid "Insert Dat_e" msgstr "Infoga datum" -#: ../src/interface.c:625 ../src/interface.c:2350 +#: ../src/interface.c:631 ../src/interface.c:2396 msgid "_Insert \"include <...>\"" msgstr "Infoga \"include <...>\"" -#: ../src/interface.c:648 +#: ../src/interface.c:654 msgid "_Search" msgstr "Sök" -#: ../src/interface.c:659 +#: ../src/interface.c:665 msgid "Find _Next" msgstr "Sök nästa" -#: ../src/interface.c:663 +#: ../src/interface.c:669 msgid "Find _Previous" msgstr "Sök föregående" -#: ../src/interface.c:667 +#: ../src/interface.c:673 msgid "Find in F_iles" msgstr "Sök i filer" -#: ../src/interface.c:671 ../src/search.c:437 +#: ../src/interface.c:677 ../src/search.c:443 msgid "_Replace" msgstr "Ersätt" -#: ../src/interface.c:684 +#: ../src/interface.c:690 msgid "Find _Selected" msgstr "Sök i markering" -#: ../src/interface.c:688 +#: ../src/interface.c:694 msgid "Find Pre_vious Selected" msgstr "Sök föregående markerade" -#: ../src/interface.c:697 +#: ../src/interface.c:703 msgid "Next _Message" msgstr "Nästa meddelande" -#: ../src/interface.c:701 +#: ../src/interface.c:707 msgid "Pr_evious Message" msgstr "Föregående meddelande" -#: ../src/interface.c:710 ../src/interface.c:2402 +#: ../src/interface.c:716 ../src/interface.c:2448 msgid "_Go to Line" msgstr "Gå till rad" -#: ../src/interface.c:725 +#: ../src/interface.c:731 msgid "Change _Font" msgstr "Byt teckensnitt" -#: ../src/interface.c:728 +#: ../src/interface.c:734 msgid "Change the default font" msgstr "Byt förvalt teckensnitt" -#: ../src/interface.c:739 +#: ../src/interface.c:745 msgid "To_ggle All Additional Widgets" msgstr "Visa / göm verktygsfält" -#: ../src/interface.c:743 +#: ../src/interface.c:749 msgid "Full_screen" msgstr "Helskärm" -#: ../src/interface.c:747 +#: ../src/interface.c:753 msgid "Show Message _Window" msgstr "Visa meddelandefönster" -#: ../src/interface.c:750 +#: ../src/interface.c:756 msgid "Toggle the window with status and compiler messages on and off" msgstr "Visa status- och kompilatormeddelanden i fönster" -#: ../src/interface.c:753 +#: ../src/interface.c:759 msgid "Show _Toolbar" msgstr "Visa verktygsfält" -#: ../src/interface.c:756 +#: ../src/interface.c:762 msgid "Toggle the toolbar on and off" msgstr "Stäng av / på verktygsfältet" -#: ../src/interface.c:759 +#: ../src/interface.c:765 msgid "Show Side_bar" msgstr "Visa sidofält" -#: ../src/interface.c:764 +#: ../src/interface.c:770 msgid "Show _Markers Margin" msgstr "Visa marginalmarkörer" -#: ../src/interface.c:767 +#: ../src/interface.c:773 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines." @@ -1290,23 +1291,23 @@ "Visar eller gömmer den lilla marginalen till höger om radnummren som används " "för att markera rader." -#: ../src/interface.c:770 +#: ../src/interface.c:776 msgid "Show _Line Numbers" msgstr "Visa radnummer" -#: ../src/interface.c:773 +#: ../src/interface.c:779 msgid "Shows or hides the Line Number margin." msgstr "Visar eller gömmer radnummer-marginalen" -#: ../src/interface.c:793 +#: ../src/interface.c:799 msgid "_Document" msgstr "Dokument" -#: ../src/interface.c:800 +#: ../src/interface.c:806 msgid "_Line Wrapping" msgstr "Radbrytning" -#: ../src/interface.c:803 ../src/interface.c:3731 +#: ../src/interface.c:809 ../src/interface.c:3789 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 " @@ -1316,367 +1317,386 @@ "radbrytning tar mycket systemresurser vid redigering av stora dokument, och " "bör därför vara avslagen på långsamma datorer." -#: ../src/interface.c:806 +#: ../src/interface.c:812 msgid "Line _Breaking" msgstr "Radbrytning" -#: ../src/interface.c:810 +#: ../src/interface.c:816 msgid "_Auto-indentation" msgstr "Använd automatiskt indrag" -#: ../src/interface.c:815 +#: ../src/interface.c:821 msgid "In_dent Type" msgstr "Indragstyp" -#: ../src/interface.c:822 ../src/interface.c:3655 +#: ../src/interface.c:828 ../src/interface.c:3713 msgid "_Tabs" msgstr "Tabulatorer" -#: ../src/interface.c:828 ../src/interface.c:3646 +#: ../src/interface.c:834 ../src/interface.c:3704 msgid "_Spaces" msgstr "Mellanslag" -#: ../src/interface.c:834 ../src/interface.c:3664 +#: ../src/interface.c:840 ../src/interface.c:3722 msgid "T_abs and Spaces" msgstr "Tab och mellanslag" -#: ../src/interface.c:845 +#: ../src/interface.c:851 msgid "Read _Only" msgstr "Skrivskyddad" -#: ../src/interface.c:848 +#: ../src/interface.c:854 msgid "Treat this file as read-only. No changes can be made." msgstr "Behandla denna fil som skrivskyddad. Inga ändringar kan sparas." -#: ../src/interface.c:850 +#: ../src/interface.c:856 msgid "_Write Unicode BOM" msgstr "Skriv Unicode BOM" -#: ../src/interface.c:859 +#: ../src/interface.c:865 msgid "Set File_type" msgstr "Ange filtyp" -#: ../src/interface.c:869 +#: ../src/interface.c:875 msgid "Set _Encoding" msgstr "Ange kodning" -#: ../src/interface.c:879 +#: ../src/interface.c:885 msgid "Set Line E_ndings" msgstr "Ange radslut" -#: ../src/interface.c:886 +#: ../src/interface.c:892 msgid "Convert and Set to _CR/LF (Win)" msgstr "Konvertera till CR/LF (Win)" -#: ../src/interface.c:892 +#: ../src/interface.c:898 msgid "Convert and Set to _LF (Unix)" msgstr "Konvertera till LF (Unix)" -#: ../src/interface.c:898 +#: ../src/interface.c:904 msgid "Convert and Set to CR (_Mac)" msgstr "Konvertera till CR (Mac)" -#: ../src/interface.c:909 +#: ../src/interface.c:915 msgid "_Strip Trailing Spaces" msgstr "Ta bort överflödiga mellanslag" -#: ../src/interface.c:913 +#: ../src/interface.c:919 msgid "_Replace Tabs by Spaces" msgstr "Ersätt tab med mellanslag" -#: ../src/interface.c:916 ../src/interface.c:4182 +#: ../src/interface.c:922 ../src/interface.c:4240 msgid "Replaces all tabs in document by spaces." msgstr "" "Ersätter alla tab-tecken i dokumentet med mellanslag (indraget blir lika " "stort)." -#: ../src/interface.c:918 +#: ../src/interface.c:924 msgid "Replace Spaces b_y Tabs" msgstr "Ersätt mellanslag med tab" -#: ../src/interface.c:921 +#: ../src/interface.c:927 msgid "Replaces all spaces in the document by tab characters." msgstr "" "Ersätter alla mellanslag i dokumentet med tab-tecken (indraget blir lika " "stort)." -#: ../src/interface.c:928 +#: ../src/interface.c:934 msgid "_Fold All" msgstr "Vik ihop alla" -#: ../src/interface.c:931 +#: ../src/interface.c:937 msgid "Folds all contractible code blocks" msgstr "Viker ihop alla kodblock som hör ihop" -#: ../src/interface.c:933 +#: ../src/interface.c:939 msgid "_Unfold All" msgstr "Vik upp alla" -#: ../src/interface.c:936 +#: ../src/interface.c:942 msgid "Unfolds all contracted code blocks" msgstr "Viker upp alla kodblock som hör ihop" -#: ../src/interface.c:943 +#: ../src/interface.c:949 msgid "Remove _Markers" msgstr "Ta bort markeringar" -#: ../src/interface.c:947 +#: ../src/interface.c:953 msgid "Remove Error _Indicators" msgstr "Ta bort felindikatorer" -#: ../src/interface.c:950 +#: ../src/interface.c:956 msgid "Removes all error indicators in the current document." msgstr "Ta bort alla felindikatorer i hela dokumentet" -#: ../src/interface.c:952 +#: ../src/interface.c:958 msgid "_Project" msgstr "Projekt" -#: ../src/interface.c:959 +#: ../src/interface.c:965 msgid "_New" msgstr "Nytt" -#: ../src/interface.c:967 +#: ../src/interface.c:973 msgid "_Open" msgstr "Öppna" -#: ../src/interface.c:975 +#: ../src/interface.c:981 msgid "_Close" msgstr "Stäng" -#: ../src/interface.c:996 +#: ../src/interface.c:1002 msgid "_Tools" msgstr "Verktyg" -#: ../src/interface.c:1003 +#: ../src/interface.c:1009 msgid "_Color Chooser" msgstr "Färgväljare" -#: ../src/interface.c:1006 ../src/interface.c:1165 +#: ../src/interface.c:1012 ../src/interface.c:1195 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:1012 +#: ../src/interface.c:1018 msgid "_Word Count" msgstr "Räkna ord" -#: ../src/interface.c:1015 +#: ../src/interface.c:1021 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:1017 +#: ../src/interface.c:1023 msgid "Load Ta_gs" msgstr "Ladda taggar" -#: ../src/interface.c:1020 +#: ../src/interface.c:1026 msgid "Load global tags file" msgstr "Ladda global tagg-fil" -#: ../src/interface.c:1022 +#: ../src/interface.c:1028 msgid "_Reload Configuration" msgstr "Ladda om konfigurationen" -#: ../src/interface.c:1025 +#: ../src/interface.c:1031 msgid "" "Reload configuration data like snippets, templates and filetype extensions." msgstr "Ladda om konfigurationen som snippet, mallar och filtypsidentifierare." -#: ../src/interface.c:1031 ../src/interface.c:1038 +#: ../src/interface.c:1037 ../src/interface.c:1044 msgid "_Help" msgstr "Hjälp" -#: ../src/interface.c:1046 +#: ../src/interface.c:1052 msgid "_Website" msgstr "Webbsida" -#: ../src/interface.c:1050 +#: ../src/interface.c:1056 msgid "_Keyboard Shortcuts" msgstr "Tangentbordsgenvägar" -#: ../src/interface.c:1053 +#: ../src/interface.c:1059 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Visar en lista med alla tangentbordsgenvägar för Geany." -#: ../src/interface.c:1055 +#: ../src/interface.c:1061 msgid "_Debug Messages" msgstr "Debugmeddelanden" -#: ../src/interface.c:1078 +#: ../src/interface.c:1084 msgid "Create a new file" msgstr "Skapa ny fil" -#: ../src/interface.c:1084 +#: ../src/interface.c:1090 msgid "Open an existing file" msgstr "Öppna existerande fil" -#: ../src/interface.c:1089 +#: ../src/interface.c:1095 msgid "Save the current file" msgstr "Spara fil" -#: ../src/interface.c:1091 ../src/keybindings.c:196 +#: ../src/interface.c:1097 ../src/keybindings.c:196 msgid "Save all" msgstr "Spara allt" -#: ../src/interface.c:1094 +#: ../src/interface.c:1100 msgid "Save all open files" msgstr "Spara alla öppna filer" -#: ../src/interface.c:1103 +#: ../src/interface.c:1109 msgid "Reload the current file from disk" msgstr "Ladda om filen från disk" -#: ../src/interface.c:1108 +#: ../src/interface.c:1114 msgid "Close the current file" msgstr "Stäng fil" -#: ../src/interface.c:1117 +#: ../src/interface.c:1123 +#, fuzzy +msgid "Cut the current selection" +msgstr "Konvertera mellan versaler och gemener" + +#: ../src/interface.c:1128 +#, fuzzy +msgid "Copy the current selection" +msgstr "Kompilera aktuell fil" + +#: ../src/interface.c:1133 +msgid "Paste the contents of the clipboard" +msgstr "" + +#: ../src/interface.c:1138 +#, fuzzy +msgid "Delete the current selection" +msgstr "Konvertera mellan versaler och gemener" + +#: ../src/interface.c:1147 msgid "Undo the last modification" msgstr "Ångra senaste ändring" -#: ../src/interface.c:1122 +#: ../src/interface.c:1152 msgid "Redo the last modification" msgstr "Gör om senaste ändring" -#: ../src/interface.c:1132 ../src/keybindings.c:344 +#: ../src/interface.c:1162 ../src/keybindings.c:344 msgid "Navigate back a location" msgstr "Bläddra bakåt" -#: ../src/interface.c:1138 ../src/keybindings.c:346 +#: ../src/interface.c:1168 ../src/keybindings.c:346 msgid "Navigate forward a location" msgstr "Bläddra frammåt" -#: ../src/interface.c:1146 ../src/keybindings.c:445 +#: ../src/interface.c:1176 ../src/keybindings.c:445 msgid "Compile" msgstr "Kompilera" -#: ../src/interface.c:1149 +#: ../src/interface.c:1179 msgid "Compile the current file" msgstr "Kompilera aktuell fil" -#: ../src/interface.c:1162 +#: ../src/interface.c:1192 msgid "Color" msgstr "Färg" -#: ../src/interface.c:1174 +#: ../src/interface.c:1204 msgid "Zoom in the text" msgstr "Förstora texten" -#: ../src/interface.c:1179 +#: ../src/interface.c:1209 msgid "Zoom out the text" msgstr "Förminska texten" -#: ../src/interface.c:1188 +#: ../src/interface.c:1218 msgid "Decrease indentation" msgstr "Minska indrag" -#: ../src/interface.c:1193 +#: ../src/interface.c:1223 msgid "Increase indentation" msgstr "Öka indrag" -#: ../src/interface.c:1206 ../src/interface.c:1211 +#: ../src/interface.c:1236 ../src/interface.c:1241 msgid "Find the entered text in the current file" msgstr "Sök angiven text i aktuell fil" -#: ../src/interface.c:1224 +#: ../src/interface.c:1255 msgid "Enter a line number and jump to it." -msgstr "Skriv in ett radnummer och hoppa till den." +msgstr "Skriv in ett radnummer och gå till det." -#: ../src/interface.c:1231 +#: ../src/interface.c:1263 msgid "Jump to the entered line number." -msgstr "Hoppa till inskrivet radnummer." +msgstr "Gå till inskrivet radnummer." -#: ../src/interface.c:1274 ../src/treeviews.c:112 +#: ../src/interface.c:1306 ../src/treeviews.c:101 msgid "Symbols" msgstr "Symboler" -#: ../src/interface.c:1288 ../src/treeviews.c:268 +#: ../src/interface.c:1320 ../src/treeviews.c:257 msgid "Documents" msgstr "Dokument" -#: ../src/interface.c:1325 +#: ../src/interface.c:1357 msgid "Status" msgstr "Status" -#: ../src/interface.c:1339 +#: ../src/interface.c:1371 msgid "Compiler" msgstr "Kompilator" -#: ../src/interface.c:1354 +#: ../src/interface.c:1386 msgid "Messages" msgstr "Meddelanden" -#: ../src/interface.c:1367 +#: ../src/interface.c:1399 msgid "Scribble" -msgstr "Scribble" +msgstr "Klotterplank" -#: ../src/interface.c:2019 ../src/interface.c:3525 +#: ../src/interface.c:2065 ../src/interface.c:3583 msgid "Images _and Text" msgstr "Bilder och text" -#: ../src/interface.c:2025 ../src/interface.c:3557 +#: ../src/interface.c:2071 ../src/interface.c:3615 msgid "_Images Only" msgstr "Endast bilder" -#: ../src/interface.c:2031 ../src/interface.c:3549 +#: ../src/interface.c:2077 ../src/interface.c:3607 msgid "_Text Only" msgstr "Endast text" -#: ../src/interface.c:2042 ../src/interface.c:3541 +#: ../src/interface.c:2088 ../src/interface.c:3599 msgid "_Large Icons" msgstr "Stora ikoner" -#: ../src/interface.c:2047 ../src/interface.c:3533 +#: ../src/interface.c:2093 ../src/interface.c:3591 msgid "_Small Icons" msgstr "Små ikoner" -#: ../src/interface.c:2057 +#: ../src/interface.c:2103 msgid "_Hide toolbar" msgstr "Göm verktygsfält" -#: ../src/interface.c:2369 +#: ../src/interface.c:2415 msgid "Find _Usage" msgstr "Visa användning" -#: ../src/interface.c:2377 +#: ../src/interface.c:2423 msgid "Find _Document Usage" msgstr "Visa dokumentets användning" -#: ../src/interface.c:2385 +#: ../src/interface.c:2431 msgid "Go to _Tag Definition" msgstr "Gå till Tagg-definition" -#: ../src/interface.c:2389 +#: ../src/interface.c:2435 msgid "Go to T_ag Declaration" msgstr "Gå till Tagg-deklaration" -#: ../src/interface.c:2393 +#: ../src/interface.c:2439 msgid "Conte_xt Action" msgstr "Snabbmenyhändelse" -#: ../src/interface.c:2405 +#: ../src/interface.c:2451 msgid "Go to the entered line" msgstr "Gå till rad" -#: ../src/interface.c:2921 ../src/keybindings.c:311 +#: ../src/interface.c:2969 ../src/keybindings.c:311 msgid "Preferences" msgstr "Inställningar" -#: ../src/interface.c:2954 +#: ../src/interface.c:3002 msgid "Load files from the last session" msgstr "Ladda filerna från förra sessionen" -#: ../src/interface.c:2957 +#: ../src/interface.c:3005 msgid "Opens at startup the files from the last session" msgstr "Öppnar filerna från förra sessionen vid start" -#: ../src/interface.c:2959 +#: ../src/interface.c:3007 msgid "Load virtual terminal support" msgstr "Ladda stöd för virtuell terminal" -#: ../src/interface.c:2961 +#: ../src/interface.c:3009 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup. " "Disable it if you do not need it." @@ -1684,39 +1704,39 @@ "Huruvida den virtuella terminalemuleringen (VTE) skall laddas vid start. " "Välj bort om du ej behöver det." -#: ../src/interface.c:2963 +#: ../src/interface.c:3011 msgid "Enable plugin support" msgstr "Aktivera stöd för tillägg" -#: ../src/interface.c:2967 +#: ../src/interface.c:3015 msgid "Startup" -msgstr "Sätt på" +msgstr "Vid start" -#: ../src/interface.c:2986 +#: ../src/interface.c:3034 msgid "Save window position and geometry" msgstr "Spara fönsterplacering och storlek" -#: ../src/interface.c:2989 +#: ../src/interface.c:3037 msgid "Saves the window position and geometry and restores it at the start" msgstr "Sparar fönstrets position och storlek, och återställer det vid start" -#: ../src/interface.c:2991 +#: ../src/interface.c:3039 msgid "Confirm exit" msgstr "Bekräfta avslut" -#: ../src/interface.c:2994 +#: ../src/interface.c:3042 msgid "Shows a confirmation dialog on exit." msgstr "Begär bekräftelse vid avslut." -#: ../src/interface.c:2996 +#: ../src/interface.c:3044 msgid "Shutdown" -msgstr "Stäng av" +msgstr "Vid avslut" -#: ../src/interface.c:3015 +#: ../src/interface.c:3063 msgid "Use project-based session files" msgstr "Använd projektbaserade sessionsfiler" -#: ../src/interface.c:3018 +#: ../src/interface.c:3066 msgid "" "Whether to store a project's session files and open them when re-opening the " "project." @@ -1724,11 +1744,11 @@ "Huruvida projektets sessionsfiler skall sparas för att senare öppna den när " "projektet åter öppnas" -#: ../src/interface.c:3020 +#: ../src/interface.c:3068 msgid "Store project file inside the project base directory" msgstr "Lagra projektfiler i projektets basmapp" -#: ../src/interface.c:3023 +#: ../src/interface.c:3071 msgid "" "When enabled, a project file is stored by default inside the project base " "directory when creating new projects instead of one directory above the base " @@ -1739,15 +1759,15 @@ "projektet istället för ett steg ovanför bassökvägen. Du kan fortförande " "ändra sölvägen till projektfilen i \"Nytt projekt\"-menyn." -#: ../src/interface.c:3025 +#: ../src/interface.c:3073 msgid "Projects" msgstr "Projekt" -#: ../src/interface.c:3044 +#: ../src/interface.c:3092 msgid "Beep on errors or when compilation has finished" msgstr "Pip vid fel och när kompilering har avslutats" -#: ../src/interface.c:3047 +#: ../src/interface.c:3095 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished." @@ -1755,11 +1775,11 @@ "Om datorn skall avge en ljudsignal när när ett fel hittas eller när " "kompileringen har avslutats." -#: ../src/interface.c:3049 +#: ../src/interface.c:3097 msgid "Switch to status message list at new message" msgstr "Byt till statusmeddelandelistan när ett nytt meddelande visas" -#: ../src/interface.c:3052 +#: ../src/interface.c:3100 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives." @@ -1767,11 +1787,11 @@ "Huruvida Geany skall byta till statusmeddelandefönstret (vid botten) om ett " "nytt statusmeddelande kommer." -#: ../src/interface.c:3054 +#: ../src/interface.c:3102 msgid "Suppress status messages in the status bar" msgstr "Undertryck statusmeddelanden i statusfältet" -#: ../src/interface.c:3057 +#: ../src/interface.c:3105 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1779,26 +1799,26 @@ "Tar bort alla meddelanden från statusfältet. Meddelanden visas fortförande i " "fönstret för statusmeddelanden." -#: ../src/interface.c:3059 +#: ../src/interface.c:3107 msgid "Auto focus widgets (focus follows mouse)" msgstr "Autofokusera gränssnittskomponenter (fokus följer musen)" -#: ../src/interface.c:3062 +#: ../src/interface.c:3110 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:3064 ../src/interface.c:3393 ../src/interface.c:4244 +#: ../src/interface.c:3112 ../src/interface.c:3441 ../src/interface.c:4302 msgid "Miscellaneous" msgstr "Övrigt" -#: ../src/interface.c:3085 +#: ../src/interface.c:3133 msgid "Startup path:" msgstr "Sökväg vid start:" -#: ../src/interface.c:3097 +#: ../src/interface.c:3145 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1807,83 +1827,83 @@ "absolut sökväg. Lämna blankt för att automatiskt välja filens nuvarande " "sökväg." -#: ../src/interface.c:3110 +#: ../src/interface.c:3158 msgid "Project files:" msgstr "Projektfiler:" -#: ../src/interface.c:3122 +#: ../src/interface.c:3170 msgid "Path to start in when opening project files" msgstr "Sökväg att starta i när projektfiler öppnas" -#: ../src/interface.c:3135 +#: ../src/interface.c:3183 msgid "Paths" msgstr "Sökvägar" -#: ../src/interface.c:3140 +#: ../src/interface.c:3188 msgid "General" msgstr "Generellt" -#: ../src/interface.c:3163 +#: ../src/interface.c:3211 msgid "Show symbol list" msgstr "Visa symbollista" -#: ../src/interface.c:3166 +#: ../src/interface.c:3214 msgid "Toggle the symbol list on and off" msgstr "Stäng av / på symbollistan" -#: ../src/interface.c:3168 +#: ../src/interface.c:3216 msgid "Show documents list" msgstr "Visa listan för öppna filer" -#: ../src/interface.c:3171 +#: ../src/interface.c:3219 msgid "Toggle the documents list on and off" msgstr "Stäng av / på listan med öppna filer" -#: ../src/interface.c:3173 +#: ../src/interface.c:3221 msgid "Show full path name in documents list" msgstr "Visa sökvägen i dokumentlistan" -#: ../src/interface.c:3177 +#: ../src/interface.c:3225 msgid "Sidebar" msgstr "Sidofält" -#: ../src/interface.c:3198 +#: ../src/interface.c:3246 msgid "Symbol list:" msgstr "Symbollista:" -#: ../src/interface.c:3205 ../src/interface.c:3315 +#: ../src/interface.c:3253 ../src/interface.c:3363 msgid "Message window:" msgstr "Meddelandefönster:" -#: ../src/interface.c:3212 ../src/interface.c:3351 +#: ../src/interface.c:3260 ../src/interface.c:3399 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3224 +#: ../src/interface.c:3272 msgid "Sets the font for the message window" msgstr "Justerar teckensnittet för meddelandefönstret" -#: ../src/interface.c:3232 +#: ../src/interface.c:3280 msgid "Sets the font for the symbol list" msgstr "Justerar teckensnittet för symbollistan" -#: ../src/interface.c:3240 +#: ../src/interface.c:3288 msgid "Sets the editor font" msgstr "Anger texteditorns teckensnitt" -#: ../src/interface.c:3242 +#: ../src/interface.c:3290 msgid "Fonts" msgstr "Teckensnitt" -#: ../src/interface.c:3261 +#: ../src/interface.c:3309 msgid "Show editor tabs" msgstr "Visa editorns flikar" -#: ../src/interface.c:3265 +#: ../src/interface.c:3313 msgid "Show close buttons" msgstr "Visa knappar för stängning" -#: ../src/interface.c:3268 +#: ../src/interface.c:3316 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)." @@ -1891,223 +1911,244 @@ "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:3274 +#: ../src/interface.c:3322 msgid "Placement of new file tabs:" msgstr "Placering av nya filflikar:" -#: ../src/interface.c:3279 ../src/interface.c:3328 ../src/interface.c:3346 -#: ../src/interface.c:3364 +#: ../src/interface.c:3327 ../src/interface.c:3376 ../src/interface.c:3394 +#: ../src/interface.c:3412 msgid "Left" msgstr "Vänster" -#: ../src/interface.c:3282 +#: ../src/interface.c:3330 msgid "File tabs will be placed on the left of the notebook" msgstr "Fil-tabbar kommer att placeras till vänster om anteckningsboken" -#: ../src/interface.c:3287 ../src/interface.c:3329 ../src/interface.c:3347 -#: ../src/interface.c:3365 +#: ../src/interface.c:3335 ../src/interface.c:3377 ../src/interface.c:3395 +#: ../src/interface.c:3413 msgid "Right" msgstr "Höger" -#: ../src/interface.c:3290 +#: ../src/interface.c:3338 msgid "File tabs will be placed on the right of the notebook" msgstr "Fil-tabbar kommer att placeras till höger om anteckningsboken" -#: ../src/interface.c:3294 +#: ../src/interface.c:3342 msgid "Editor tabs" msgstr "Editorns flikar" -#: ../src/interface.c:3330 ../src/interface.c:3348 ../src/interface.c:3366 +#: ../src/interface.c:3378 ../src/interface.c:3396 ../src/interface.c:3414 msgid "Top" msgstr "Topp" -#: ../src/interface.c:3331 ../src/interface.c:3349 ../src/interface.c:3367 +#: ../src/interface.c:3379 ../src/interface.c:3397 ../src/interface.c:3415 msgid "Bottom" msgstr "Botten" -#: ../src/interface.c:3333 +#: ../src/interface.c:3381 msgid "Sidebar:" msgstr "Sidofält:" -#: ../src/interface.c:3369 +#: ../src/interface.c:3417 msgid "Tab positions" msgstr "Tab positioner" -#: ../src/interface.c:3388 +#: ../src/interface.c:3436 msgid "Show status bar" msgstr "Visa statusfält" -#: ../src/interface.c:3391 +#: ../src/interface.c:3439 msgid "Whether to show the status bar at the bottom of the main window." msgstr "Huruvida statusfältet skall visas längst ner i huvudfönstret." -#: ../src/interface.c:3398 +#: ../src/interface.c:3446 msgid "Interface" msgstr "Gränssnitt" -#: ../src/interface.c:3417 +#: ../src/interface.c:3465 msgid "Show Toolbar" msgstr "Visa verktygsfält" -#: ../src/interface.c:3421 +#: ../src/interface.c:3469 msgid "Toolbar" msgstr "Verktygsfält" -#: ../src/interface.c:3440 -msgid "Show file operation buttons" +#: ../src/interface.c:3488 +#, fuzzy +msgid "Show File Operation buttons" msgstr "Visa filhanteringsknappar" -#: ../src/interface.c:3443 +#: ../src/interface.c:3491 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" msgstr "Visa Ny, Öppna, Stäng, Spara och Ladda Om-knapparna i verktygsfältet" -#: ../src/interface.c:3445 +#: ../src/interface.c:3493 +#, fuzzy +msgid "Show Cut and Delete buttons" +msgstr "Visa Kompilera och Kör-knappar" + +#: ../src/interface.c:3496 +#, fuzzy +msgid "Display the Cut and Delete buttons in the toolbar" +msgstr "Visa kompilera- och körknapparna i verktygsfältet" + +#: ../src/interface.c:3498 +#, fuzzy +msgid "Show Copy and Paste buttons" +msgstr "Visa Kompilera och Kör-knappar" + +#: ../src/interface.c:3501 +#, fuzzy +msgid "Display the Copy and Paste buttons in the toolbar" +msgstr "Visa kompilera- och körknapparna i verktygsfältet" + +#: ../src/interface.c:3503 msgid "Show Redo and Undo buttons" msgstr "Visa Gör Om- och Ångra-knapparna" -#: ../src/interface.c:3448 +#: ../src/interface.c:3506 msgid "Display the Redo and Undo buttons in the toolbar" msgstr "Visa Gör Om- och Ångra-knapparna i verktygsfältet" -#: ../src/interface.c:3450 +#: ../src/interface.c:3508 msgid "Show Back and Forward buttons" msgstr "Visa bakåt- och framåtknappar" -#: ../src/interface.c:3453 +#: ../src/interface.c:3511 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:3455 +#: ../src/interface.c:3513 msgid "Show Compile and Run buttons" msgstr "Visa Kompilera och Kör-knappar" -#: ../src/interface.c:3458 +#: ../src/interface.c:3516 msgid "Display the Compile and Run buttons in the toolbar" msgstr "Visa kompilera- och körknapparna i verktygsfältet" -#: ../src/interface.c:3460 +#: ../src/interface.c:3518 msgid "Show Color Chooser button" msgstr "Visa knapp för färgväljaren" -#: ../src/interface.c:3463 +#: ../src/interface.c:3521 msgid "Display the Color Chooser button in the toolbar" msgstr "Visa knappen för färgväljaren i verktygsfältet" -#: ../src/interface.c:3465 +#: ../src/interface.c:3523 msgid "Show Zoom In and Zoom Out buttons" -msgstr "Visa förstoring- och förminskningsknappar" +msgstr "Visa förstorings- och förminskningsknappar" -#: ../src/interface.c:3468 +#: ../src/interface.c:3526 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Visa förstoringsknapparna i verktygsfältet" -#: ../src/interface.c:3470 +#: ../src/interface.c:3528 msgid "Show Increase and Decrease Indentation buttons" msgstr "Visa knapparna för att öka/minska indrag" -#: ../src/interface.c:3473 +#: ../src/interface.c:3531 msgid "Display the Increase and Decrease Indentation buttons in the toolbar" msgstr "Visa öka / minska indragsknapparna verktygsfältet" -#: ../src/interface.c:3475 +#: ../src/interface.c:3533 msgid "Show Search field" msgstr "Visa sökfältet" -#: ../src/interface.c:3478 +#: ../src/interface.c:3536 msgid "Display the search field and button in the toolbar" msgstr "Visa sökfält och sökknapp i verktygsfältet" -#: ../src/interface.c:3480 +#: ../src/interface.c:3538 msgid "Show Go to Line field" -msgstr "Visa Gå Till Rad fältet" +msgstr "Visa Gå till rad-fältet" -#: ../src/interface.c:3483 +#: ../src/interface.c:3541 msgid "Display the line number field and button in the toolbar" msgstr "Visa radnummer och knapp i verktygsfältet" -#: ../src/interface.c:3485 +#: ../src/interface.c:3543 msgid "Show Quit button" msgstr "Visa Avsluta-knappen" -#: ../src/interface.c:3488 +#: ../src/interface.c:3546 msgid "Display the quit button in the toolbar" msgstr "Visa Avsluta-knappen i verktygsfältet" -#: ../src/interface.c:3490 +#: ../src/interface.c:3548 msgid "Items" -msgstr "Artiklar" +msgstr "Tillval" -#: ../src/interface.c:3511 +#: ../src/interface.c:3569 msgid "Icon style:" msgstr "Ikonstil" -#: ../src/interface.c:3518 +#: ../src/interface.c:3576 msgid "Icon size:" msgstr "Ikonstorlek" -#: ../src/interface.c:3565 +#: ../src/interface.c:3623 msgid "Appearance" msgstr "Utseende" -#: ../src/interface.c:3570 +#: ../src/interface.c:3628 msgid "Toolbar" msgstr "Verktygsfält" -#: ../src/interface.c:3604 +#: ../src/interface.c:3662 msgid "Auto-indent mode:" msgstr "Automatiskt indrag:" -#: ../src/interface.c:3617 +#: ../src/interface.c:3675 msgid "Basic" msgstr "Grundläggande" -#: ../src/interface.c:3618 +#: ../src/interface.c:3676 msgid "Current chars" -msgstr "Nuvarande täcken" +msgstr "Nuvarande tecken" -#: ../src/interface.c:3619 +#: ../src/interface.c:3677 msgid "Match braces" msgstr "Matcha klamrar" -#: ../src/interface.c:3621 ../src/interface.c:3975 +#: ../src/interface.c:3679 ../src/interface.c:4033 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3628 +#: ../src/interface.c:3686 msgid "Width:" msgstr "Bredd:" -#: ../src/interface.c:3641 +#: ../src/interface.c:3699 msgid "The width in chars of a single indent" msgstr "Bredd, i antal tecken, på ett indrag" -#: ../src/interface.c:3651 +#: ../src/interface.c:3709 msgid "Use spaces when inserting indentation" msgstr "Använd mellanslag vid infogande av indrag" -#: ../src/interface.c:3660 +#: ../src/interface.c:3718 msgid "Use one tab per indent" msgstr "Använd en tab per indrag" -#: ../src/interface.c:3669 +#: ../src/interface.c:3727 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" "Använd mellanslag om det totala indraget är mindre än tab-bredden -- i annat " "fall, använd båda" -#: ../src/interface.c:3684 +#: ../src/interface.c:3742 msgid "Hard tab width:" msgstr "Hårdtab-bredd:" -#: ../src/interface.c:3692 +#: ../src/interface.c:3750 msgid "The width of a tab when Tabs & Spaces is set for a document" msgstr "Bredden på tab när Tab och Mellanslag är påslaget för dokumentet" -#: ../src/interface.c:3702 +#: ../src/interface.c:3760 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened." @@ -2115,11 +2156,11 @@ "Huruvida indragstyp skall hittas automatiskt via filens innehåll när den " "öppnats." -#: ../src/interface.c:3704 +#: ../src/interface.c:3762 msgid "Tab key indents" msgstr "Tab-tangentens indrag" -#: ../src/interface.c:3707 +#: ../src/interface.c:3765 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab " "character." @@ -2127,19 +2168,19 @@ "Att trycka på tab / skift-tab, ökar / minskar indrag istället för att mata " "in ett tab-tecken" -#: ../src/interface.c:3709 +#: ../src/interface.c:3767 msgid "Indentation" msgstr "Indrag" -#: ../src/interface.c:3728 +#: ../src/interface.c:3786 msgid "Line wrapping" msgstr "Radbrytning" -#: ../src/interface.c:3733 +#: ../src/interface.c:3791 msgid "Enable \"smart\" home key" msgstr "Aktivera \"smart\" home-tangent" -#: ../src/interface.c:3736 +#: ../src/interface.c:3794 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 " @@ -2152,31 +2193,31 @@ "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:3738 +#: ../src/interface.c:3796 msgid "Disable Drag and Drop" msgstr "Avaktivera drag-och-släpp" -#: ../src/interface.c:3741 +#: ../src/interface.c:3799 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:3743 +#: ../src/interface.c:3801 msgid "Enable folding" msgstr "Aktivera ihopvikning" -#: ../src/interface.c:3746 +#: ../src/interface.c:3804 msgid "Whether to enable folding the code" msgstr "" "Specificerar om koden skall vikas ihop för att spara utrymme och underlätta " "läsning" -#: ../src/interface.c:3748 +#: ../src/interface.c:3806 msgid "Fold/unfold all children of a fold point" msgstr "Vik upp alla vid uppvikningspunkten" -#: ../src/interface.c:3751 +#: ../src/interface.c:3809 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -2184,11 +2225,11 @@ "Vik eller vik upp allt vid vikningspunkten. Genom att hålla in shift-" "tangenten medan du klickar på vikningspunkten kan motsatt effekt uppnås." -#: ../src/interface.c:3753 +#: ../src/interface.c:3811 msgid "Use indicators to show compile errors" msgstr "Använd indikatorer för att visa kompileringsfel" -#: ../src/interface.c:3756 +#: ../src/interface.c:3814 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error." @@ -2196,24 +2237,24 @@ "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:3758 +#: ../src/interface.c:3816 msgid "Newline strips trailing spaces" msgstr "Ta bort överflödiga mellanslag efter nyradstecken" -#: ../src/interface.c:3761 +#: ../src/interface.c:3819 msgid "Enable newline to strip the trailing spaces on the previous line." msgstr "" "Gör så att nyradstecken tar bort överflödiga mellanslag från föregående rad." -#: ../src/interface.c:3767 +#: ../src/interface.c:3825 msgid "Line breaking column:" msgstr "Kolumn för radbrytning:" -#: ../src/interface.c:3781 +#: ../src/interface.c:3839 msgid "Comment toggle marker:" msgstr "Stäng av / på kommentarmarkör:" -#: ../src/interface.c:3788 +#: ../src/interface.c:3846 msgid "" "A string which is added when toggling a line comment in a source file. It is " "used to mark the comment as toggled." @@ -2221,39 +2262,39 @@ "En sträng som läggs till när man justerar en kommentar i en källkodsfil. Den " "används för att markera den justerade kommentaren." -#: ../src/interface.c:3790 +#: ../src/interface.c:3848 msgid "Features" msgstr "Kännetecken" -#: ../src/interface.c:3795 +#: ../src/interface.c:3853 msgid "Features" msgstr "Kännetecken" -#: ../src/interface.c:3814 +#: ../src/interface.c:3872 msgid "Snippet completion" msgstr "Komplettera snutt" -#: ../src/interface.c:3817 +#: ../src/interface.c:3875 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress." msgstr "" -"Skriv in en kort teckensekvens för att skapa en mer komplex sträng med ett " -"tangenttryck." +"Geany kan gissa vad du vill skriva, och visar förslag på fullständiga " +"strängar som du kan välja mellan med ett enkelt tryck på returtangenten." -#: ../src/interface.c:3819 +#: ../src/interface.c:3877 msgid "XML tag auto completion" msgstr "Komplettera XML-taggar automatiskt" -#: ../src/interface.c:3822 +#: ../src/interface.c:3880 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Autokomplettera XML- och HTMK-taggar" -#: ../src/interface.c:3824 +#: ../src/interface.c:3882 msgid "Automatic continuation of multi-line comments" msgstr "Automatisk fortsättning på multiradskommentarer." -#: ../src/interface.c:3827 +#: ../src/interface.c:3885 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment." @@ -2261,11 +2302,11 @@ "Automatiskt fortsätta multirads-kommentarer i språk som C, C++ och Java när " "en ny rad matas in i kommentaren." -#: ../src/interface.c:3829 +#: ../src/interface.c:3887 msgid "Automatic symbol completion" msgstr "Komplettera symboler automatiskt" -#: ../src/interface.c:3832 +#: ../src/interface.c:3890 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2273,104 +2314,104 @@ "Autokomplettera kända symboler i öppna filer (funktionsnamn, globala " "variabler etc.)" -#: ../src/interface.c:3840 +#: ../src/interface.c:3898 msgid "Max. symbol name suggestions:" msgstr "Max antal symbolnamnsförslag:" -#: ../src/interface.c:3847 +#: ../src/interface.c:3905 msgid "Completion list height:" msgstr "Komplettering listhöjd:" -#: ../src/interface.c:3854 +#: ../src/interface.c:3912 msgid "Characters to type for completion:" msgstr "Tecken att skriva för komplettering:" -#: ../src/interface.c:3867 +#: ../src/interface.c:3925 msgid "" "The amount of characters which are necessary to show the symbol auto " "completion list." msgstr "Mängden tecken som behövs för att visa symbolautokompletteringslistan." -#: ../src/interface.c:3876 +#: ../src/interface.c:3934 msgid "Display height in rows for the auto completion list." msgstr "Antal rader att visa i autokompletteringslistan." -#: ../src/interface.c:3885 +#: ../src/interface.c:3943 msgid "Maximum number of entries to display in the auto completion list." msgstr "Maximalt antal rader att visa i autokompletteringslistan." -#: ../src/interface.c:3888 +#: ../src/interface.c:3946 msgid "Completions" msgstr "Komplettering" -#: ../src/interface.c:3893 +#: ../src/interface.c:3951 msgid "Completions" msgstr "Komplettering" -#: ../src/interface.c:3916 +#: ../src/interface.c:3974 msgid "Invert syntax highlighting colors" msgstr "Invertera syntaxfärgningen" -#: ../src/interface.c:3918 +#: ../src/interface.c:3976 msgid "Use white text on a black background." msgstr "Använd vit text på svart bakgrund" -#: ../src/interface.c:3920 +#: ../src/interface.c:3978 msgid "Show indentation guides" msgstr "Visa indragsmarkörer" -#: ../src/interface.c:3923 +#: ../src/interface.c:3981 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "Visar små prickade linjer för att hjälpa dig se rätt indrag." -#: ../src/interface.c:3925 +#: ../src/interface.c:3983 msgid "Show white space" msgstr "Visa tomrum" -#: ../src/interface.c:3928 +#: ../src/interface.c:3986 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markera mellanslag med prickar och tabbar med pilar." -#: ../src/interface.c:3930 +#: ../src/interface.c:3988 msgid "Show line endings" msgstr "Visa radslut" -#: ../src/interface.c:3933 +#: ../src/interface.c:3991 msgid "Show the line ending character." msgstr "Visa radslutstecknet" -#: ../src/interface.c:3935 +#: ../src/interface.c:3993 msgid "Stop scrolling at last line" msgstr "Sluta rulla vid sista raden" -#: ../src/interface.c:3938 +#: ../src/interface.c:3996 msgid "Whether to stop scrolling one page past the last line of a document." msgstr "" "Huruvida programmet skall sluta rulla en sida efter den sista raden i ett " "dokument." -#: ../src/interface.c:3940 +#: ../src/interface.c:3998 msgid "Display" msgstr "Visa" -#: ../src/interface.c:3961 +#: ../src/interface.c:4019 msgid "Long line marker:" msgstr "Markör för lång rad" -#: ../src/interface.c:3968 +#: ../src/interface.c:4026 msgid "Long line marker color:" msgstr "Färg på markören för lång rad" -#: ../src/interface.c:3987 +#: ../src/interface.c:4045 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:3988 ../src/tools.c:743 ../src/vte.c:737 -#: ../src/vte.c:744 +#: ../src/interface.c:4046 ../src/tools.c:743 ../src/vte.c:735 +#: ../src/vte.c:742 msgid "Color Chooser" msgstr "Färgväljare" -#: ../src/interface.c:3996 +#: ../src/interface.c:4054 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 " @@ -2380,22 +2421,22 @@ "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:4006 +#: ../src/interface.c:4064 msgid "Line" msgstr "Rad" -#: ../src/interface.c:4009 +#: ../src/interface.c:4067 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:4013 +#: ../src/interface.c:4071 msgid "Background" msgstr "Bakgrund" -#: ../src/interface.c:4016 +#: ../src/interface.c:4074 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 " @@ -2404,59 +2445,59 @@ "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:4020 +#: ../src/interface.c:4078 msgid "Disabled" msgstr "Avaktiverad" -#: ../src/interface.c:4026 +#: ../src/interface.c:4084 msgid "Long line marker" msgstr "Markör för lång rad" -#: ../src/interface.c:4031 +#: ../src/interface.c:4089 msgid "Display" msgstr "Visa" -#: ../src/interface.c:4035 ../src/keybindings.c:213 +#: ../src/interface.c:4093 ../src/keybindings.c:213 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:4062 +#: ../src/interface.c:4120 msgid "Open new documents from the command-line" msgstr "Öppna nya dokument från kommandotolken" -#: ../src/interface.c:4065 +#: ../src/interface.c:4123 msgid "Start a new file for each command-line filename that doesn't exist." msgstr "Skapa en ny fil för varje filnamn som inte existerar." -#: ../src/interface.c:4079 +#: ../src/interface.c:4137 msgid "Default end of line characters:" msgstr "Förvalt radslutstecken:" -#: ../src/interface.c:4086 +#: ../src/interface.c:4144 msgid "New files" msgstr "Nya filer" -#: ../src/interface.c:4112 +#: ../src/interface.c:4170 msgid "Sets the default encoding for newly created files." msgstr "Anger förvald kodning för nyskapade filer." -#: ../src/interface.c:4118 +#: ../src/interface.c:4176 msgid "Default encoding (new files):" msgstr "Förvald kodning (nya filer):" -#: ../src/interface.c:4125 +#: ../src/interface.c:4183 msgid "Default encoding (existing files):" msgstr "Förvald teckenkodning (existerande filer):" -#: ../src/interface.c:4137 +#: ../src/interface.c:4195 msgid "Sets the default encoding for opening existing files." msgstr "Anger förvald teckenkodning för nyöppnade filer:" -#: ../src/interface.c:4143 +#: ../src/interface.c:4201 msgid "Use fixed encoding when opening files" msgstr "Använd fast kodning när filer öppnas" -#: ../src/interface.c:4148 +#: ../src/interface.c:4206 msgid "" "This option disables the automatic detection of the file encoding when " "opening files and opens the file with the specified encoding (usually not " @@ -2466,50 +2507,50 @@ "öppnas, och använder i stället en specificerad kodning (behövs vanligen " "inte)." -#: ../src/interface.c:4150 +#: ../src/interface.c:4208 msgid "Encodings" msgstr "Teckenkod" -#: ../src/interface.c:4169 +#: ../src/interface.c:4227 msgid "Ensure new line at file end" msgstr "Skriv alltid nyradstecken i slutet av filen" -#: ../src/interface.c:4172 +#: ../src/interface.c:4230 msgid "Ensures that at the end of the file is a new line" msgstr "" "Lägger till ett nyradstecken vid slutet av filen om det inte redan finns " "något" -#: ../src/interface.c:4174 +#: ../src/interface.c:4232 msgid "Strip trailing spaces and tabs" msgstr "Ta bort överflödiga mellanslag och tab-tecken" -#: ../src/interface.c:4177 +#: ../src/interface.c:4235 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Tar bort överflödiga mellanslag och tab-tecken i slutet av filen" -#: ../src/interface.c:4179 ../src/keybindings.c:430 +#: ../src/interface.c:4237 ../src/keybindings.c:430 msgid "Replace tabs by space" msgstr "Ersätt tab-tecken med mellanslag" -#: ../src/interface.c:4184 +#: ../src/interface.c:4242 msgid "Saving files" msgstr "Sparar filer" -#: ../src/interface.c:4209 +#: ../src/interface.c:4267 msgid "Recent files list length:" msgstr "Senaste längd på fil-listan:" -#: ../src/interface.c:4223 +#: ../src/interface.c:4281 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:4227 +#: ../src/interface.c:4285 msgid "Disk check timeout:" msgstr "Disk timeout-kontroll:" -#: ../src/interface.c:4240 +#: ../src/interface.c:4298 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2517,15 +2558,15 @@ "Hur ofta kontroller utförs för att se om dokumentet ändrats, i antalet " "sekunder. Noll stänger av kontroller." -#: ../src/interface.c:4249 ../src/symbols.c:581 ../plugins/filebrowser.c:925 +#: ../src/interface.c:4307 ../src/symbols.c:536 ../plugins/filebrowser.c:918 msgid "Files" msgstr "Filer" -#: ../src/interface.c:4268 +#: ../src/interface.c:4326 msgid "Always wrap search and hide the Find dialog" msgstr "Börja alltid om sökning från början och göm Sök-dialogrutan" -#: ../src/interface.c:4271 +#: ../src/interface.c:4329 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous." @@ -2533,11 +2574,11 @@ "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:4273 +#: ../src/interface.c:4331 msgid "Use the current word under the cursor for Find dialogs" -msgstr "Använd order under muspekaren i vid Sök" +msgstr "Använd ordet under muspekaren i vid Sök" -#: ../src/interface.c:4276 +#: ../src/interface.c:4334 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection." @@ -2545,35 +2586,35 @@ "Använd ordet under muspekaren när Sök, Sök i filer eller Ersätt väljs och " "det inte finns något markerat tidigare" -#: ../src/interface.c:4278 +#: ../src/interface.c:4336 msgid "Use the current file's directory for Find in Files" msgstr "Använd nuvarande fils sökväg för funktionen Sök i Filer" -#: ../src/interface.c:4282 +#: ../src/interface.c:4340 msgid "Search" msgstr "Sök" -#: ../src/interface.c:4287 ../src/keybindings.c:314 +#: ../src/interface.c:4345 ../src/keybindings.c:314 msgid "Search" msgstr "Sök" -#: ../src/interface.c:4320 +#: ../src/interface.c:4378 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4327 +#: ../src/interface.c:4385 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4334 +#: ../src/interface.c:4392 msgid "Browser:" msgstr "Webbläsare:" -#: ../src/interface.c:4346 +#: ../src/interface.c:4404 msgid "Path and options for the make tool" msgstr "Sökväg och tillval för Make-verktyget" -#: ../src/interface.c:4353 +#: ../src/interface.c:4411 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2581,23 +2622,23 @@ "En terminal som Xterm, Gnome-terminal eller Konsole (måste acceptera -e " "argumentet)" -#: ../src/interface.c:4360 +#: ../src/interface.c:4418 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Sökväg (och eventuella argument) till din favoritwebbläsare." -#: ../src/interface.c:4392 +#: ../src/interface.c:4450 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4415 +#: ../src/interface.c:4473 msgid "Tool paths" msgstr "Sökvägar till verktyg" -#: ../src/interface.c:4436 +#: ../src/interface.c:4494 msgid "Context action:" msgstr "Snabbmenyhändelse:" -#: ../src/interface.c:4447 +#: ../src/interface.c:4505 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2607,67 +2648,67 @@ "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:4460 +#: ../src/interface.c:4518 msgid "Commands" msgstr "Kommandon" -#: ../src/interface.c:4465 ../src/keybindings.c:466 +#: ../src/interface.c:4523 ../src/keybindings.c:466 msgid "Tools" msgstr "Verktyg" -#: ../src/interface.c:4499 +#: ../src/interface.c:4557 msgid "email address of the developer" msgstr "emailadressen till utvecklaren" -#: ../src/interface.c:4506 +#: ../src/interface.c:4564 msgid "Initials of the developer name" msgstr "Utvecklarens initialer" -#: ../src/interface.c:4508 +#: ../src/interface.c:4566 msgid "Initial version:" msgstr "Inledande version:" -#: ../src/interface.c:4520 +#: ../src/interface.c:4578 msgid "Version number, which a new file initially has" msgstr "Versionnummret som filen börjar med" -#: ../src/interface.c:4527 +#: ../src/interface.c:4585 msgid "Company name" msgstr "Företagets namn" -#: ../src/interface.c:4529 +#: ../src/interface.c:4587 msgid "Developer:" msgstr "Utvecklare:" -#: ../src/interface.c:4536 +#: ../src/interface.c:4594 msgid "Company:" msgstr "Företag:" -#: ../src/interface.c:4543 +#: ../src/interface.c:4601 msgid "Mail address:" msgstr "E-post:" -#: ../src/interface.c:4550 +#: ../src/interface.c:4608 msgid "Initials:" msgstr "Initialer:" -#: ../src/interface.c:4562 +#: ../src/interface.c:4620 msgid "The name of the developer" msgstr "Utvecklarens namn" -#: ../src/interface.c:4564 +#: ../src/interface.c:4622 msgid "Year:" msgstr "År:" -#: ../src/interface.c:4571 +#: ../src/interface.c:4629 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4578 +#: ../src/interface.c:4636 msgid "Date & Time:" msgstr "Datum och tid:" -#: ../src/interface.c:4590 +#: ../src/interface.c:4648 msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2675,7 +2716,7 @@ "Skriv in ett format för {datetime}. Du kan använda de " "konverteringskonventioner som används i ANSI C strftime-funktionen." -#: ../src/interface.c:4597 +#: ../src/interface.c:4655 msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2683,7 +2724,7 @@ "Skriv in ett format för att använda för {year}. Du kan använda den syntax " "som specificeras av ANSI C:s strftime funktion." -#: ../src/interface.c:4604 +#: ../src/interface.c:4662 msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " "specifiers which can be used with the ANSI C strftime function." @@ -2691,81 +2732,81 @@ "Skriv in ett format för att använda till fältet {date}. Du kan använda den " "syntax som specificeras av ANSI C:s strftime funktion." -#: ../src/interface.c:4606 +#: ../src/interface.c:4664 msgid "Template data" msgstr "Mall-data" -#: ../src/interface.c:4611 +#: ../src/interface.c:4669 msgid "Templates" msgstr "Mallar" -#: ../src/interface.c:4649 +#: ../src/interface.c:4707 msgid "C_hange" msgstr "Ändra" -#: ../src/interface.c:4653 +#: ../src/interface.c:4711 msgid "Keyboard shortcuts" msgstr "Tangentbordsgenvägar" -#: ../src/interface.c:4658 +#: ../src/interface.c:4716 msgid "Keybindings" msgstr "Genvägar" -#: ../src/interface.c:4681 +#: ../src/interface.c:4739 msgid "Command:" msgstr "Kommando:" -#: ../src/interface.c:4688 +#: ../src/interface.c:4746 #, c-format msgid "Path to the command for printing files (use %f for the filename)." msgstr "" "Sökvägen till kommandot för att skriva ut filer (%f ersätts med filnamnet)." -#: ../src/interface.c:4698 +#: ../src/interface.c:4756 msgid "Use an external command for printing" msgstr "Använd ett externt kommando för att skriva ut" -#: ../src/interface.c:4718 ../src/printing.c:343 +#: ../src/interface.c:4776 ../src/printing.c:342 msgid "Print line numbers" msgstr "Visa radnummer" -#: ../src/interface.c:4721 ../src/printing.c:345 +#: ../src/interface.c:4779 ../src/printing.c:344 msgid "Add line numbers to the printed page." msgstr "Lägg till radnummer vid utskrift." -#: ../src/interface.c:4723 ../src/printing.c:348 +#: ../src/interface.c:4781 ../src/printing.c:347 msgid "Print page numbers" msgstr "Skriv ut sidnummer" -#: ../src/interface.c:4726 ../src/printing.c:350 +#: ../src/interface.c:4784 ../src/printing.c:349 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "Lägg till sidnummer vid foten av sidan." -#: ../src/interface.c:4728 ../src/printing.c:353 +#: ../src/interface.c:4786 ../src/printing.c:352 msgid "Print page header" msgstr "Skriv ut filhuvud" -#: ../src/interface.c:4731 ../src/printing.c:355 +#: ../src/interface.c:4789 ../src/printing.c:354 msgid "" "Adds a little header to every page containing the page number, the filename " "and the current date(see below). It takes 3 lines of the page." msgstr "" "Lägger till tre rader i sidhuvudet som visar sidnummer, filnamn och datum." -#: ../src/interface.c:4748 ../src/printing.c:371 +#: ../src/interface.c:4806 ../src/printing.c:370 msgid "Use the basename of the printed file" msgstr "Använd den utskrivna filens basnamn" -#: ../src/interface.c:4751 ../src/printing.c:373 +#: ../src/interface.c:4809 ../src/printing.c:372 msgid "Print only the basename(without the path) of the printed file." msgstr "Skriv bara ut filnamnet, ej sökvägen." -#: ../src/interface.c:4757 ../src/printing.c:379 +#: ../src/interface.c:4815 ../src/printing.c:378 msgid "Date format:" msgstr "Datumformat:" -#: ../src/interface.c:4764 ../src/printing.c:384 +#: ../src/interface.c:4822 ../src/printing.c:383 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2775,15 +2816,15 @@ "sidhuvudet. Du kan använda den syntax som specificeras av ANSI C:s strftime " "funktion." -#: ../src/interface.c:4767 +#: ../src/interface.c:4825 msgid "Use native GTK printing" msgstr "Använd GTKs utskriftshantering" -#: ../src/interface.c:4773 +#: ../src/interface.c:4831 msgid "Printing" msgstr "Utskrift" -#: ../src/keybindings.c:182 ../src/plugins.c:1044 +#: ../src/keybindings.c:182 ../src/plugins.c:1037 msgid "File" msgstr "Fil" @@ -3000,7 +3041,7 @@ msgid "Settings" msgstr "Inställningar" -#: ../src/keybindings.c:317 ../src/search.c:304 +#: ../src/keybindings.c:317 ../src/search.c:311 msgid "Find" msgstr "Sök" @@ -3020,11 +3061,11 @@ msgid "Find Previous Selection" msgstr "Sök föregående markering" -#: ../src/keybindings.c:328 ../src/search.c:427 +#: ../src/keybindings.c:328 ../src/search.c:433 msgid "Replace" msgstr "Ersätt" -#: ../src/keybindings.c:330 ../src/search.c:578 +#: ../src/keybindings.c:330 ../src/search.c:575 msgid "Find in Files" msgstr "Sök i filer" @@ -3252,102 +3293,130 @@ msgid "Help" msgstr "Hjälp" -#: ../src/keybindings.c:712 +#: ../src/keybindings.c:713 msgid "Keyboard Shortcuts" msgstr "Tangentgenvägar" -#: ../src/keybindings.c:725 +#: ../src/keybindings.c:726 msgid "The following keyboard shortcuts are configurable:" msgstr "Följande tangentbordsgenvägar kan konfigureras:" -#: ../src/keyfile.c:817 +#: ../src/keyfile.c:821 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Skriv vad du vill här, använd den som ett klotterplank" -#: ../src/keyfile.c:1012 +#: ../src/keyfile.c:1016 msgid "Failed to load one or more session files." msgstr "Kunde ej ladda en eller fler av sessionens filer" #: ../src/log.c:177 msgid "Debug Messages" -msgstr "Debug meddelanden" +msgstr "Debugmeddelanden" -#: ../src/main.c:123 +#: ../src/main.c:121 msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "Sätt kolumn för markören vid öppnande av fil" -#: ../src/main.c:124 +#: ../src/main.c:122 msgid "Use an alternate configuration directory" msgstr "Använd en alternativ sökväg till konfigurationsfiler" -#: ../src/main.c:125 +#: ../src/main.c:123 msgid "Runs in debug mode (means being verbose)" msgstr "Kör i felsökningsläge (skriv ut extra information)" -#: ../src/main.c:126 +#: ../src/main.c:124 msgid "Print internal filetype names" msgstr "Skriv interna filtypsnamn" -#: ../src/main.c:127 +#: ../src/main.c:125 msgid "Generate global tags file (see documentation)" msgstr "Generera globala tagg-filer (se dokumentationen)" -#: ../src/main.c:131 +#: ../src/main.c:126 +msgid "Don't preprocess C/C++ files when generating tags" +msgstr "" + +#: ../src/main.c:129 msgid "Don't open files in a running instance, force opening a new instance" msgstr "" "Öppna inte filer i en existerande session, tvinga istället filen att öppnas " "i en ny session" -#: ../src/main.c:133 +#: ../src/main.c:131 msgid "Set initial line number for the first opened file" msgstr "Ange inledande radnummer för den först öppnade filen" -#: ../src/main.c:134 +#: ../src/main.c:132 msgid "Don't show message window at startup" msgstr "Visa inte meddelandefönster vid start" -#: ../src/main.c:135 +#: ../src/main.c:133 msgid "Don't load auto completion data (see documentation)" msgstr "Ladda inte autokompletteringsdata (se dokumentationen)" -#: ../src/main.c:137 +#: ../src/main.c:135 msgid "Don't load plugins" msgstr "Ladda inte tillägg" -#: ../src/main.c:139 +#: ../src/main.c:137 msgid "Print Geany's installation prefix" msgstr "Visa Geany's installationsprefix" -#: ../src/main.c:140 +#: ../src/main.c:138 msgid "don't load the previous session's files" msgstr "ladda inte förra sessionens filer" -#: ../src/main.c:142 +#: ../src/main.c:140 msgid "Don't load terminal support" msgstr "Ladda inte terminal-stöd" -#: ../src/main.c:143 +#: ../src/main.c:141 msgid "Filename of libvte.so" msgstr "Filnamn för libvte.so" -#: ../src/main.c:145 +#: ../src/main.c:143 msgid "Show version and exit" msgstr "Visa version och avsluta" -#: ../src/main.c:481 +#: ../src/main.c:497 msgid "[FILES...]" msgstr "[FILER...]" -#: ../src/main.c:498 +#: ../src/main.c:514 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(byggd %s med GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:602 +#: ../src/main.c:612 +msgid "Move it now?" +msgstr "" + +#: ../src/main.c:614 +msgid "Geany needs to move your old configuration directory before starting." +msgstr "" + +#: ../src/main.c:620 #, c-format msgid "" +"Your configuration directory has been successfully moved from \"%s\" to \"%s" +"\"." +msgstr "" + +#. for translators: the third %s in brackets is the error message which +#. * describes why moving the dir didn't work +#: ../src/main.c:630 +#, c-format +msgid "" +"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " +"Please move manually the directory to the new location." +msgstr "" + +#: ../src/main.c:710 +#, c-format +msgid "" "Configuration directory could not be created (%s).\n" "There could be some problems using Geany without a configuration directory.\n" "Start Geany anyway?" @@ -3357,22 +3426,27 @@ "konfigureringsmapp.\n" "Starta Geany ändå?" -#: ../src/main.c:672 ../src/socket.c:157 +#: ../src/main.c:780 ../src/socket.c:157 #, c-format msgid "Could not find file '%s'." msgstr "Kunde inte hitta fil '%s'." -#: ../src/main.c:829 +#: ../src/main.c:830 #, c-format +msgid "Ignoring extra filenames after %s" +msgstr "" + +#: ../src/main.c:976 +#, c-format msgid "This is Geany %s." msgstr "Detta är Geany %s." -#: ../src/main.c:831 +#: ../src/main.c:978 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigureringsmappen kunde inte skapas (%s)" -#: ../src/main.c:1051 +#: ../src/main.c:1179 msgid "Configuration files reloaded." msgstr "Konfigurationsfilerna laddades om." @@ -3388,7 +3462,7 @@ msgid "_Hide Message Window" msgstr "Dölj meddelandefönster" -#: ../src/plugins.c:393 +#: ../src/plugins.c:399 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3397,11 +3471,11 @@ "Tillägget \"%s\" är inte binärt kompatibel med denna version av Geany. Var " "god, kompilera om modulen." -#: ../src/plugins.c:799 +#: ../src/plugins.c:828 msgid "_Plugin Manager" msgstr "Tillägshanteraren" -#: ../src/plugins.c:966 +#: ../src/plugins.c:959 #, c-format msgid "" "Plugin: %s %s\n" @@ -3412,23 +3486,23 @@ "Beskrivning: %s\n" "Utvecklare: %s" -#: ../src/plugins.c:1032 +#: ../src/plugins.c:1025 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1038 +#: ../src/plugins.c:1031 msgid "Plugin" msgstr "Tillägg" -#: ../src/plugins.c:1062 +#: ../src/plugins.c:1055 msgid "No plugins available." msgstr "Inga tillägg är tillgängliga" -#: ../src/plugins.c:1171 +#: ../src/plugins.c:1164 msgid "Plugins" msgstr "Tillägg" -#: ../src/plugins.c:1191 +#: ../src/plugins.c:1184 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3436,7 +3510,7 @@ "Nedan ser du en lista med insticksmoduler. Välj vilka insticksmoduler som " "skall laddas när Geany startas." -#: ../src/plugins.c:1199 +#: ../src/plugins.c:1192 msgid "Plugin details:" msgstr "Plugin egenskaper:" @@ -3448,24 +3522,24 @@ msgid "Shortcut" msgstr "Genväg" -#: ../src/prefs.c:1283 +#: ../src/prefs.c:1295 msgid "Grab Key" msgstr "Läs av tangent" -#: ../src/prefs.c:1289 +#: ../src/prefs.c:1301 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Skriv in den tangentbordskombination du vill använda för \"%s\"" -#: ../src/prefs.c:1476 +#: ../src/prefs.c:1488 msgid "_Override" msgstr "Bryt" -#: ../src/prefs.c:1477 +#: ../src/prefs.c:1489 msgid "Override that keybinding?" msgstr "Vill du bryta tangentbindning?" -#: ../src/prefs.c:1478 +#: ../src/prefs.c:1490 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" @@ -3474,20 +3548,20 @@ #. add manually GeanyWrapLabels because it can't be added with Glade #. * page Tools -#: ../src/prefs.c:1590 +#: ../src/prefs.c:1602 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." #. page Templates -#: ../src/prefs.c:1595 +#: ../src/prefs.c:1607 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/prefs.c:1599 +#: ../src/prefs.c:1611 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany or force the reload of the settings using Tools->Reload Configuration." @@ -3497,7 +3571,7 @@ "Geany." #. page Keybindings -#: ../src/prefs.c:1605 +#: ../src/prefs.c:1617 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 " @@ -3508,7 +3582,7 @@ "manuellt." #. page Printing -#: ../src/prefs.c:1610 +#: ../src/prefs.c:1622 msgid "" "Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." @@ -3522,30 +3596,30 @@ msgid "Page %d of %d" msgstr "Sida %d av %d" -#: ../src/printing.c:338 +#: ../src/printing.c:337 msgid "Document Setup" msgstr "Dokumentinställningar" -#: ../src/printing.c:727 +#: ../src/printing.c:726 #, c-format msgid "Printing of file %s was cancelled." msgstr "Utskriften av filen %s avbröts" -#: ../src/printing.c:729 ../src/printing.c:848 +#: ../src/printing.c:728 ../src/printing.c:847 #, c-format msgid "File %s printed." msgstr "Fil %s utskriven." -#: ../src/printing.c:778 +#: ../src/printing.c:777 #, c-format msgid "Printing of %s failed (%s)." msgstr "Utskriften \"%s\" misslyckades (felkod: %s)." -#: ../src/printing.c:818 +#: ../src/printing.c:817 msgid "Please set a print command in the preferences dialog first" msgstr "Ställ in ett utskriftskommando i inställningarna först" -#: ../src/printing.c:826 +#: ../src/printing.c:825 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3556,7 +3630,7 @@ "\n" "%s" -#: ../src/printing.c:842 +#: ../src/printing.c:841 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Utskriften \"%s\" misslyckades (felkod: %s)." @@ -3567,27 +3641,27 @@ msgid "projects" msgstr "projekt" -#: ../src/project.c:109 +#: ../src/project.c:108 msgid "New Project" msgstr "Nytt projekt" -#: ../src/project.c:117 +#: ../src/project.c:116 msgid "C_reate" msgstr "Skapa" -#: ../src/project.c:131 ../src/project.c:369 +#: ../src/project.c:130 ../src/project.c:367 msgid "Name:" msgstr "Namn:" -#: ../src/project.c:139 ../src/project.c:381 +#: ../src/project.c:138 ../src/project.c:379 msgid "Filename:" msgstr "Filnamn:" -#: ../src/project.c:154 ../src/project.c:410 +#: ../src/project.c:153 ../src/project.c:408 msgid "Base path:" msgstr "Bassökväg:" -#: ../src/project.c:159 ../src/project.c:418 +#: ../src/project.c:158 ../src/project.c:416 msgid "" "Base directory of all files that make up the project. This can be a new " "path, or an existing directory tree. You can use paths relative to the " @@ -3596,140 +3670,140 @@ "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:162 ../src/project.c:421 +#: ../src/project.c:161 ../src/project.c:419 msgid "Choose Project Base Path" msgstr "Välj projektets sökväg" -#: ../src/project.c:207 ../src/project.c:244 ../src/project.c:869 +#: ../src/project.c:206 ../src/project.c:243 ../src/project.c:867 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Projektfilen \"%s\" kunde inte laddas." -#: ../src/project.c:238 ../src/project.c:256 +#: ../src/project.c:237 ../src/project.c:255 msgid "Open Project" msgstr "Öppna projekt" -#: ../src/project.c:276 +#: ../src/project.c:275 msgid "Project files" msgstr "Projektfiler" -#: ../src/project.c:309 +#: ../src/project.c:308 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt \"%s\" stängt." -#: ../src/project.c:357 +#: ../src/project.c:355 msgid "Project Properties" msgstr "Projektegenskaper" -#: ../src/project.c:393 +#: ../src/project.c:391 msgid "Description:" msgstr "Beskrivning:" -#: ../src/project.c:427 +#: ../src/project.c:425 msgid "Make in base path" msgstr "Kör Make i bassökvägen" -#: ../src/project.c:432 +#: ../src/project.c:430 msgid "Run command:" msgstr "Kör kommando:" -#: ../src/project.c:440 +#: ../src/project.c:438 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:455 +#: ../src/project.c:453 msgid "File patterns:" msgstr "Fil-mönster:" -#: ../src/project.c:549 +#: ../src/project.c:547 msgid "Do you want to close it before proceeding?" msgstr "Vill du stänga innan du fortsätter?" -#: ../src/project.c:550 +#: ../src/project.c:548 #, c-format msgid "The '%s' project is already open." msgstr "Projektet '%s' är redan öppnat." -#: ../src/project.c:580 +#: ../src/project.c:578 msgid "The specified project name is too short." msgstr "Projektnamnet är för kort." -#: ../src/project.c:586 +#: ../src/project.c:584 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Projektnamnet är för långt (max. %d tecken)." -#: ../src/project.c:594 +#: ../src/project.c:592 msgid "You have specified an invalid project filename." msgstr "Du har valt ett ogiltigt filnamn." -#: ../src/project.c:617 +#: ../src/project.c:615 msgid "Create the project's base path directory?" msgstr "Vill du skapa projektets basmapp?" -#: ../src/project.c:618 +#: ../src/project.c:616 #, c-format msgid "The path \"%s\" does not exist." msgstr "Sökvägen \"%s\" existerar inte." -#: ../src/project.c:627 +#: ../src/project.c:625 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektets basmapp kunde inte skapas (%s)" -#: ../src/project.c:639 +#: ../src/project.c:637 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektfilen kunde inte skrivas (%s)." -#: ../src/project.c:687 +#: ../src/project.c:685 #, c-format msgid "Project \"%s\" created." msgstr "Projekt \"%s\" skapad." -#: ../src/project.c:689 +#: ../src/project.c:687 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt \"%s\" sparad." #. initialise the dialog -#: ../src/project.c:755 ../src/project.c:766 +#: ../src/project.c:753 ../src/project.c:764 msgid "Choose Project Filename" msgstr "Välj projektets filnamn" #. initialise the dialog -#: ../src/project.c:784 ../src/project.c:795 +#: ../src/project.c:782 ../src/project.c:793 msgid "Choose Project Run Command" msgstr "Välj projektets körkommando" -#: ../src/project.c:862 +#: ../src/project.c:860 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt \"%s\" öppnad." -#: ../src/search.c:139 +#: ../src/search.c:147 msgid "_Use regular expressions" msgstr "Använd regular expressions" -#: ../src/search.c:143 +#: ../src/search.c:151 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "" "Använd POSIX Regular Expressions. För mer information, se dokumentationen." -#: ../src/search.c:150 +#: ../src/search.c:158 msgid "Search _backwards" msgstr "Sök bakåt" -#: ../src/search.c:164 +#: ../src/search.c:172 msgid "Use _escape sequences" msgstr "Använd escape-sekvenser" -#: ../src/search.c:169 +#: ../src/search.c:177 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters." @@ -3737,171 +3811,176 @@ "Ersätt \\\\, \\t, \\n, \\r and \\uXXXX (Unicode tecken) med korresponderande " "specialtecken." -#: ../src/search.c:178 ../src/search.c:652 +#: ../src/search.c:186 ../src/search.c:666 msgid "C_ase sensitive" msgstr "Gör skillnad mellan versaler och gemener" -#: ../src/search.c:183 ../src/search.c:658 +#: ../src/search.c:191 ../src/search.c:672 msgid "Match only a _whole word" msgstr "Sök endast hela ord" -#: ../src/search.c:188 +#: ../src/search.c:196 msgid "Match from s_tart of word" msgstr "Sök från början av ord" -#: ../src/search.c:311 +#: ../src/search.c:318 msgid "_Previous" msgstr "Föregående" -#: ../src/search.c:317 +#: ../src/search.c:324 msgid "_Next" msgstr "Nästa" -#: ../src/search.c:321 ../src/search.c:444 ../src/search.c:603 +#: ../src/search.c:328 ../src/search.c:450 ../src/search.c:599 msgid "_Search for:" msgstr "Sök efter:" #. Now add the multiple match options -#: ../src/search.c:348 +#: ../src/search.c:355 msgid "_Find All" msgstr "Hitta alla" -#: ../src/search.c:351 +#: ../src/search.c:358 msgid "_Mark" msgstr "Markera" -#: ../src/search.c:353 +#: ../src/search.c:360 msgid "Mark all matches in the current document." msgstr "Markera alla träffar i detta dokument." -#: ../src/search.c:358 ../src/search.c:504 +#: ../src/search.c:365 ../src/search.c:510 msgid "In Sessi_on" msgstr "I Session" -#: ../src/search.c:363 ../src/search.c:509 +#: ../src/search.c:370 ../src/search.c:515 msgid "_In Document" msgstr "I dokumentet" #. close window checkbox -#: ../src/search.c:369 ../src/search.c:515 +#: ../src/search.c:376 ../src/search.c:521 msgid "Close _dialog" msgstr "Stäng dialogruta" -#: ../src/search.c:374 ../src/search.c:520 +#: ../src/search.c:381 ../src/search.c:526 msgid "Disable this option to keep the dialog open." msgstr "Avaktivera detta tillval för att hålla dialogrutan öppen." -#: ../src/search.c:440 +#: ../src/search.c:446 msgid "Replace & Fi_nd" msgstr "Sök & ersätt" -#: ../src/search.c:447 +#: ../src/search.c:453 msgid "Replace wit_h:" msgstr "Ersätt med:" #. Now add the multiple replace options -#: ../src/search.c:494 +#: ../src/search.c:500 msgid "Re_place All" msgstr "Ersätt alla" -#: ../src/search.c:497 +#: ../src/search.c:503 msgid "In Se_lection" msgstr "I markering" -#: ../src/search.c:499 +#: ../src/search.c:505 msgid "Replace all matches found in the currently selected text" msgstr "Ersätt alla träffar i markerad text" -#: ../src/search.c:588 +#: ../src/search.c:585 msgid "_Directory:" msgstr "Sökväg:" -#: ../src/search.c:623 +#: ../src/search.c:614 +#, fuzzy +msgid "E_ncoding:" +msgstr "Välj teckenkodning:" + +#: ../src/search.c:639 msgid "Fixed s_trings" msgstr "Fixerade strängar" -#: ../src/search.c:632 +#: ../src/search.c:648 msgid "_Grep regular expressions" msgstr "Grep Regular Expressions" -#: ../src/search.c:636 ../src/search.c:643 +#: ../src/search.c:651 ../src/search.c:657 msgid "See grep's manual page for more information." msgstr "Läs Grep's manualsida för mer information." -#: ../src/search.c:641 +#: ../src/search.c:656 msgid "_Extended regular expressions" msgstr "Utöka Regular Expressions" -#: ../src/search.c:647 +#: ../src/search.c:661 msgid "_Recurse in subfolders" msgstr "Gå igenom undermappar" -#: ../src/search.c:663 +#: ../src/search.c:677 msgid "_Invert search results" msgstr "Invertera sökresultat" -#: ../src/search.c:668 +#: ../src/search.c:682 msgid "Invert the sense of matching, to select non-matching lines." msgstr "Invertera träffar, välj de rader som inte har några träffar." -#: ../src/search.c:684 +#: ../src/search.c:699 msgid "E_xtra options:" msgstr "Extra inställningar:" -#: ../src/search.c:696 +#: ../src/search.c:708 msgid "Other options to pass to Grep" msgstr "Andra tillval att skicka till Grep" -#: ../src/search.c:916 ../src/search.c:1434 ../src/search.c:1437 +#: ../src/search.c:964 ../src/search.c:1542 ../src/search.c:1545 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Hittat %d träff för \"%s\"." msgstr[1] "Hittat %d träffar för \"%s\"" -#: ../src/search.c:1030 +#: ../src/search.c:1078 #, c-format msgid "Replaced text in %u file." @@ 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:[3251] trunk/src/sciwrappers.c
by eht16＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3251 http://geany.svn.sourceforge.net/geany/?rev=3251&view=rev Author: eht16 Date: 2008-11-18 20:14:58 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Fix doc comment. Modified Paths: -------------- trunk/src/sciwrappers.c Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2008-11-18 20:14:42 UTC (rev 3250) +++ trunk/src/sciwrappers.c 2008-11-18 20:14:58 UTC (rev 3251) @@ -995,7 +995,7 @@ * Clear a range of text from the currently set indicator. * Starting at @a pos, @a len characters long. * In order to make this function properly, you need to set the current indicator before with - * @ref sci_set_indicator(). + * @ref sci_indicator_set(). * * @param sci Scintilla widget. * @param pos Starting position. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3250] trunk
by eht16＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3250 http://geany.svn.sourceforge.net/geany/?rev=3250&view=rev Author: eht16 Date: 2008-11-18 20:14:42 +0000 (Tue, 18 Nov 2008) Log Message: ----------- dd ui_widget_set_tooltip_text() as a convenience function to easily set tooltips for widgets. It uses gtk_widget_set_tooltip_text() on GTK >= 2.12 otherwise the old tooltips API.Use ui_widget_set_tooltip_text(). Use ui_widget_set_tooltip_text() in the plugins. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/export.c trunk/plugins/filebrowser.c trunk/plugins/splitwindow.c trunk/plugins/vcdiff.c trunk/src/dialogs.c trunk/src/document.c trunk/src/plugindata.h trunk/src/plugins.c trunk/src/printing.c trunk/src/project.c trunk/src/search.c trunk/src/ui_utils.c trunk/src/ui_utils.h trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/ChangeLog 2008-11-18 20:14:42 UTC (rev 3250) @@ -8,6 +8,15 @@ Add note about the encoding box in the Find in Files dialog. * src/document.c, src/document.h, src/notebook.c: Show the full filename of a document as tooltip on the tab labels. + * src/dialogs.c, src/document.c, src/plugindata.h, src/plugins.c, + src/printing.c, src/project.c, src/search.c, src/ui_utils.c, + src/ui_utils.h, src/vte.c: + Add ui_widget_set_tooltip_text() as a convenience function to easily + set tooltips for widgets. It uses gtk_widget_set_tooltip_text() on + GTK >= 2.12 otherwise the old tooltips API. + * plugins/export.c, plugins/filebrowser.c, plugins/splitwindow.c, + plugins/vcdiff.c: + Use ui_widget_set_tooltip_text(). 2008-11-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/plugins/export.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -158,7 +158,6 @@ gboolean show_zoom_level_checkbox) { GtkWidget *dialog; - GtkTooltips *tooltips; GeanyDocument *doc; ExportInfo *exi; @@ -166,7 +165,6 @@ return; doc = p_document->get_current(); - tooltips = GTK_TOOLTIPS(p_support->lookup_widget(geany->main_widgets->window, "tooltips")); exi = g_new(ExportInfo, 1); exi->doc = doc; @@ -191,8 +189,8 @@ vbox = gtk_vbox_new(FALSE, 0); check_zoom_level = gtk_check_button_new_with_mnemonic(_("_Use current zoom level")); - gtk_tooltips_set_tip(tooltips, check_zoom_level, - _("Renders the font size of the document together with the current zoom level."), NULL); + p_ui->widget_set_tooltip_text(check_zoom_level, + _("Renders the font size of the document together with the current zoom level.")); gtk_box_pack_start(GTK_BOX(vbox), check_zoom_level, FALSE, FALSE, 0); gtk_widget_show_all(vbox); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), vbox); Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/plugins/filebrowser.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -719,34 +719,28 @@ static GtkWidget *make_toolbar(void) { GtkWidget *wid, *toolbar; - GtkTooltips *tooltips = GTK_TOOLTIPS(p_support->lookup_widget( - geany->main_widgets->window, "tooltips")); toolbar = gtk_toolbar_new(); gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_GO_UP); - gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(wid), tooltips, - _("Up"), NULL); + p_ui->widget_set_tooltip_text(wid, _("Up")); g_signal_connect(wid, "clicked", G_CALLBACK(on_go_up), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH); - gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(wid), tooltips, - _("Refresh"), NULL); + p_ui->widget_set_tooltip_text(wid, _("Refresh")); g_signal_connect(wid, "clicked", G_CALLBACK(refresh), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_HOME); - gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(wid), tooltips, - _("Home"), NULL); + p_ui->widget_set_tooltip_text(wid, _("Home")); g_signal_connect(wid, "clicked", G_CALLBACK(on_go_home), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_JUMP_TO); - gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(wid), tooltips, - _("Set path from document"), NULL); + p_ui->widget_set_tooltip_text(wid, _("Set path from document")); g_signal_connect(wid, "clicked", G_CALLBACK(on_current_path), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); @@ -754,7 +748,7 @@ gtk_container_add(GTK_CONTAINER(toolbar), wid); wid = (GtkWidget *) gtk_tool_button_new_from_stock(GTK_STOCK_CLEAR); - gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(wid), tooltips, _("Clear the filter"), NULL); + p_ui->widget_set_tooltip_text(wid, _("Clear the filter")); g_signal_connect(wid, "clicked", G_CALLBACK(on_clear_filter), NULL); gtk_container_add(GTK_CONTAINER(toolbar), wid); @@ -986,7 +980,6 @@ GtkWidget *plugin_configure(GtkDialog *dialog) { GtkWidget *label, *entry, *checkbox_of, *checkbox_hf, *vbox; - GtkTooltips *tooltips = gtk_tooltips_new(); vbox = gtk_vbox_new(FALSE, 6); @@ -998,11 +991,10 @@ gtk_widget_show(entry); if (open_cmd != NULL) gtk_entry_set_text(GTK_ENTRY(entry), open_cmd); - gtk_tooltips_set_tip(tooltips, entry, + p_ui->widget_set_tooltip_text(entry, _("The command to execute when using \"Open with\". You can use %f and %d wildcards.\n" "%f will be replaced with the filename including full path\n" - "%d will be replaced with the path name of the selected file without the filename"), - NULL); + "%d will be replaced with the path name of the selected file without the filename")); gtk_container_add(GTK_CONTAINER(vbox), entry); pref_widgets.open_cmd_entry = entry; @@ -1015,10 +1007,9 @@ checkbox_of = gtk_check_button_new_with_label(_("Hide object files")); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_of), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_of), hide_object_files); - gtk_tooltips_set_tip(tooltips, checkbox_of, + p_ui->widget_set_tooltip_text(checkbox_of, _("Don't show generated object files in the file browser, this includes " - "*.o, *.obj. *.so, *.dll, *.a, *.lib"), - NULL); + "*.o, *.obj. *.so, *.dll, *.a, *.lib")); gtk_box_pack_start(GTK_BOX(vbox), checkbox_of, FALSE, FALSE, 5); pref_widgets.hide_objects_checkbox = checkbox_of; Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/plugins/splitwindow.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -215,12 +215,10 @@ static GtkWidget *create_tool_button(const gchar *label, const gchar *stock_id) { GtkToolItem *item; - GtkTooltips *tooltips = GTK_TOOLTIPS(p_support->lookup_widget( - geany->main_widgets->window, "tooltips")); item = gtk_tool_button_new(NULL, label); gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), stock_id); - gtk_tool_item_set_tooltip(item, tooltips, label, NULL); + p_ui->widget_set_tooltip_text(GTK_WIDGET(item), label); return GTK_WIDGET(item); } Modified: trunk/plugins/vcdiff.c =================================================================== --- trunk/plugins/vcdiff.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/plugins/vcdiff.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -281,7 +281,7 @@ { GeanyIndentType indent_type = p_document->get_current()->editor->indent_type; - + doc = p_document->find_by_filename(filename); if (doc == NULL) { @@ -502,10 +502,7 @@ { GtkWidget *menu_vcdiff = NULL; GtkWidget *menu_vcdiff_menu = NULL; - GtkTooltips *tooltips = NULL; - tooltips = gtk_tooltips_new(); - menu_vcdiff = gtk_image_menu_item_new_with_mnemonic(_("_Version Diff")); gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_vcdiff); @@ -517,24 +514,23 @@ /* Single file */ menu_vcdiff_file = gtk_menu_item_new_with_mnemonic(_("From Current _File")); gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_file); - gtk_tooltips_set_tip (tooltips, menu_vcdiff_file, - _("Make a diff from the current active file"), NULL); + p_ui->widget_set_tooltip_text(menu_vcdiff_file, _("Make a diff from the current active file")); g_signal_connect(menu_vcdiff_file, "activate", G_CALLBACK(vcfile_activated), NULL); /* Directory */ menu_vcdiff_dir = gtk_menu_item_new_with_mnemonic(_("From Current _Directory")); gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_dir); - gtk_tooltips_set_tip (tooltips, menu_vcdiff_dir, - _("Make a diff from the directory of the current active file"), NULL); + p_ui->widget_set_tooltip_text(menu_vcdiff_dir, + _("Make a diff from the directory of the current active file")); g_signal_connect(menu_vcdiff_dir, "activate", G_CALLBACK(vcdirectory_activated), NULL); /* Project */ menu_vcdiff_project = gtk_menu_item_new_with_mnemonic(_("From Current _Project")); gtk_container_add(GTK_CONTAINER (menu_vcdiff_menu), menu_vcdiff_project); - gtk_tooltips_set_tip (tooltips, menu_vcdiff_project, - _("Make a diff from the current project's base path"), NULL); + p_ui->widget_set_tooltip_text(menu_vcdiff_project, + _("Make a diff from the current project's base path")); g_signal_connect(menu_vcdiff_project, "activate", G_CALLBACK(vcproject_activated), NULL); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/dialogs.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -171,7 +171,6 @@ { GtkWidget *filetype_combo, *encoding_combo; GtkWidget *viewbtn; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); guint i; gchar *encoding_string; @@ -181,8 +180,8 @@ viewbtn = gtk_dialog_add_button(GTK_DIALOG(ui_widgets.open_filesel), _("_View"), GEANY_RESPONSE_VIEW); - gtk_tooltips_set_tip(tooltips, viewbtn, - _("Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only."), NULL); + ui_widget_set_tooltip_text(viewbtn, + _("Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only.")); gtk_dialog_add_buttons(GTK_DIALOG(ui_widgets.open_filesel), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -288,7 +287,6 @@ GtkWidget *vbox, *table, *file_entry, *check_hidden; GtkWidget *filetype_ebox, *filetype_label, *filetype_combo; GtkWidget *encoding_ebox, *encoding_label, *encoding_combo; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); vbox = gtk_vbox_new(FALSE, 6); @@ -315,8 +313,8 @@ encoding_ebox = gtk_event_box_new(); encoding_combo = gtk_combo_box_new_text(); gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(encoding_combo), 3); - gtk_tooltips_set_tip(tooltips, encoding_ebox, - _("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.\nNote if you choose multiple files, they will all be opened with the chosen encoding."), NULL); + ui_widget_set_tooltip_text(encoding_ebox, + _("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.\nNote if you choose multiple files, they will all be opened with the chosen encoding.")); gtk_container_add(GTK_CONTAINER(encoding_ebox), encoding_combo); gtk_table_attach(GTK_TABLE(table), encoding_ebox, 3, 4, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -345,8 +343,8 @@ filetype_ebox = gtk_event_box_new(); filetype_combo = gtk_combo_box_new_text(); gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(filetype_combo), 2); - gtk_tooltips_set_tip(tooltips, filetype_ebox, - _("Explicitly defines a filetype for the file, if it would not be detected by filename extension.\nNote if you choose multiple files, they will all be opened with the chosen filetype."), NULL); + ui_widget_set_tooltip_text(filetype_ebox, + _("Explicitly defines a filetype for the file, if it would not be detected by filename extension.\nNote if you choose multiple files, they will all be opened with the chosen filetype.")); gtk_container_add(GTK_CONTAINER(filetype_ebox), filetype_combo); gtk_table_attach(GTK_TABLE(table), filetype_ebox, 3, 4, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -474,7 +472,6 @@ static void create_save_file_dialog(void) { GtkWidget *vbox, *check_open_new_tab, *rename_btn; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); ui_widgets.save_filesel = gtk_file_chooser_dialog_new(_("Save File"), GTK_WINDOW(main_widgets.window), GTK_FILE_CHOOSER_ACTION_SAVE, NULL, NULL); @@ -486,8 +483,7 @@ rename_btn = gtk_dialog_add_button(GTK_DIALOG(ui_widgets.save_filesel), _("R_ename"), GEANY_RESPONSE_RENAME); - gtk_tooltips_set_tip(tooltips, rename_btn, - _("Save the file and rename it."), NULL); + ui_widget_set_tooltip_text(rename_btn, _("Save the file and rename it.")); gtk_dialog_add_buttons(GTK_DIALOG(ui_widgets.save_filesel), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -496,9 +492,9 @@ vbox = gtk_vbox_new(FALSE, 0); check_open_new_tab = gtk_check_button_new_with_mnemonic(_("_Open file in a new tab")); - gtk_tooltips_set_tip(tooltips, check_open_new_tab, + ui_widget_set_tooltip_text(check_open_new_tab, _("Keep the current unsaved document open" - " and open the newly saved file in a new tab."), NULL); + " and open the newly saved file in a new tab.")); gtk_box_pack_start(GTK_BOX(vbox), check_open_new_tab, FALSE, FALSE, 0); gtk_widget_show_all(vbox); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(ui_widgets.save_filesel), vbox); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/document.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -279,20 +279,16 @@ { gchar *base_name; GtkWidget *parent; - static GtkTooltips *tooltips = NULL; g_return_if_fail(doc != NULL); base_name = g_path_get_basename(DOC_FILENAME(doc)); parent = gtk_widget_get_parent(doc->priv->tab_label); - if (tooltips == NULL) - tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); - gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name); gtk_label_set_text(GTK_LABEL(doc->priv->tabmenu_label), base_name); - gtk_tooltips_set_tip(tooltips, parent, DOC_FILENAME(doc), NULL); + ui_widget_set_tooltip_text(parent, DOC_FILENAME(doc)); g_free(base_name); } Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/plugindata.h 2008-11-18 20:14:42 UTC (rev 3250) @@ -45,7 +45,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 108, + GEANY_API_VERSION = 109, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -358,6 +358,7 @@ GtkWidget* (*path_box_new) (const gchar *title, GtkFileChooserAction action, GtkEntry *entry); GtkWidget* (*button_new_with_image) (const gchar *stock_id, const gchar *text); void (*add_document_sensitive) (GtkWidget *widget); + void (*widget_set_tooltip_text) (GtkWidget *widget, const gchar *text); } UIUtilsFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/plugins.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -206,7 +206,8 @@ &ui_table_add_row, &ui_path_box_new, &ui_button_new_with_image, - &ui_add_document_sensitive + &ui_add_document_sensitive, + &ui_widget_set_tooltip_text }; static DialogFuncs dialog_funcs = { Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/printing.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -332,7 +332,6 @@ GtkWidget *vbox30; GtkWidget *hbox10; GtkWidget *label203; - GtkTooltips *tooltips = gtk_tooltips_new(); PrintWidgets *w = user_data; gtk_print_operation_set_custom_tab_label(operation, _("Document Setup")); @@ -342,17 +341,17 @@ w->check_print_linenumbers = gtk_check_button_new_with_mnemonic(_("Print line numbers")); gtk_box_pack_start(GTK_BOX(page), w->check_print_linenumbers, FALSE, FALSE, 0); - gtk_tooltips_set_tip(tooltips, w->check_print_linenumbers, _("Add line numbers to the printed page."), NULL); + ui_widget_set_tooltip_text(w->check_print_linenumbers, _("Add line numbers to the printed page.")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->check_print_linenumbers), printing_prefs.print_line_numbers); w->check_print_pagenumbers = gtk_check_button_new_with_mnemonic(_("Print page numbers")); gtk_box_pack_start(GTK_BOX(page), w->check_print_pagenumbers, FALSE, FALSE, 0); - gtk_tooltips_set_tip(tooltips, w->check_print_pagenumbers, _("Add page numbers at the bottom of each page. It takes 2 lines of the page."), NULL); + ui_widget_set_tooltip_text(w->check_print_pagenumbers, _("Add page numbers at the bottom of each page. It takes 2 lines of the page.")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->check_print_pagenumbers), printing_prefs.print_page_numbers); w->check_print_pageheader = gtk_check_button_new_with_mnemonic(_("Print page header")); gtk_box_pack_start(GTK_BOX(page), w->check_print_pageheader, FALSE, FALSE, 0); - gtk_tooltips_set_tip(tooltips, w->check_print_pageheader, _("Adds a little header to every page containing the page number, the filename and the current date(see below). It takes 3 lines of the page."), NULL); + ui_widget_set_tooltip_text(w->check_print_pageheader, _("Adds a little header to every page containing the page number, the filename and the current date(see below). It takes 3 lines of the page.")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->check_print_pageheader), printing_prefs.print_page_header); g_signal_connect(w->check_print_pageheader, "toggled", G_CALLBACK(on_page_header_toggled), w); @@ -370,7 +369,7 @@ w->check_print_basename = gtk_check_button_new_with_mnemonic(_("Use the basename of the printed file")); gtk_box_pack_start(GTK_BOX(vbox30), w->check_print_basename, FALSE, FALSE, 0); - gtk_tooltips_set_tip(tooltips, w->check_print_basename, _("Print only the basename(without the path) of the printed file."), NULL); + ui_widget_set_tooltip_text(w->check_print_basename, _("Print only the basename(without the path) of the printed file.")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w->check_print_basename), printing_prefs.page_header_basename); hbox10 = gtk_hbox_new(FALSE, 5); @@ -381,7 +380,7 @@ w->entry_print_dateformat = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox10), w->entry_print_dateformat, TRUE, TRUE, 0); - gtk_tooltips_set_tip(tooltips, w->entry_print_dateformat, _("Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function."), NULL); + ui_widget_set_tooltip_text(w->entry_print_dateformat, _("Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function.")); gtk_entry_set_text(GTK_ENTRY(w->entry_print_dateformat), printing_prefs.page_header_datefmt); on_page_header_toggled(GTK_TOGGLE_BUTTON(w->check_print_pageheader), w); Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/project.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -97,7 +97,6 @@ GtkWidget *button; GtkWidget *bbox; GtkWidget *label; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); PropertyDialogElements *e; gint response; @@ -155,10 +154,10 @@ gtk_misc_set_alignment(GTK_MISC(label), 1, 0); e->base_path = gtk_entry_new(); - gtk_tooltips_set_tip(tooltips, e->base_path, + ui_widget_set_tooltip_text(e->base_path, _("Base directory of all files that make up the project. " "This can be a new path, or an existing directory tree. " - "You can use paths relative to the project filename."), NULL); + "You can use paths relative to the project filename.")); bbox = ui_path_box_new(_("Choose Project Base Path"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path)); @@ -352,7 +351,6 @@ GtkWidget *bbox; GtkWidget *label; GtkWidget *swin; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); e->dialog = gtk_dialog_new_with_buttons(_("Project Properties"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -414,10 +412,10 @@ gtk_misc_set_alignment(GTK_MISC(label), -1, 0); e->base_path = gtk_entry_new(); - gtk_tooltips_set_tip(tooltips, e->base_path, + ui_widget_set_tooltip_text(e->base_path, _("Base directory of all files that make up the project. " "This can be a new path, or an existing directory tree. " - "You can use paths relative to the project filename."), NULL); + "You can use paths relative to the project filename.")); bbox = ui_path_box_new(_("Choose Project Base Path"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path)); gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 3, 4, @@ -436,10 +434,10 @@ gtk_misc_set_alignment(GTK_MISC(label), -1, 0); e->run_cmd = gtk_entry_new(); - gtk_tooltips_set_tip(tooltips, e->run_cmd, + ui_widget_set_tooltip_text(e->run_cmd, _("Command-line to run in the project base directory. " "Options can be appended to the command. " - "Leave blank to use the default run command."), NULL); + "Leave blank to use the default run command.")); button = gtk_button_new(); g_signal_connect(button, "clicked", G_CALLBACK(on_file_open_button_clicked), e->run_cmd); image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/search.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -143,14 +143,13 @@ { GtkWidget *checkbox1, *checkbox2, *check_regexp, *check_back, *checkbox5, *checkbox7, *hbox, *fbox, *mbox; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); check_regexp = gtk_check_button_new_with_mnemonic(_("_Use regular expressions")); g_object_set_data_full(G_OBJECT(dialog), "check_regexp", g_object_ref(check_regexp), (GDestroyNotify) g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_regexp), FALSE); - gtk_tooltips_set_tip(tooltips, check_regexp, _("Use POSIX-like regular expressions. " - "For detailed information about using regular expressions, please read the documentation."), NULL); + ui_widget_set_tooltip_text(check_regexp, _("Use POSIX-like regular expressions. " + "For detailed information about using regular expressions, please read the documentation.")); g_signal_connect(check_regexp, "toggled", G_CALLBACK(on_find_replace_checkbutton_toggled), GTK_WIDGET(dialog)); @@ -174,9 +173,9 @@ g_object_set_data_full(G_OBJECT(dialog), "check_escape", g_object_ref(checkbox7), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox7), FALSE); - gtk_tooltips_set_tip(tooltips, checkbox7, + ui_widget_set_tooltip_text(checkbox7, _("Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " - "corresponding control characters."), NULL); + "corresponding control characters.")); /* Search features */ fbox = gtk_vbox_new(FALSE, 0); @@ -306,7 +305,6 @@ { GtkWidget *label, *entry, *sbox, *vbox; GtkWidget *exp, *bbox, *button, *check_close; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); load_monospace_style(); @@ -358,8 +356,8 @@ bbox = gtk_hbutton_box_new(); button = gtk_button_new_with_mnemonic(_("_Mark")); - gtk_tooltips_set_tip(tooltips, button, - _("Mark all matches in the current document."), NULL); + ui_widget_set_tooltip_text(button, + _("Mark all matches in the current document.")); gtk_container_add(GTK_CONTAINER(bbox), button); g_signal_connect(button, "clicked", G_CALLBACK(send_find_dialog_response), GINT_TO_POINTER(GEANY_RESPONSE_MARK)); @@ -379,8 +377,8 @@ g_object_set_data_full(G_OBJECT(widgets.find_dialog), "check_close", g_object_ref(check_close), (GDestroyNotify) g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_close), FALSE); - gtk_tooltips_set_tip(tooltips, check_close, - _("Disable this option to keep the dialog open."), NULL); + ui_widget_set_tooltip_text(check_close, + _("Disable this option to keep the dialog open.")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_close), TRUE); gtk_container_add(GTK_CONTAINER(bbox), check_close); gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(bbox), check_close, TRUE); @@ -429,7 +427,6 @@ GtkWidget *label_find, *label_replace, *entry_find, *entry_replace, *check_close, *button, *rbox, *fbox, *vbox, *exp, *bbox; GtkSizeGroup *label_size; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); load_monospace_style(); @@ -504,8 +501,8 @@ bbox = gtk_hbutton_box_new(); button = gtk_button_new_with_mnemonic(_("In Se_lection")); - gtk_tooltips_set_tip(tooltips, button, - _("Replace all matches found in the currently selected text"), NULL); + ui_widget_set_tooltip_text(button, + _("Replace all matches found in the currently selected text")); gtk_container_add(GTK_CONTAINER(bbox), button); g_signal_connect(button, "clicked", G_CALLBACK(send_replace_dialog_response), GINT_TO_POINTER(GEANY_RESPONSE_REPLACE_IN_SEL)); @@ -525,8 +522,8 @@ g_object_set_data_full(G_OBJECT(widgets.replace_dialog), "check_close", g_object_ref(check_close), (GDestroyNotify) g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(check_close), FALSE); - gtk_tooltips_set_tip(tooltips, check_close, - _("Disable this option to keep the dialog open."), NULL); + ui_widget_set_tooltip_text(check_close, + _("Disable this option to keep the dialog open.")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_close), TRUE); gtk_container_add(GTK_CONTAINER(bbox), check_close); gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(bbox), check_close, TRUE); @@ -569,7 +566,6 @@ *check_recursive, *check_extra, *entry_extra; GtkWidget *dbox, *sbox, *cbox, *rbox, *rbtn, *hbox, *vbox, *ebox; GtkSizeGroup *size_group; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); gchar *encoding_string; guint i; @@ -652,15 +648,13 @@ _("_Grep regular expressions")); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "radio_grep", g_object_ref(rbtn), (GDestroyNotify)g_object_unref); - gtk_tooltips_set_tip(tooltips, rbtn, - _("See grep's manual page for more information."), NULL); + ui_widget_set_tooltip_text(rbtn, _("See grep's manual page for more information.")); gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); gtk_container_add(GTK_CONTAINER(rbox), rbtn); rbtn = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(rbtn), _("_Extended regular expressions")); - gtk_tooltips_set_tip(tooltips, rbtn, - _("See grep's manual page for more information."), NULL); + ui_widget_set_tooltip_text(rbtn, _("See grep's manual page for more information.")); gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); gtk_container_add(GTK_CONTAINER(rbox), rbtn); @@ -684,8 +678,8 @@ g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_invert", g_object_ref(checkbox2), (GDestroyNotify)g_object_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox2), FALSE); - gtk_tooltips_set_tip(tooltips, checkbox2, - _("Invert the sense of matching, to select non-matching lines."), NULL); + ui_widget_set_tooltip_text(checkbox2, + _("Invert the sense of matching, to select non-matching lines.")); cbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(cbox), checkbox1); @@ -711,8 +705,7 @@ if (search_prefs.fif_extra_options) gtk_entry_set_text(GTK_ENTRY(entry_extra), search_prefs.fif_extra_options); gtk_widget_set_sensitive(entry_extra, FALSE); - gtk_tooltips_set_tip(tooltips, entry_extra, - _("Other options to pass to Grep"), NULL); + ui_widget_set_tooltip_text(entry_extra, _("Other options to pass to Grep")); find_in_files.extra_entry = entry_extra; /* enable entry_extra when check_extra is checked */ @@ -859,9 +852,9 @@ /* clear previous search indicators */ editor_indicator_clear(doc->editor, GEANY_INDICATOR_SEARCH); - + len = strlen(search_text); - + ttf.chrg.cpMin = 0; ttf.chrg.cpMax = sci_get_length(doc->editor->sci); ttf.lpstrText = (gchar *)search_text; @@ -1379,7 +1372,7 @@ while (g_io_channel_read_line(source, &msg, NULL, NULL, NULL) && msg) { utf8_msg = NULL; - + g_strstrip(msg); if (! g_utf8_validate(msg, -1, NULL)) { @@ -1409,7 +1402,7 @@ while (g_io_channel_read_line(source, &msg, NULL, NULL, NULL) && msg) { utf8_msg = NULL; - + g_strstrip(msg); if (! g_utf8_validate(msg, -1, NULL)) { Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/ui_utils.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -1658,3 +1658,23 @@ g_signal_connect(item, "destroy", G_CALLBACK(on_auto_separator_item_destroy), autosep); } + +/** + * Sets @a text as the contents of the tooltip for @a widget. + * + * @param widget The widget the tooltip should be set for. + * @param text The text for the tooltip. + */ +void ui_widget_set_tooltip_text(GtkWidget *widget, const gchar *text) +{ +#if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text(widget, text); +#else + static GtkTooltips *tooltips = NULL; + + if (tooltips == NULL) + tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); + + gtk_tooltips_set_tip(tooltips, widget, text, NULL); +#endif +} Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/ui_utils.h 2008-11-18 20:14:42 UTC (rev 3250) @@ -249,4 +249,6 @@ void ui_add_document_sensitive(GtkWidget *widget); +void ui_widget_set_tooltip_text(GtkWidget *widget, const gchar *text); + #endif Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2008-11-18 20:13:50 UTC (rev 3249) +++ trunk/src/vte.c 2008-11-18 20:14:42 UTC (rev 3250) @@ -680,10 +680,8 @@ GtkWidget *check_scroll_key, *check_scroll_out, *check_follow_path; GtkWidget *check_enable_bash_keys, *check_ignore_menu_key; GtkWidget *check_run_in_vte, *check_skip_script, *entry_shell, *button_shell, *image_shell; - GtkTooltips *tooltips; GtkObject *spin_scrollback_adj; - tooltips = GTK_TOOLTIPS(lookup_widget(ui_widgets.prefs_dialog, "tooltips")); notebook = lookup_widget(ui_widgets.prefs_dialog, "notebook2"); frame = ui_frame_new_with_alignment(_("Terminal plugin"), &alignment); @@ -715,7 +713,7 @@ gtk_table_attach(GTK_TABLE(table), font_term, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, font_term, _("Sets the font for the terminal widget."), NULL); + ui_widget_set_tooltip_text(font_term, _("Sets the font for the terminal widget.")); label = gtk_label_new(_("Foreground color:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, @@ -733,14 +731,14 @@ gtk_table_attach(GTK_TABLE(table), color_fore, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, color_fore, _("Sets the foreground color of the text in the terminal widget."), NULL); + ui_widget_set_tooltip_text(color_fore, _("Sets the foreground color of the text in the terminal widget.")); gtk_color_button_set_title(GTK_COLOR_BUTTON(color_fore), _("Color Chooser")); color_back = gtk_color_button_new(); gtk_table_attach(GTK_TABLE(table), color_back, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, color_back, _("Sets the background color of the text in the terminal widget."), NULL); + ui_widget_set_tooltip_text(color_back, _("Sets the background color of the text in the terminal widget.")); gtk_color_button_set_title(GTK_COLOR_BUTTON(color_back), _("Color Chooser")); label = gtk_label_new(_("Scrollback lines:")); @@ -754,7 +752,7 @@ gtk_table_attach(GTK_TABLE(table), spin_scrollback, 1, 2, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, spin_scrollback, _("Specifies the history in lines, which you can scroll back in the terminal widget."), NULL); + ui_widget_set_tooltip_text(spin_scrollback, _("Specifies the history in lines, which you can scroll back in the terminal widget.")); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin_scrollback), TRUE); gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spin_scrollback), TRUE); @@ -768,7 +766,7 @@ gtk_table_attach(GTK_TABLE(table), entry_emulation, 1, 2, 4, 5, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip(tooltips, entry_emulation, _("Controls how the terminal emulator should behave. Do not change this value unless you know exactly what you are doing."), NULL); + ui_widget_set_tooltip_text(entry_emulation, _("Controls how the terminal emulator should behave. Do not change this value unless you know exactly what you are doing.")); label = gtk_label_new(_("Shell:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, @@ -777,7 +775,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); entry_shell = gtk_entry_new(); - gtk_tooltips_set_tip(tooltips, entry_shell, _("Sets the path to the shell which should be started inside the terminal emulation."), NULL); + ui_widget_set_tooltip_text(entry_shell, _("Sets the path to the shell which should be started inside the terminal emulation.")); button_shell = gtk_button_new(); gtk_widget_show(button_shell); @@ -795,34 +793,34 @@ box = gtk_vbox_new(FALSE, 3); check_scroll_key = gtk_check_button_new_with_mnemonic(_("Scroll on keystroke")); - gtk_tooltips_set_tip(tooltips, check_scroll_key, _("Whether to scroll to the bottom if a key was pressed."), NULL); + ui_widget_set_tooltip_text(check_scroll_key, _("Whether to scroll to the bottom if a key was pressed.")); gtk_container_add(GTK_CONTAINER(box), check_scroll_key); check_scroll_out = gtk_check_button_new_with_mnemonic(_("Scroll on output")); - gtk_tooltips_set_tip(tooltips, check_scroll_out, _("Whether to scroll to the bottom when output is generated."), NULL); + ui_widget_set_tooltip_text(check_scroll_out, _("Whether to scroll to the bottom when output is generated.")); gtk_container_add(GTK_CONTAINER(box), check_scroll_out); check_enable_bash_keys = gtk_check_button_new_with_mnemonic(_("Override Geany keybindings")); - gtk_tooltips_set_tip(tooltips, check_enable_bash_keys, - _("Allows the VTE to receive keyboard shortcuts (apart from focus commands)."), NULL); + ui_widget_set_tooltip_text(check_enable_bash_keys, + _("Allows the VTE to receive keyboard shortcuts (apart from focus commands).")); gtk_container_add(GTK_CONTAINER(box), check_enable_bash_keys); check_ignore_menu_key = gtk_check_button_new_with_mnemonic(_("Disable menu shortcut key (F10 by default)")); - gtk_tooltips_set_tip(tooltips, check_ignore_menu_key, _("This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE."), NULL); + ui_widget_set_tooltip_text(check_ignore_menu_key, _("This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE.")); gtk_container_add(GTK_CONTAINER(box), check_ignore_menu_key); check_follow_path = gtk_check_button_new_with_mnemonic(_("Follow the path of the current file")); - gtk_tooltips_set_tip(tooltips, check_follow_path, _("Whether to execute \"cd $path\" when you switch between opened files."), NULL); + ui_widget_set_tooltip_text(check_follow_path, _("Whether to execute \"cd $path\" when you switch between opened files.")); gtk_container_add(GTK_CONTAINER(box), check_follow_path); /* create check_skip_script checkbox before the check_skip_script checkbox to be able to * use the object for the toggled handler of check_skip_script checkbox */ check_skip_script = gtk_check_button_new_with_mnemonic(_("Don't use run script")); - gtk_tooltips_set_tip(tooltips, check_skip_script, _("Don't use the simple run script which is usually used to display the exit status of the executed program."), NULL); + ui_widget_set_tooltip_text(check_skip_script, _("Don't use the simple run script which is usually used to display the exit status of the executed program.")); gtk_widget_set_sensitive(check_skip_script, vc->run_in_vte); check_run_in_vte = gtk_check_button_new_with_mnemonic(_("Execute programs in VTE")); - gtk_tooltips_set_tip(tooltips, check_run_in_vte, _("Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped."), NULL); + ui_widget_set_tooltip_text(check_run_in_vte, _("Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped.")); gtk_container_add(GTK_CONTAINER(box), check_run_in_vte); g_signal_connect(check_run_in_vte, "toggled", G_CALLBACK(check_run_in_vte_toggled), check_skip_script); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3249] trunk/src
by eht16＠users.sourceforge.net 18 Nov '08

18 Nov '08

Revision: 3249 http://geany.svn.sourceforge.net/geany/?rev=3249&view=rev Author: eht16 Date: 2008-11-18 20:13:50 +0000 (Tue, 18 Nov 2008) Log Message: ----------- Fix empty tab labels for new files and cleanup. Modified Paths: -------------- trunk/src/document.c trunk/src/notebook.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-11-18 20:13:29 UTC (rev 3248) +++ trunk/src/document.c 2008-11-18 20:13:50 UTC (rev 3249) @@ -277,17 +277,22 @@ void document_update_tab_label(GeanyDocument *doc) { - gchar *base_name = g_path_get_basename(doc->file_name); - GtkWidget *parent = gtk_widget_get_parent(doc->priv->tab_label); + gchar *base_name; + GtkWidget *parent; static GtkTooltips *tooltips = NULL; + g_return_if_fail(doc != NULL); + + base_name = g_path_get_basename(DOC_FILENAME(doc)); + parent = gtk_widget_get_parent(doc->priv->tab_label); + if (tooltips == NULL) tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name); gtk_label_set_text(GTK_LABEL(doc->priv->tabmenu_label), base_name); - gtk_tooltips_set_tip(tooltips, parent, doc->file_name, NULL); + gtk_tooltips_set_tip(tooltips, parent, DOC_FILENAME(doc), NULL); g_free(base_name); } Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2008-11-18 20:13:29 UTC (rev 3248) +++ trunk/src/notebook.c 2008-11-18 20:13:50 UTC (rev 3249) @@ -442,13 +442,11 @@ { GtkWidget *hbox, *ebox; gint tabnum; - gchar *title; GtkWidget *page; g_return_val_if_fail(this != NULL, -1); page = GTK_WIDGET(this->editor->sci); - title = g_path_get_basename(DOC_FILENAME(this)); this->priv->tab_label = gtk_label_new(NULL); @@ -511,7 +509,6 @@ gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(main_widgets.notebook), page, TRUE); } #endif - g_free(title); return tabnum; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2008