Commits November 2016

commits@lists.geany.org

1 participants
37 discussions

[geany/geany] 1d5d4e: Implement the run helper as a script
by Colomban Wendling 13 Nov '16

13 Nov '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Nov 2016 13:55:42 UTC Commit: 1d5d4e278ab5a9e4f364f4534e39048f613748b4 https://github.com/geany/geany/commit/1d5d4e278ab5a9e4f364f4534e39048f61374… Log Message: ----------- Implement the run helper as a script Apparently using arguments instead of putting paths directly in the script is enough for it to work on Windows, so use a simple script instead of a program, so it's both shorter and easier to tune. Modified Paths: -------------- src/Makefile.am src/build.c src/geany-run-helper src/geany-run-helper.bat src/geany-run-helper.c src/win32.c src/win32.h Modified: src/Makefile.am 10 lines changed, 6 insertions(+), 4 deletions(-) =================================================================== @@ -184,10 +184,12 @@ signallist.i: $(glade_file) Makefile CLEANFILES += signallist.i -pkglibexec_PROGRAMS = geany-run-helper -geany_run_helper_SOURCES = geany-run-helper.c -geany_run_helper_CFLAGS = $(GTK_CFLAGS) -geany_run_helper_LDADD = $(GTK_LIBS) +# install the run script +if MINGW +pkglibexec_SCRIPTS = geany-run-helper.bat +else +pkglibexec_SCRIPTS = geany-run-helper +endif # Ubuntu ld has a bug so that libtool sees /usr/local/lib as a system path so # doesn't add RPATH, but ld requires explicit ldconfig there, unlike when Modified: src/build.c 37 lines changed, 20 insertions(+), 17 deletions(-) =================================================================== @@ -79,12 +79,6 @@ typedef struct RunInfo static RunInfo *run_info; -#ifdef G_OS_WIN32 -static const gchar RUN_SCRIPT_CMD[] = "geany_run_script_XXXXXX.bat"; -#else -static const gchar RUN_SCRIPT_CMD[] = "geany_run_script_XXXXXX.sh"; -#endif - /* pack group (<8) and command (<32) into a user_data pointer */ #define GRP_CMD_TO_POINTER(grp, cmd) GUINT_TO_POINTER((((grp)&7) << 5) | ((cmd)&0x1f)) #define GBO_TO_POINTER(gbo) (GRP_CMD_TO_POINTER(GBO_TO_GBG(gbo), GBO_TO_CMD(gbo))) @@ -749,13 +743,15 @@ static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d msgwin_compiler_add(COLOR_BLUE, _("%s (in directory: %s)"), cmd, utf8_working_dir); g_free(utf8_working_dir); +#ifdef G_OS_UNIX cmd_string = utils_get_locale_from_utf8(cmd); argv[2] = cmd_string; - -#ifdef G_OS_UNIX cmd = NULL; /* under Unix, use argv to start cmd via sh for compatibility */ #else + /* Expand environment variables like %blah%. */ + cmd_string = win32_expand_environment_variables(cmd); argv[0] = NULL; /* under Windows, run cmd directly */ + cmd = cmd_string; #endif /* set the build info for the message window */ @@ -789,7 +785,6 @@ static gchar *prepare_run_cmd(GeanyDocument *doc, gchar **working_dir, guint cmd const gchar *cmd_working_dir; gboolean autoclose = FALSE; gchar *cmd_string_utf8, *working_dir_utf8, *run_cmd, *cmd_string; - GError *error = NULL; cmd = get_build_cmd(doc, GEANY_GBG_EXEC, cmdindex, NULL); @@ -825,13 +820,22 @@ static gchar *prepare_run_cmd(GeanyDocument *doc, gchar **working_dir, guint cmd } #endif +#ifdef G_OS_WIN32 + /* Expand environment variables like %blah%. */ + SETPTR(cmd_string, win32_expand_environment_variables(cmd_string)); +#endif + gchar *helper = g_build_filename(utils_resource_dir(RESOURCE_DIR_LIBEXEC), "geany-run-helper", NULL); - // FIXME: should we expand environment variables? build_create_shell_script() did - ///* Expand environment variables like %blah%. */ - //expanded_cmd = win32_expand_environment_variables(cmd); - // FIXME: proper quoting of the helper (or not, because it ought to be a valid path, - // and valid paths can't contain \es or "es, so it's fine. - SETPTR(run_cmd, g_strdup_printf("\"%s\" %d %s", helper, !!autoclose, cmd_string)); + + /* escape helper appropriately */ +#ifdef G_OS_WIN32 + /* FIXME: check the Windows rules, but it should not matter too much here as \es and "es are not + * allowed in paths anyway */ + SETPTR(helper, g_strdup_printf("\"%s\"", helper)); +#else + SETPTR(helper, g_shell_quote(helper)); +#endif + run_cmd = g_strdup_printf("%s %d %s", helper, autoclose ? 1 : 0, cmd_string); g_free(helper); utils_free_pointers(3, cmd_string_utf8, working_dir_utf8, cmd_string, NULL); @@ -898,7 +902,7 @@ static void build_run_cmd(GeanyDocument *doc, guint cmdindex) GString *escaped_run_cmd = g_string_new(NULL); for (gchar *p = run_cmd; *p; p++) { - if (strchr("()%!^\"<>&|", *p)) // cmd.exe metacharacters + if (strchr("()%!^\"<>&| ", *p)) // cmd.exe metacharacters g_string_append_c(escaped_run_cmd, '^'); g_string_append_c(escaped_run_cmd, *p); } @@ -922,7 +926,6 @@ static void build_run_cmd(GeanyDocument *doc, guint cmdindex) "Check the Terminal setting in Preferences"), utf8_term_cmd, error->message); g_free(utf8_term_cmd); g_error_free(error); - g_unlink(run_cmd); run_info[cmdindex].pid = (GPid) 0; } } Modified: src/geany-run-helper 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,25 @@ +#!/bin/sh +# USAGE: geany-run-helper AUTOCLOSE COMMAND... + +# save autoclose option and remove it +autoclose=$1 +shift + +# spawn the child +"$@" + +# show the result +echo " + +------------------ +(program exited with code: $?) +" + +# and if wanted, wait on the user +if ! [ "$autoclose" = 0 ] +then + echo "Press return to continue" + # to be more compatible with shells like dash + dummy_var= + read dummy_var +fi Modified: src/geany-run-helper.bat 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ +REM USAGE: geany-run-helper AUTOCLOSE COMMAND... + +REM save autoclose option and remove it +set autoclose=%1 +shift + +REM spawn the child +REM it's tricky because shift doesn't affect %*, so hack it out +REM https://en.wikibooks.org/wiki/Windows_Batch_Scripting#Command-line_arguments +set SPAWN= +:argloop +if -%1-==-- goto argloop_end + set SPAWN=%SPAWN% %1 + shift +goto argloop +:argloop_end +%SPAWN% + +REM show the result +echo: +echo: +echo:------------------ +echo:(program exited with code: %ERRORLEVEL%) +echo: + +REM and if wanted, wait on the user +if not %autoclose%==1 pause Modified: src/geany-run-helper.c 208 lines changed, 0 insertions(+), 208 deletions(-) =================================================================== @@ -1,208 +0,0 @@ -/* - * geany-run-helper.c - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2016 Colomban Wendling <ban(at)herbesfolles(dot)org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* Helper program to run a command, print its return code and wait on the user */ - -#include <glib.h> -#include <stdio.h> - -#ifdef G_OS_WIN32 - -/* - * Uses GetCommandLineW() and CreateProcessW(). It would be a lot shorter to use - * _wspawnvp(), but like other argv-based Windows APIs (exec* family) it is broken - * when it comes to "control" characters in the arguments like spaces and quotes: - * it seems to basically do `CreateProcessW(" ".join(argv))`, which means it - * re-interprets it as a command line a second time. - * - * Interesting read: https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/ev… - * - * FIXME: maybe just use spawn.c itself? That would make the actual logic more - * convoluted (trip around from commandline (UTF16) -> argv (UTF8) -> commandline (UTF16)) - * but would have all the spawn logic in one place. - * - * FIXME: handle cmd.exe's quoting rules? Does that even apply on cmd.exe's - * command line itself, or only inside the script? (it probably applies to the - * argument of /C I guess). That would mean to have a special mode for this, - * just know we're calling it, or inspect the first argument of what we are - * supposed to launch and figure out whether it's cmd.exe or not. Darn it. - */ - -#include <windows.h> - -static void w32_perror(const gchar *prefix) -{ - gchar *msg = g_win32_error_message(GetLastError()); - fprintf(stderr, "%s: %s\n", prefix, msg); - g_free(msg); -} - -/* Based on spawn_get_program_name(). - * FIXME: this seems unable to handle an argument containing an escaped quote, - * but OTOH we expect the cmdline to be valid and Windows doesn't allow quotes - * in filenames */ -static LPWSTR w32_strip_first_arg(LPWSTR command_line) -{ - while (*command_line && wcschr(L" \t\r\n", *command_line)) - command_line++; - - if (*command_line == L'"') - { - command_line++; - LPWSTR p = wcschr(command_line, L'"'); - if (p) - command_line = p + 1; - else - command_line = wcschr(command_line, L'\0'); - } - else - { - while (*command_line && ! wcschr(L" \t", *command_line)) - command_line++; - } - - while (*command_line && wcschr(L" \t\r\n", *command_line)) - command_line++; - - return command_line; -} - -int main(void) -{ - int exit_status = 1; - STARTUPINFOW startup; - PROCESS_INFORMATION process; - LPWSTR command_line = GetCommandLineW(); - LPWSTR auto_close_arg; - - ZeroMemory(&startup, sizeof startup); - startup.cb = sizeof startup; - - auto_close_arg = command_line = w32_strip_first_arg(command_line); // strip argv[0] - command_line = w32_strip_first_arg(command_line); // strip argv[1] - if (! command_line || ! *command_line) - fprintf(stderr, "Invalid or missing command\n"); - else if ((auto_close_arg[0] != L'0' && auto_close_arg[0] != L'1') || - ! isspace(auto_close_arg[1])) - fprintf(stderr, "USAGE: geany-run-script 0|1 command...\n"); - else if (! CreateProcessW(NULL, command_line, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &process)) - w32_perror("CreateProcessW()"); - else - { - DWORD code; - - CloseHandle(process.hThread); - if (WaitForSingleObject(process.hProcess, INFINITE) == WAIT_FAILED) - w32_perror("WaitForSingleObject()"); - else if (! GetExitCodeProcess(process.hProcess, &code)) - w32_perror("GetExitCodeProcess()"); - else - { - printf("\n\n------------------\n"); - printf("(program exited with status %d)\n", code); - exit_status = code; - } - CloseHandle(process.hProcess); - } - - if (*auto_close_arg != L'1') - { - printf("Press return to continue\n"); - getc(stdin); - } - - return exit_status; -} - -#else - -#include <sys/types.h> -#include <sys/wait.h> -#include <unistd.h> -#include <stdio.h> -#include <errno.h> - -int main(int argc, char **argv) -{ - int exit_status = 1; - const char *auto_close_arg; - - if (argc < 3 || ((argv[1][0] != '0' && argv[1][0] != '1') || argv[1][1] != 0)) - { - fprintf(stderr, "USAGE: %s 1|0 command...\n", argv[0]); - return 1; - } - - auto_close_arg = argv[1]; - /* strip argv[0] and auto-close argument */ - argv += 2; - argc -= 2; - - pid_t pid = fork(); - if (pid < 0) - perror("fork()"); - else if (pid == 0) - { - /* in the child */ - execvp(*argv, argv); - perror("execvp()"); - return 127; - } - else - { - int status; - int ret; - - do - { - ret = waitpid(pid, &status, 0); - } - while (ret == -1 && errno == EINTR); - - printf("\n\n------------------\n"); - if (ret == -1) - perror("waitpid()"); - else if (WIFEXITED(status)) - { - printf("(program exited with status %d)\n", WEXITSTATUS(status)); - exit_status = WEXITSTATUS(status); - } - else if (WIFSIGNALED(status)) - { - printf("(program exited with signal %d)\n", WTERMSIG(status)); -#ifdef WCOREDUMP - if (WCOREDUMP(status)) - printf("(core dumped)\n"); -#endif - } - else - fprintf(stderr, "something funky happened to the child\n"); - } - - if (*auto_close_arg != '1') - { - printf("Press return to continue\n"); - getc(stdin); - } - - return exit_status; -} - -#endif Modified: src/win32.c 45 lines changed, 10 insertions(+), 35 deletions(-) =================================================================== @@ -891,14 +891,19 @@ void win32_init_debug_code(void) } +/* expands environment placeholders in @str. input and output is in UTF-8 */ gchar *win32_expand_environment_variables(const gchar *str) { - gchar expCmdline[32768]; /* 32768 is the limit for ExpandEnvironmentStrings() */ + wchar_t *cmdline = g_utf8_to_utf16(str, -1, NULL, NULL, NULL); + wchar_t expCmdline[32768]; /* 32768 is the limit for ExpandEnvironmentStrings() */ + gchar *expanded = NULL; - if (ExpandEnvironmentStrings((LPCTSTR) str, (LPTSTR) expCmdline, sizeof(expCmdline)) != 0) - return g_strdup(expCmdline); - else - return g_strdup(str); + if (cmdline && ExpandEnvironmentStringsW(cmdline, expCmdline, sizeof(expCmdline)) != 0) + expanded = g_utf16_to_utf8(expCmdline, -1, NULL, NULL, NULL); + + g_free(cmdline); + + return expanded ? expanded : g_strdup(str); } @@ -1032,34 +1037,4 @@ gchar *win32_get_user_config_dir(void) return g_build_filename(g_get_user_config_dir(), "geany", NULL); } - -/* Retrieve the console codepage - * In case GetConsoleCP() returns 0 (i.e. the application doesn't have an own console window - * fallback to GetOEMCP(). */ -guint win32_get_console_codepage(void) -{ - guint codepage = GetConsoleCP(); - if (codepage == 0) - codepage = GetOEMCP(); - return codepage; -} - - -/* Convert a string into the system's default codepage, this is different from the - * locale (e.g. default codepage is 850 but locale is CP1252). - * This assumes the input string is encoded as UTF-8, otherwise a copy of - * the input string is returned. */ -gchar *win32_convert_to_system_codepage(const gchar *str, GError **error) -{ - if (g_utf8_validate(str, -1, NULL)) - { - guint codepage_code = win32_get_console_codepage(); - gchar codepage[8] = { 0 }; - g_snprintf(codepage, G_N_ELEMENTS(codepage), "%u", codepage_code); - return g_convert(str, -1, codepage, "utf-8", NULL, NULL, error); - } - else - return g_strdup(str); -} - #endif Modified: src/win32.h 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -68,10 +68,6 @@ gchar *win32_expand_environment_variables(const gchar *str); gchar *win32_get_user_config_dir(void); -guint win32_get_console_codepage(void); - -gchar *win32_convert_to_system_codepage(const gchar *str, GError **error); - G_END_DECLS #endif /* G_OS_WIN32 */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 265e27: Use a program run helper rather than a script
by Colomban Wendling 13 Nov '16

13 Nov '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Nov 2016 13:55:41 UTC Commit: 265e27a7f31b470f5845d8831def9b6a34776025 https://github.com/geany/geany/commit/265e27a7f31b470f5845d8831def9b6a34776… Log Message: ----------- Use a program run helper rather than a script This removes all encoding issues from passing on a script to cmd.exe on Windows, as it now uses proper wide character API there. Not much changes on other OSes, but we don't create temporary scripts anymore. Modified Paths: -------------- src/Makefile.am src/build.c src/geany-run-helper.c src/prefix.h src/utils.c src/utils.h Modified: src/Makefile.am 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -138,6 +138,7 @@ AM_CPPFLAGS += \ -DGEANY_DATADIR=\"data\" \ -DGEANY_DOCDIR=\"\" \ -DGEANY_LIBDIR=\"\" \ + -DGEANY_LIBEXECDIR=\"\" \ -DGEANY_LOCALEDIR=\"\" \ -DGEANY_PREFIX=\"\" @@ -162,6 +163,7 @@ AM_CPPFLAGS += \ -DGEANY_DATADIR=\""$(datadir)"\" \ -DGEANY_DOCDIR=\""$(docdir)"\" \ -DGEANY_LIBDIR=\""$(libdir)"\" \ + -DGEANY_LIBEXECDIR=\""$(libexecdir)"\" \ -DGEANY_LOCALEDIR=\""$(localedir)"\" \ -DGEANY_PREFIX=\""$(prefix)"\" @@ -182,6 +184,11 @@ signallist.i: $(glade_file) Makefile CLEANFILES += signallist.i +pkglibexec_PROGRAMS = geany-run-helper +geany_run_helper_SOURCES = geany-run-helper.c +geany_run_helper_CFLAGS = $(GTK_CFLAGS) +geany_run_helper_LDADD = $(GTK_LIBS) + # Ubuntu ld has a bug so that libtool sees /usr/local/lib as a system path so # doesn't add RPATH, but ld requires explicit ldconfig there, unlike when # installing in /usr/lib. So, workaround this by calling it explicitly when Modified: src/build.c 102 lines changed, 23 insertions(+), 79 deletions(-) =================================================================== @@ -115,7 +115,6 @@ static guint build_items_count = 9; static void build_exit_cb(GPid pid, gint status, gpointer user_data); static void build_iofunc(GString *string, GIOCondition condition, gpointer data); -static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cmd, gboolean autoclose, GError **error); static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir); static void set_stop_button(gboolean stop); static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); @@ -826,14 +825,14 @@ static gchar *prepare_run_cmd(GeanyDocument *doc, gchar **working_dir, guint cmd } #endif - run_cmd = build_create_shellscript(*working_dir, cmd_string, autoclose, &error); - if (!run_cmd) - { - ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created: %s)"), - !EMPTY(cmd_string_utf8) ? cmd_string_utf8 : NULL, error->message); - g_error_free(error); - g_free(*working_dir); - } + gchar *helper = g_build_filename(utils_resource_dir(RESOURCE_DIR_LIBEXEC), "geany-run-helper", NULL); + // FIXME: should we expand environment variables? build_create_shell_script() did + ///* Expand environment variables like %blah%. */ + //expanded_cmd = win32_expand_environment_variables(cmd); + // FIXME: proper quoting of the helper (or not, because it ought to be a valid path, + // and valid paths can't contain \es or "es, so it's fine. + SETPTR(run_cmd, g_strdup_printf("\"%s\" %d %s", helper, !!autoclose, cmd_string)); + g_free(helper); utils_free_pointers(3, cmd_string_utf8, working_dir_utf8, cmd_string, NULL); return run_cmd; @@ -892,6 +891,21 @@ static void build_run_cmd(GeanyDocument *doc, guint cmdindex) gchar *locale_term_cmd = utils_get_locale_from_utf8(tool_prefs.term_cmd); GError *error = NULL; +#ifdef G_OS_WIN32 + if (g_regex_match_simple("^[ \"]*cmd([.]exe)?[\" ]", locale_term_cmd, 0, 0)) + { + /* if passing an argument to cmd.exe, respect its quoting rules */ + GString *escaped_run_cmd = g_string_new(NULL); + for (gchar *p = run_cmd; *p; p++) + { + if (strchr("()%!^\"<>&|", *p)) // cmd.exe metacharacters + g_string_append_c(escaped_run_cmd, '^'); + g_string_append_c(escaped_run_cmd, *p); + } + SETPTR(run_cmd, g_string_free(escaped_run_cmd, FALSE)); + } +#endif + utils_str_replace_all(&locale_term_cmd, "%c", run_cmd); if (spawn_async(working_dir, locale_term_cmd, NULL, NULL, &(run_info[cmdindex].pid), @@ -1059,76 +1073,6 @@ static void run_exit_cb(GPid child_pid, gint status, gpointer user_data) build_menu_update(NULL); } - -/* write a little shellscript to call the executable (similar to anjuta_launcher but "internal") - * working_dir and cmd are both in the locale encoding - * it returns the full file name (including path) of the created script in the locale encoding */ -static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cmd, gboolean autoclose, GError **error) -{ - gint fd; - gchar *str, *fname; - gboolean success = TRUE; -#ifdef G_OS_WIN32 - gchar *expanded_cmd; - gchar *utf8_script_content; -#else - gchar *escaped_dir; -#endif - fd = g_file_open_tmp (RUN_SCRIPT_CMD, &fname, error); - if (fd < 0) - return NULL; - close(fd); - -#ifdef G_OS_WIN32 - /* Expand environment variables like %blah%. */ - expanded_cmd = win32_expand_environment_variables(cmd); - str = g_strdup_printf( - "cd \"%s\"\n\n\n%s\n\n%s\ndel \"%%0\"\n\npause\n", - working_dir, expanded_cmd, (autoclose) ? "" : "pause"); - g_free(expanded_cmd); - /* Convert script content into system codepage */ - utf8_script_content = win32_convert_to_system_codepage(str, error); - if (utf8_script_content == NULL) - return NULL; - SETPTR(str, utf8_script_content); -#else - escaped_dir = g_shell_quote(working_dir); - str = g_strdup_printf( - "#!/bin/sh\n\nrm $0\n\ncd %s\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ - \n\n%s\n", escaped_dir, cmd, (autoclose) ? "" : - "\necho \"Press return to continue\"\n#to be more compatible with shells like " - "dash\ndummy_var=\"\"\nread dummy_var"); - g_free(escaped_dir); -#endif - - if (!g_file_set_contents(fname, str, -1, error)) - success = FALSE; - g_free(str); -#ifdef __APPLE__ - if (success && g_chmod(fname, 0777) != 0) - { - if (error) - { - gint errsv = errno; - - g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errsv), - "Failed to make file executable: %s", g_strerror(errsv)); - } - success = FALSE; - } -#endif - - if (!success) - { - g_unlink(fname); - g_free(fname); - fname = NULL; - } - - return fname; -} - - typedef void Callback(GtkWidget *w, gpointer u); /* run the command catenating cmd_cat if present */ Modified: src/geany-run-helper.c 208 lines changed, 208 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,208 @@ +/* + * geany-run-helper.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2016 Colomban Wendling <ban(at)herbesfolles(dot)org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* Helper program to run a command, print its return code and wait on the user */ + +#include <glib.h> +#include <stdio.h> + +#ifdef G_OS_WIN32 + +/* + * Uses GetCommandLineW() and CreateProcessW(). It would be a lot shorter to use + * _wspawnvp(), but like other argv-based Windows APIs (exec* family) it is broken + * when it comes to "control" characters in the arguments like spaces and quotes: + * it seems to basically do `CreateProcessW(" ".join(argv))`, which means it + * re-interprets it as a command line a second time. + * + * Interesting read: https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/ev… + * + * FIXME: maybe just use spawn.c itself? That would make the actual logic more + * convoluted (trip around from commandline (UTF16) -> argv (UTF8) -> commandline (UTF16)) + * but would have all the spawn logic in one place. + * + * FIXME: handle cmd.exe's quoting rules? Does that even apply on cmd.exe's + * command line itself, or only inside the script? (it probably applies to the + * argument of /C I guess). That would mean to have a special mode for this, + * just know we're calling it, or inspect the first argument of what we are + * supposed to launch and figure out whether it's cmd.exe or not. Darn it. + */ + +#include <windows.h> + +static void w32_perror(const gchar *prefix) +{ + gchar *msg = g_win32_error_message(GetLastError()); + fprintf(stderr, "%s: %s\n", prefix, msg); + g_free(msg); +} + +/* Based on spawn_get_program_name(). + * FIXME: this seems unable to handle an argument containing an escaped quote, + * but OTOH we expect the cmdline to be valid and Windows doesn't allow quotes + * in filenames */ +static LPWSTR w32_strip_first_arg(LPWSTR command_line) +{ + while (*command_line && wcschr(L" \t\r\n", *command_line)) + command_line++; + + if (*command_line == L'"') + { + command_line++; + LPWSTR p = wcschr(command_line, L'"'); + if (p) + command_line = p + 1; + else + command_line = wcschr(command_line, L'\0'); + } + else + { + while (*command_line && ! wcschr(L" \t", *command_line)) + command_line++; + } + + while (*command_line && wcschr(L" \t\r\n", *command_line)) + command_line++; + + return command_line; +} + +int main(void) +{ + int exit_status = 1; + STARTUPINFOW startup; + PROCESS_INFORMATION process; + LPWSTR command_line = GetCommandLineW(); + LPWSTR auto_close_arg; + + ZeroMemory(&startup, sizeof startup); + startup.cb = sizeof startup; + + auto_close_arg = command_line = w32_strip_first_arg(command_line); // strip argv[0] + command_line = w32_strip_first_arg(command_line); // strip argv[1] + if (! command_line || ! *command_line) + fprintf(stderr, "Invalid or missing command\n"); + else if ((auto_close_arg[0] != L'0' && auto_close_arg[0] != L'1') || + ! isspace(auto_close_arg[1])) + fprintf(stderr, "USAGE: geany-run-script 0|1 command...\n"); + else if (! CreateProcessW(NULL, command_line, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &process)) + w32_perror("CreateProcessW()"); + else + { + DWORD code; + + CloseHandle(process.hThread); + if (WaitForSingleObject(process.hProcess, INFINITE) == WAIT_FAILED) + w32_perror("WaitForSingleObject()"); + else if (! GetExitCodeProcess(process.hProcess, &code)) + w32_perror("GetExitCodeProcess()"); + else + { + printf("\n\n------------------\n"); + printf("(program exited with status %d)\n", code); + exit_status = code; + } + CloseHandle(process.hProcess); + } + + if (*auto_close_arg != L'1') + { + printf("Press return to continue\n"); + getc(stdin); + } + + return exit_status; +} + +#else + +#include <sys/types.h> +#include <sys/wait.h> +#include <unistd.h> +#include <stdio.h> +#include <errno.h> + +int main(int argc, char **argv) +{ + int exit_status = 1; + const char *auto_close_arg; + + if (argc < 3 || ((argv[1][0] != '0' && argv[1][0] != '1') || argv[1][1] != 0)) + { + fprintf(stderr, "USAGE: %s 1|0 command...\n", argv[0]); + return 1; + } + + auto_close_arg = argv[1]; + /* strip argv[0] and auto-close argument */ + argv += 2; + argc -= 2; + + pid_t pid = fork(); + if (pid < 0) + perror("fork()"); + else if (pid == 0) + { + /* in the child */ + execvp(*argv, argv); + perror("execvp()"); + return 127; + } + else + { + int status; + int ret; + + do + { + ret = waitpid(pid, &status, 0); + } + while (ret == -1 && errno == EINTR); + + printf("\n\n------------------\n"); + if (ret == -1) + perror("waitpid()"); + else if (WIFEXITED(status)) + { + printf("(program exited with status %d)\n", WEXITSTATUS(status)); + exit_status = WEXITSTATUS(status); + } + else if (WIFSIGNALED(status)) + { + printf("(program exited with signal %d)\n", WTERMSIG(status)); +#ifdef WCOREDUMP + if (WCOREDUMP(status)) + printf("(core dumped)\n"); +#endif + } + else + fprintf(stderr, "something funky happened to the child\n"); + } + + if (*auto_close_arg != '1') + { + printf("Press return to continue\n"); + getc(stdin); + } + + return exit_status; +} + +#endif Modified: src/prefix.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,7 @@ G_BEGIN_DECLS #define GEANY_PREFIX (br_thread_local_store (br_locate_prefix ((void *) ""))) #define GEANY_DATADIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share"))) #define GEANY_LIBDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/lib"))) + #define GEANY_LIBEXECDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/libexec/geany"))) #define GEANY_DOCDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share/doc/geany"))) #define GEANY_LOCALEDIR (br_thread_local_store (br_prepend_prefix ((void *) "", "/share/locale"))) #endif /* BR_NO_MACROS */ Modified: src/utils.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -2103,6 +2103,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type) resdirs[RESOURCE_DIR_DOC] = g_build_filename(prefix, "share", "doc", "geany", "html", NULL); resdirs[RESOURCE_DIR_LOCALE] = g_build_filename(prefix, "share", "locale", NULL); resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", "geany", NULL); + resdirs[RESOURCE_DIR_LIBEXEC] = g_build_filename(prefix, "libexec", "geany", NULL); g_free(prefix); #else if (is_osx_bundle()) @@ -2115,6 +2116,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type) resdirs[RESOURCE_DIR_DOC] = g_build_filename(prefix, "share", "doc", "geany", "html", NULL); resdirs[RESOURCE_DIR_LOCALE] = g_build_filename(prefix, "share", "locale", NULL); resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(prefix, "lib", "geany", NULL); + resdirs[RESOURCE_DIR_LIBEXEC] = g_build_filename(prefix, "libexec", "geany", NULL); g_free(prefix); # endif } @@ -2125,6 +2127,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type) resdirs[RESOURCE_DIR_DOC] = g_build_filename(GEANY_DOCDIR, "html", NULL); resdirs[RESOURCE_DIR_LOCALE] = g_build_filename(GEANY_LOCALEDIR, NULL); resdirs[RESOURCE_DIR_PLUGIN] = g_build_filename(GEANY_LIBDIR, "geany", NULL); + resdirs[RESOURCE_DIR_LIBEXEC] = g_build_filename(GEANY_LIBEXECDIR, "geany", NULL); } #endif } Modified: src/utils.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -221,6 +221,7 @@ typedef enum RESOURCE_DIR_DOC, RESOURCE_DIR_LOCALE, RESOURCE_DIR_PLUGIN, + RESOURCE_DIR_LIBEXEC, RESOURCE_DIR_COUNT } GeanyResourceDirType; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 26adca: Windows: Convert generated batch script into system codepage
by Enrico Tröger 13 Nov '16

13 Nov '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Nov 2016 13:55:40 UTC Commit: 26adcabd694014328f61b3ca5fe0d5be610849c0 https://github.com/geany/geany/commit/26adcabd694014328f61b3ca5fe0d5be61084… Log Message: ----------- Windows: Convert generated batch script into system codepage Instead of fiddling with the "chcp" command in the generated batch script on Windows, convert the whole script content into the system codepage before executing it. Modified Paths: -------------- src/build.c src/spawn.c src/win32.c src/win32.h Modified: src/build.c 15 lines changed, 8 insertions(+), 7 deletions(-) =================================================================== @@ -1070,7 +1070,7 @@ static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cm gboolean success = TRUE; #ifdef G_OS_WIN32 gchar *expanded_cmd; - guint codepage; + gchar *utf8_script_content; #else gchar *escaped_dir; #endif @@ -1080,16 +1080,17 @@ static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cm close(fd); #ifdef G_OS_WIN32 - /* We set the console codepage to UTF-8 (65001) before changing the working directory - * because the working directory is in UTF-8 encoding. - * Then we reset it again to the default value before executing the command. */ - codepage = win32_get_console_codepage(); /* Expand environment variables like %blah%. */ expanded_cmd = win32_expand_environment_variables(cmd); str = g_strdup_printf( - "chcp 65001 > nul\ncd \"%s\"\nchcp %u > nul\n\n%s\n\n%s\ndel \"%%0\"\n\npause\n", - working_dir, codepage, expanded_cmd, (autoclose) ? "" : "pause"); + "cd \"%s\"\n\n\n%s\n\n%s\ndel \"%%0\"\n\npause\n", + working_dir, expanded_cmd, (autoclose) ? "" : "pause"); g_free(expanded_cmd); + /* Convert script content into system codepage */ + utf8_script_content = win32_convert_to_system_codepage(str, error); + if (utf8_script_content == NULL) + return NULL; + SETPTR(str, utf8_script_content); #else escaped_dir = g_shell_quote(working_dir); str = g_strdup_printf( Modified: src/spawn.c 129 lines changed, 80 insertions(+), 49 deletions(-) =================================================================== @@ -522,10 +522,9 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch #ifdef G_OS_WIN32 GString *command; GArray *environment; - GError *gerror = NULL; - gchar *locale_working_directory; - gchar *locale_command; - gchar *failure; + gchar *locale_working_directory = NULL; + gchar *locale_command = NULL; + gboolean success = TRUE; if (command_line) { @@ -565,67 +564,99 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch g_message("full spawn command line: %s", command->str); #endif - while (envp && *envp) + while (envp && *envp && success) { - g_array_append_vals(environment, *envp, strlen(*envp) + 1); + gsize locale_entry_len; + gchar *locale_entry; + + if (g_utf8_validate(*envp, -1, NULL)) + { + /* TODO: better error message */ + locale_entry = g_locale_from_utf8(*envp, -1, NULL, &locale_entry_len, error); + } + else + { + locale_entry_len = strlen(*envp); + locale_entry = g_memdup(*envp, locale_entry_len + 1); + } + + if (! locale_entry) + success = FALSE; + else + { + /* copy the entry, including NUL terminator */ + g_array_append_vals(environment, locale_entry, locale_entry_len + 1); + g_free(locale_entry); + } + envp++; } - // convert working directory into locale encoding - if (g_utf8_validate(working_directory, -1, NULL)) + /* convert working directory into locale encoding */ + if (success && working_directory) { - locale_working_directory = g_locale_from_utf8(working_directory, -1, NULL, NULL, &gerror); - if (gerror) { - /* TODO use the code below post-1.28 as it introduces a new string - gchar *msg = g_strdup_printf( - _("Failed to convert working directory into locale encoding: %s"), gerror->message); - g_set_error_literal(error, gerror->domain, gerror->code, msg); - */ - g_set_error_literal(error, gerror->domain, gerror->code, gerror->message); - g_error_free(gerror); - g_string_free(command, TRUE); - g_array_free(environment, TRUE); - g_free(locale_working_directory); - /*g_free(msg);*/ - return FALSE; + if (g_utf8_validate(working_directory, -1, NULL)) + { + GError *gerror = NULL; + + locale_working_directory = g_locale_from_utf8(working_directory, -1, NULL, NULL, &gerror); + if (! locale_working_directory) + { + /* TODO use the code below post-1.28 as it introduces a new string + g_set_error(error, gerror->domain, gerror->code, + _("Failed to convert working directory into locale encoding: %s"), gerror->message); + */ + g_propagate_error(error, gerror); + success = FALSE; + } } + else + locale_working_directory = g_strdup(working_directory); } - // convert command into locale encoding - if (g_utf8_validate(command->str, -1, NULL)) + /* convert command into locale encoding */ + if (success) { - locale_command = g_locale_from_utf8(command->str, -1, NULL, NULL, &gerror); - if (gerror) { - /* TODO use the code below post-1.28 as it introduces a new string - gchar *msg = g_strdup_printf( - _("Failed to convert command into locale encoding: %s"), gerror->message); - g_set_error_literal(error, gerror->domain, gerror->code, msg); - */ - g_set_error_literal(error, gerror->domain, gerror->code, gerror->message); - g_error_free(gerror); - g_string_free(command, TRUE); - g_array_free(environment, TRUE); - g_free(locale_working_directory); - g_free(locale_command); - /*g_free(msg);*/ - return FALSE; + if (g_utf8_validate(command->str, -1, NULL)) + { + GError *gerror = NULL; + + locale_command = g_locale_from_utf8(command->str, -1, NULL, NULL, &gerror); + if (! locale_command) + { + /* TODO use the code below post-1.28 as it introduces a new string + g_set_error(error, gerror->domain, gerror->code, + _("Failed to convert command into locale encoding: %s"), gerror->message); + */ + g_propagate_error(error, gerror); + success = FALSE; + } + } + else + locale_command = g_strdup(command->str); + } + + if (success) + { + gchar *failure; + + failure = spawn_create_process_with_pipes(locale_command, locale_working_directory, + envp ? environment->data : NULL, child_pid, stdin_fd, stdout_fd, stderr_fd); + + if (failure) + { + g_set_error_literal(error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, failure); + g_free(failure); } + + success = failure == NULL; } - failure = spawn_create_process_with_pipes(locale_command, locale_working_directory, - envp ? environment->data : NULL, child_pid, stdin_fd, stdout_fd, stderr_fd); g_string_free(command, TRUE); g_array_free(environment, TRUE); g_free(locale_working_directory); g_free(locale_command); - if (failure) - { - g_set_error_literal(error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, failure); - g_free(failure); - return FALSE; - } - - return TRUE; + return success; #else /* G_OS_WIN32 */ int cl_argc; char **full_argv; Modified: src/win32.c 22 lines changed, 20 insertions(+), 2 deletions(-) =================================================================== @@ -1034,14 +1034,32 @@ gchar *win32_get_user_config_dir(void) /* Retrieve the console codepage - * In case GetConsoleOutputCP() returns 0 (i.e. the application doesn't have an own console window + * In case GetConsoleCP() returns 0 (i.e. the application doesn't have an own console window * fallback to GetOEMCP(). */ guint win32_get_console_codepage(void) { - guint codepage = GetConsoleOutputCP(); + guint codepage = GetConsoleCP(); if (codepage == 0) codepage = GetOEMCP(); return codepage; } + +/* Convert a string into the system's default codepage, this is different from the + * locale (e.g. default codepage is 850 but locale is CP1252). + * This assumes the input string is encoded as UTF-8, otherwise a copy of + * the input string is returned. */ +gchar *win32_convert_to_system_codepage(const gchar *str, GError **error) +{ + if (g_utf8_validate(str, -1, NULL)) + { + guint codepage_code = win32_get_console_codepage(); + gchar codepage[8] = { 0 }; + g_snprintf(codepage, G_N_ELEMENTS(codepage), "%u", codepage_code); + return g_convert(str, -1, codepage, "utf-8", NULL, NULL, error); + } + else + return g_strdup(str); +} + #endif Modified: src/win32.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -70,6 +70,8 @@ gchar *win32_get_user_config_dir(void); guint win32_get_console_codepage(void); +gchar *win32_convert_to_system_codepage(const gchar *str, GError **error); + G_END_DECLS #endif /* G_OS_WIN32 */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a45091: spawn: Use Wide API on Windows
by Colomban Wendling 13 Nov '16

13 Nov '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Nov 2016 13:55:40 UTC Commit: a45091413a0dae1bc72546281210674fa250db5c https://github.com/geany/geany/commit/a45091413a0dae1bc72546281210674fa250d… Log Message: ----------- spawn: Use Wide API on Windows Try and use Unicode variants of the Windows process creation API in order to support filenames (and possibly environment) outside the locale codepage. WARNING: Implications on using Unicode environment are unknown. It might affect the called process, or not, not sure. Modified Paths: -------------- src/spawn.c Modified: src/spawn.c 123 lines changed, 66 insertions(+), 57 deletions(-) =================================================================== @@ -67,6 +67,7 @@ #else # include "support.h" #endif +#include "utils.h" #if ! GLIB_CHECK_VERSION(2, 31, 20) && ! defined(G_SPAWN_ERROR_TOO_BIG) # define G_SPAWN_ERROR_TOO_BIG G_SPAWN_ERROR_2BIG @@ -307,11 +308,11 @@ gboolean spawn_kill_process(GPid pid, GError **error) #ifdef G_OS_WIN32 -static gchar *spawn_create_process_with_pipes(char *command_line, const char *working_directory, - void *environment, HANDLE *hprocess, int *stdin_fd, int *stdout_fd, int *stderr_fd) +static gchar *spawn_create_process_with_pipes(wchar_t *w_command_line, const wchar_t *w_working_directory, + void *w_environment, HANDLE *hprocess, int *stdin_fd, int *stdout_fd, int *stderr_fd) { enum { WRITE_STDIN, READ_STDOUT, READ_STDERR, READ_STDIN, WRITE_STDOUT, WRITE_STDERR }; - STARTUPINFO startup; + STARTUPINFOW startup; PROCESS_INFORMATION process; HANDLE hpipe[6] = { NULL, NULL, NULL, NULL, NULL, NULL }; int *fd[3] = { stdin_fd, stdout_fd, stderr_fd }; @@ -372,8 +373,9 @@ static gchar *spawn_create_process_with_pipes(char *command_line, const char *wo startup.hStdOutput = hpipe[WRITE_STDOUT]; startup.hStdError = hpipe[WRITE_STDERR]; - if (!CreateProcess(NULL, command_line, NULL, NULL, TRUE, pipe_io ? CREATE_NO_WINDOW : 0, - environment, working_directory, &startup, &process)) + if (!CreateProcessW(NULL, w_command_line, NULL, NULL, TRUE, + CREATE_UNICODE_ENVIRONMENT | (pipe_io ? CREATE_NO_WINDOW : 0), + w_environment, w_working_directory, &startup, &process)) { failed = ""; /* report the message only */ /* further errors will not be reported */ @@ -521,9 +523,9 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch #ifdef G_OS_WIN32 GString *command; - GArray *environment; - gchar *locale_working_directory = NULL; - gchar *locale_command = NULL; + GArray *w_environment; + wchar_t *w_working_directory = NULL; + wchar_t *w_command = NULL; gboolean success = TRUE; if (command_line) @@ -555,7 +557,7 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch else command = g_string_new(NULL); - environment = g_array_new(TRUE, FALSE, sizeof(char)); + w_environment = g_array_new(TRUE, FALSE, sizeof(wchar_t)); while (argv && *argv) spawn_append_argument(command, *argv++); @@ -566,81 +568,88 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch while (envp && *envp && success) { - gsize locale_entry_len; - gchar *locale_entry; + glong w_entry_len; + wchar_t *w_entry; + gchar *tmp = NULL; - if (g_utf8_validate(*envp, -1, NULL)) + // FIXME: remove this and rely on UTF-8 input + if (! g_utf8_validate(*envp, -1, NULL)) { - /* TODO: better error message */ - locale_entry = g_locale_from_utf8(*envp, -1, NULL, &locale_entry_len, error); - } - else - { - locale_entry_len = strlen(*envp); - locale_entry = g_memdup(*envp, locale_entry_len + 1); + tmp = utils_get_utf8_from_locale(*envp); + *envp = tmp; } + /* TODO: better error message */ + w_entry = g_utf8_to_utf16(*envp, -1, NULL, &w_entry_len, error); - if (! locale_entry) + if (! w_entry) success = FALSE; else { /* copy the entry, including NUL terminator */ - g_array_append_vals(environment, locale_entry, locale_entry_len + 1); - g_free(locale_entry); + g_array_append_vals(w_environment, w_entry, w_entry_len + 1); + g_free(w_entry); } + g_free(tmp); envp++; } /* convert working directory into locale encoding */ if (success && working_directory) { - if (g_utf8_validate(working_directory, -1, NULL)) - { - GError *gerror = NULL; + GError *gerror = NULL; + const gchar *utf8_working_directory; + gchar *tmp = NULL; - locale_working_directory = g_locale_from_utf8(working_directory, -1, NULL, NULL, &gerror); - if (! locale_working_directory) - { - /* TODO use the code below post-1.28 as it introduces a new string - g_set_error(error, gerror->domain, gerror->code, - _("Failed to convert working directory into locale encoding: %s"), gerror->message); - */ - g_propagate_error(error, gerror); - success = FALSE; - } - } + // FIXME: remove this and rely on UTF-8 input + if (! g_utf8_validate(working_directory, -1, NULL)) + utf8_working_directory = tmp = utils_get_utf8_from_locale(working_directory); else - locale_working_directory = g_strdup(working_directory); + utf8_working_directory = working_directory; + + w_working_directory = g_utf8_to_utf16(utf8_working_directory, -1, NULL, NULL, &gerror); + if (! w_working_directory) + { + /* TODO use the code below post-1.28 as it introduces a new string + g_set_error(error, gerror->domain, gerror->code, + _("Failed to convert working directory into locale encoding: %s"), gerror->message); + */ + g_propagate_error(error, gerror); + success = FALSE; + } + g_free(tmp); } /* convert command into locale encoding */ if (success) { - if (g_utf8_validate(command->str, -1, NULL)) - { - GError *gerror = NULL; + GError *gerror = NULL; + const gchar *utf8_cmd; + gchar *tmp = NULL; - locale_command = g_locale_from_utf8(command->str, -1, NULL, NULL, &gerror); - if (! locale_command) - { - /* TODO use the code below post-1.28 as it introduces a new string - g_set_error(error, gerror->domain, gerror->code, - _("Failed to convert command into locale encoding: %s"), gerror->message); - */ - g_propagate_error(error, gerror); - success = FALSE; - } - } + // FIXME: remove this and rely on UTF-8 input + if (! g_utf8_validate(command->str, -1, NULL)) + utf8_cmd = tmp = utils_get_utf8_from_locale(command->str); else - locale_command = g_strdup(command->str); + utf8_cmd = command->str; + + w_command = g_utf8_to_utf16(utf8_cmd, -1, NULL, NULL, &gerror); + if (! w_command) + { + /* TODO use the code below post-1.28 as it introduces a new string + g_set_error(error, gerror->domain, gerror->code, + _("Failed to convert command into locale encoding: %s"), gerror->message); + */ + g_propagate_error(error, gerror); + success = FALSE; + } } if (success) { gchar *failure; - failure = spawn_create_process_with_pipes(locale_command, locale_working_directory, - envp ? environment->data : NULL, child_pid, stdin_fd, stdout_fd, stderr_fd); + failure = spawn_create_process_with_pipes(w_command, w_working_directory, + envp ? w_environment->data : NULL, child_pid, stdin_fd, stdout_fd, stderr_fd); if (failure) { @@ -652,9 +661,9 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch } g_string_free(command, TRUE); - g_array_free(environment, TRUE); - g_free(locale_working_directory); - g_free(locale_command); + g_array_free(w_environment, TRUE); + g_free(w_working_directory); + g_free(w_command); return success; #else /* G_OS_WIN32 */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 127e94: Windows: Convert working directory into locale encoding before spawning commands
by Enrico Tröger 13 Nov '16

13 Nov '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Nov 2016 13:55:39 UTC Commit: 127e94199ba92f2584d9c83fb90126e42265bbb9 https://github.com/geany/geany/commit/127e94199ba92f2584d9c83fb90126e42265b… Log Message: ----------- Windows: Convert working directory into locale encoding before spawning commands The working directory is passed in in UTF-8 encoding but Windows API expects locale encoding here, so convert it. Fixes #1076. Modified Paths: -------------- src/build.c src/spawn.c src/win32.c src/win32.h Modified: src/build.c 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1070,6 +1070,7 @@ static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cm gboolean success = TRUE; #ifdef G_OS_WIN32 gchar *expanded_cmd; + guint codepage; #else gchar *escaped_dir; #endif @@ -1079,9 +1080,15 @@ static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cm close(fd); #ifdef G_OS_WIN32 + /* We set the console codepage to UTF-8 (65001) before changing the working directory + * because the working directory is in UTF-8 encoding. + * Then we reset it again to the default value before executing the command. */ + codepage = win32_get_console_codepage(); /* Expand environment variables like %blah%. */ expanded_cmd = win32_expand_environment_variables(cmd); - str = g_strdup_printf("cd \"%s\"\n\n%s\n\n%s\ndel \"%%0\"\n\npause\n", working_dir, expanded_cmd, (autoclose) ? "" : "pause"); + str = g_strdup_printf( + "chcp 65001 > nul\ncd \"%s\"\nchcp %u > nul\n\n%s\n\n%s\ndel \"%%0\"\n\npause\n", + working_dir, codepage, expanded_cmd, (autoclose) ? "" : "pause"); g_free(expanded_cmd); #else escaped_dir = g_shell_quote(working_dir); Modified: src/spawn.c 48 lines changed, 46 insertions(+), 2 deletions(-) =================================================================== @@ -522,6 +522,9 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch #ifdef G_OS_WIN32 GString *command; GArray *environment; + GError *gerror = NULL; + gchar *locale_working_directory; + gchar *locale_command; gchar *failure; if (command_line) @@ -568,11 +571,52 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch envp++; } - failure = spawn_create_process_with_pipes(command->str, working_directory, + // convert working directory into locale encoding + if (g_utf8_validate(working_directory, -1, NULL)) + { + locale_working_directory = g_locale_from_utf8(working_directory, -1, NULL, NULL, &gerror); + if (gerror) { + /* TODO use the code below post-1.28 as it introduces a new string + gchar *msg = g_strdup_printf( + _("Failed to convert working directory into locale encoding: %s"), gerror->message); + g_set_error_literal(error, gerror->domain, gerror->code, msg); + */ + g_set_error_literal(error, gerror->domain, gerror->code, gerror->message); + g_error_free(gerror); + g_string_free(command, TRUE); + g_array_free(environment, TRUE); + g_free(locale_working_directory); + /*g_free(msg);*/ + return FALSE; + } + } + // convert command into locale encoding + if (g_utf8_validate(command->str, -1, NULL)) + { + locale_command = g_locale_from_utf8(command->str, -1, NULL, NULL, &gerror); + if (gerror) { + /* TODO use the code below post-1.28 as it introduces a new string + gchar *msg = g_strdup_printf( + _("Failed to convert command into locale encoding: %s"), gerror->message); + g_set_error_literal(error, gerror->domain, gerror->code, msg); + */ + g_set_error_literal(error, gerror->domain, gerror->code, gerror->message); + g_error_free(gerror); + g_string_free(command, TRUE); + g_array_free(environment, TRUE); + g_free(locale_working_directory); + g_free(locale_command); + /*g_free(msg);*/ + return FALSE; + } + } + failure = spawn_create_process_with_pipes(locale_command, locale_working_directory, envp ? environment->data : NULL, child_pid, stdin_fd, stdout_fd, stderr_fd); g_string_free(command, TRUE); g_array_free(environment, TRUE); + g_free(locale_working_directory); + g_free(locale_command); if (failure) { @@ -655,7 +699,7 @@ static gboolean spawn_async_with_pipes(const gchar *working_directory, const gch #ifdef ENFILE case G_SPAWN_ERROR_NFILE : en = ENFILE; break; #endif - #ifdef EMFILE + #ifdef EMFILE case G_SPAWN_ERROR_MFILE : en = EMFILE; break; #endif #ifdef EINVAL Modified: src/win32.c 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -1032,4 +1032,16 @@ gchar *win32_get_user_config_dir(void) return g_build_filename(g_get_user_config_dir(), "geany", NULL); } + +/* Retrieve the console codepage + * In case GetConsoleOutputCP() returns 0 (i.e. the application doesn't have an own console window + * fallback to GetOEMCP(). */ +guint win32_get_console_codepage(void) +{ + guint codepage = GetConsoleOutputCP(); + if (codepage == 0) + codepage = GetOEMCP(); + return codepage; +} + #endif Modified: src/win32.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -68,6 +68,8 @@ gchar *win32_expand_environment_variables(const gchar *str); gchar *win32_get_user_config_dir(void); +guint win32_get_console_codepage(void); + G_END_DECLS #endif /* G_OS_WIN32 */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 973a72: Use pre-compiled 'grep' binary from MSYS2 on Windows
by Enrico Tröger 13 Nov '16

13 Nov '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 13 Nov 2016 13:24:17 UTC Commit: 973a721574364f10995eb94a03e501e4c60c1d56 https://github.com/geany/geany/commit/973a721574364f10995eb94a03e501e4c60c1… Log Message: ----------- Use pre-compiled 'grep' binary from MSYS2 on Windows This drops the self-compiled 'grep' version which caused issues with recursive searches on Windows as well as with non-ASCII characters in paths. The pre-compiled 'grep' binary from MSYS2 (matching the target ABI) seems to solve probably all of the known problems on Windows. The only drawback is that we need to ship a few additional MSYS2 libraries on which the 'grep' binary depends. Closes #1229 and #1260. Modified Paths: -------------- scripts/gtk-bundle-from-msys2.sh Modified: scripts/gtk-bundle-from-msys2.sh 46 lines changed, 26 insertions(+), 20 deletions(-) =================================================================== @@ -13,7 +13,9 @@ gtkv="3" run_pi="y" UNX_UTILS_URL="http://unxutils.sourceforge.net/UnxUpdates.zip" -GREP_URL="https://download.geany.org/contrib/grep-2.23.tar.xz" +# path to an installation of a MSYS2 installation in the native architecture matching $ABI +# leave empty if the script is called already from the same MSYS2 architecture as $ABI +MSYS2_ABI_PATH="/c/msys32" package_urls="" gtk2_dependency_pkgs="" @@ -205,21 +207,22 @@ cleanup_unnecessary_files() { find . -type d -empty -delete } -download_and_compile_grep() { - grep_archive="grep_source.tar.xz" - grep_build_dir="grep_build" - grep_build_log="grep_build.log" - echo "Download and compile 'grep' (see ${grep_build_dir}/${grep_build_log} for details)" - mkdir ${grep_build_dir} - cd ${grep_build_dir} - wget --no-verbose -O ${grep_archive} ${GREP_URL} - tar xf ${grep_archive} - grep-2*/configure > ${grep_build_log} 2>&1 || exit 1 - make >> ${grep_build_log} 2>&1 || exit 1 - strip src/grep.exe - cp src/grep.exe ../bin/ - cd .. - rm -rf ${grep_build_dir} +copy_grep_and_dependencies() { + own_arch=$(arch) + if [ "${own_arch}" == "${ABI}" -o -z "${MSYS2_ABI_PATH}" ]; then + bin_dir="/usr/bin" + else + # TODO extract grep and dependencies from Pacman packages according to the target ABI + bin_dir="${MSYS2_ABI_PATH}/usr/bin" + fi + echo "Copy 'grep' from ${bin_dir}" + cp "${bin_dir}/grep.exe" "bin/" + # dependencies for grep.exe + cp "${bin_dir}/msys-2.0.dll" "bin/" + cp "${bin_dir}/msys-gcc_s-1.dll" "bin/" + cp "${bin_dir}/msys-iconv-2.dll" "bin/" + cp "${bin_dir}/msys-intl-8.dll" "bin/" + cp "${bin_dir}/msys-pcre-1.dll" "bin/" } download_and_extract_sort() { @@ -232,6 +235,8 @@ download_and_extract_sort() { } create_bundle_dependency_info_file() { + grep_version="$(bin/grep --version | head -n1)" + sort_version="$(bin/sort --version | head -n1)" filename="ReadMe.Dependencies.Geany.txt" cat << EOF > "${filename}" This installation contains dependencies for Geany which are distributed @@ -242,10 +247,11 @@ full download URL as used to create this installation. sort.exe is extracted from the ZIP archive at ${UNX_UTILS_URL}. +Sort version: ${sort_version} -grep.exe is self-compiled from the sources available at -${GREP_URL}. -Used command to compile: ./configure && make +grep.exe is taken from a 32bit MSYS2 installation and +is bundled together with its dependencies. +Grep version: ${grep_version} Other dependencies are provided by the MSYS2 project (https://msys2.github.io) and were downloaded from: @@ -271,7 +277,7 @@ initialize extract_packages move_extracted_files cleanup_unnecessary_files -download_and_compile_grep +copy_grep_and_dependencies download_and_extract_sort create_bundle_dependency_info_file create_zip_archive -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 88137b: Update of German translation
by Frank Lanitz 13 Nov '16

13 Nov '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 13 Nov 2016 12:35:46 UTC Commit: 88137b9b087325465644ee892d1b4eb19bcbd01a https://github.com/geany/geany/commit/88137b9b087325465644ee892d1b4eb19bcbd… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 417 lines changed, 207 insertions(+), 210 deletions(-) =================================================================== @@ -9,9 +9,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 1.28\n" +"Project-Id-Version: Geany 1.29\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-29 20:21+0200\n" +"POT-Creation-Date: 2016-11-13 13:33+0100\n" "PO-Revision-Date: 2015-03-31 07:10+0200\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" @@ -24,7 +24,7 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Language: German\n" -#: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 +#: ../geany.desktop.in.h:1 ../data/geany.glade.h:341 msgid "Geany" msgstr "Geany" @@ -408,7 +408,7 @@ msgstr "Sonstiges" #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../data/geany.glade.h:76 ../src/prefs.c:1604 +#: ../data/geany.glade.h:76 ../src/prefs.c:1597 msgid "General" msgstr "Allgemein" @@ -498,7 +498,7 @@ msgstr "" "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " "werden soll oder nicht" -#: ../data/geany.glade.h:98 ../src/prefs.c:1606 +#: ../data/geany.glade.h:98 ../src/prefs.c:1599 msgid "Interface" msgstr "Schnittstelle" @@ -634,7 +634,7 @@ msgstr "Symbolgröße" msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../data/geany.glade.h:129 ../src/prefs.c:1608 +#: ../data/geany.glade.h:129 ../src/prefs.c:1601 msgid "Toolbar" msgstr "Werkzeugleiste" @@ -1165,7 +1165,7 @@ msgstr "Virtuelle Leerzeichen" msgid "Display" msgstr "Ansicht" -#: ../data/geany.glade.h:233 ../src/keybindings.c:309 ../src/prefs.c:1610 +#: ../data/geany.glade.h:233 ../src/keybindings.c:309 ../src/prefs.c:1603 msgid "Editor" msgstr "Editor" @@ -1285,7 +1285,7 @@ msgstr "" "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " "deaktiviert die Funktion." -#: ../data/geany.glade.h:258 ../src/prefs.c:1612 ../src/symbols.c:466 +#: ../data/geany.glade.h:258 ../src/prefs.c:1605 ../src/symbols.c:466 #: ../plugins/filebrowser.c:1159 msgid "Files" msgstr "Dateien" @@ -1335,7 +1335,7 @@ msgstr "" msgid "Commands" msgstr "Befehle" -#: ../data/geany.glade.h:270 ../src/keybindings.c:321 ../src/prefs.c:1614 +#: ../data/geany.glade.h:270 ../src/keybindings.c:321 ../src/prefs.c:1607 msgid "Tools" msgstr "Werkzeuge" @@ -1422,7 +1422,7 @@ msgstr "" msgid "Template data" msgstr "Daten für Vorlagen:" -#: ../data/geany.glade.h:288 ../src/prefs.c:1616 +#: ../data/geany.glade.h:288 ../src/prefs.c:1609 msgid "Templates" msgstr "Vorlagen" @@ -1435,7 +1435,7 @@ msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" #: ../data/geany.glade.h:291 ../src/plugins.c:1941 ../src/plugins.c:1978 -#: ../src/prefs.c:1618 +#: ../src/prefs.c:1611 msgid "Keybindings" msgstr "Tastenkürzel" @@ -1515,7 +1515,7 @@ msgstr "GTK-Druckunterstützung benutzen" msgid "Printing" msgstr "Drucken" -#: ../data/geany.glade.h:308 ../src/prefs.c:1620 +#: ../data/geany.glade.h:308 ../src/prefs.c:1613 msgid "Printing" msgstr "Drucken" @@ -1540,83 +1540,75 @@ msgid "Background color:" msgstr "Hintergrundfarbe:" #: ../data/geany.glade.h:314 -msgid "Background image:" -msgstr "Hintergrundbild:" - -#: ../data/geany.glade.h:315 msgid "Scrollback lines:" msgstr "Zeilen zum Zurückrollen:" -#: ../data/geany.glade.h:316 +#: ../data/geany.glade.h:315 msgid "Shell:" msgstr "Shell:" -#: ../data/geany.glade.h:317 +#: ../data/geany.glade.h:316 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Setzt die Vordergrundfarbe für das Terminal" -#: ../data/geany.glade.h:318 +#: ../data/geany.glade.h:317 msgid "Sets the background color of the text in the terminal widget" msgstr "Setzt die Hintergrundfarbe für Text innerhalb des Terminals" -#: ../data/geany.glade.h:319 -msgid "Sets the path to the background image in the terminal widget" -msgstr "Setzt den Pfad des Hintergrundbildes des Terminals." - -#: ../data/geany.glade.h:320 +#: ../data/geany.glade.h:318 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "Gibt die Anzahl der Zeilen an, die man im Terminal zurückrollen kann" -#: ../data/geany.glade.h:321 +#: ../data/geany.glade.h:319 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "Setzt den Pfad zu der Shell, die in der VTE benutzt werden soll" -#: ../data/geany.glade.h:322 +#: ../data/geany.glade.h:320 msgid "Scroll on keystroke" msgstr "Bei Tastendruck rollen" -#: ../data/geany.glade.h:323 +#: ../data/geany.glade.h:321 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "" "Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gerollt werden " "soll" -#: ../data/geany.glade.h:324 +#: ../data/geany.glade.h:322 msgid "Scroll on output" msgstr "Bei Ausgabe rollen" -#: ../data/geany.glade.h:325 +#: ../data/geany.glade.h:323 msgid "Whether to scroll to the bottom when output is generated" msgstr "Legt fest, ob das Fenster bei einer Ausgabe gerollt werden soll" -#: ../data/geany.glade.h:326 +#: ../data/geany.glade.h:324 msgid "Cursor blinks" msgstr "Blinkender Cursor" -#: ../data/geany.glade.h:327 +#: ../data/geany.glade.h:325 msgid "Whether to blink the cursor" msgstr "Legt fest, ob der Cursor blinken soll" -#: ../data/geany.glade.h:328 +#: ../data/geany.glade.h:326 msgid "Override Geany keybindings" msgstr "Geanys Tastenkombination überschreiben" -#: ../data/geany.glade.h:329 +#: ../data/geany.glade.h:327 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Erlaubt das integrierte Terminal über Tastenkürzel anzusprechen (mit " "Ausnahme des Fokus-Kommandos)" -#: ../data/geany.glade.h:330 +#: ../data/geany.glade.h:328 msgid "Disable menu shortcut key (F10 by default)" msgstr "Menütastenkombination deaktivieren (Vorgabe ist F10)" -#: ../data/geany.glade.h:331 +#: ../data/geany.glade.h:329 msgid "" "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 " @@ -1626,21 +1618,21 @@ msgstr "" "Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight " "Commander in der VTE benutzen möchten." -#: ../data/geany.glade.h:332 +#: ../data/geany.glade.h:330 msgid "Follow path of the current file" msgstr "Pfad der aktuellen Datei setzen" -#: ../data/geany.glade.h:333 +#: ../data/geany.glade.h:331 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Legt fest, ob »cd $path« in der VTE ausgeführt werden soll, wenn Sie " "zwischen geöffneten Dateien wechseln" -#: ../data/geany.glade.h:334 +#: ../data/geany.glade.h:332 msgid "Execute programs in the VTE" msgstr "Führe Programme in der VTE aus" -#: ../data/geany.glade.h:335 +#: ../data/geany.glade.h:333 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -1649,552 +1641,552 @@ msgstr "" "Achtung: Programme die in der VTE ausgeführt werden, können nicht gestoppt " "werden." -#: ../data/geany.glade.h:336 +#: ../data/geany.glade.h:334 msgid "Don't use run script" msgstr "Das Run-Skript nicht benutzen" -#: ../data/geany.glade.h:337 +#: ../data/geany.glade.h:335 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" msgstr "" "Das Run-Skript, welches gewöhnlich zur Ausgabe des Rückgabe-Wertes eines " "ausgeführten Programms genutzt wird, nicht benutzen" -#: ../data/geany.glade.h:338 +#: ../data/geany.glade.h:336 msgid "Terminal" msgstr "Terminal" -#: ../data/geany.glade.h:339 ../src/prefs.c:1624 ../src/vte.c:320 +#: ../data/geany.glade.h:337 ../src/prefs.c:1617 ../src/vte.c:384 msgid "Terminal" msgstr "Terminal" -#: ../data/geany.glade.h:340 +#: ../data/geany.glade.h:338 msgid "Warning: read the manual before changing these preferences." msgstr "" "Bitte konsultieren Sie zuallererst die Dokumentation für diese " "Einstellungen" -#: ../data/geany.glade.h:341 +#: ../data/geany.glade.h:339 msgid "Various preferences" msgstr "Verschiedene Einstellungen" -#: ../data/geany.glade.h:342 ../src/prefs.c:1622 +#: ../data/geany.glade.h:340 ../src/prefs.c:1615 msgid "Various" msgstr "Verschiedenes" -#: ../data/geany.glade.h:344 +#: ../data/geany.glade.h:342 msgid "_File" msgstr "_Datei" -#: ../data/geany.glade.h:345 +#: ../data/geany.glade.h:343 msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../data/geany.glade.h:346 +#: ../data/geany.glade.h:344 msgid "_Open..." msgstr "Ö_ffnen..." -#: ../data/geany.glade.h:347 +#: ../data/geany.glade.h:345 msgid "Recent _Files" msgstr "_Zuletzt geöffnet" -#: ../data/geany.glade.h:348 +#: ../data/geany.glade.h:346 msgid "Save _As..." msgstr "Speichern _unter" -#: ../data/geany.glade.h:349 +#: ../data/geany.glade.h:347 msgid "Sa_ve All" msgstr "A_lle speichern" -#: ../data/geany.glade.h:350 ../src/document.c:1651 ../src/document.c:3620 +#: ../data/geany.glade.h:348 ../src/document.c:1651 ../src/document.c:3620 #: ../src/sidebar.c:718 msgid "_Reload" msgstr "Neu _laden" -#: ../data/geany.glade.h:351 +#: ../data/geany.glade.h:349 msgid "R_eload As" msgstr "N_eu laden als" -#: ../data/geany.glade.h:352 +#: ../data/geany.glade.h:350 msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../data/geany.glade.h:353 +#: ../data/geany.glade.h:351 msgid "_Print..." msgstr "_Drucken" -#: ../data/geany.glade.h:354 ../src/notebook.c:470 +#: ../data/geany.glade.h:352 ../src/notebook.c:470 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../data/geany.glade.h:355 ../src/notebook.c:476 +#: ../data/geany.glade.h:353 ../src/notebook.c:476 msgid "C_lose All" msgstr "_Alle schließen" -#: ../data/geany.glade.h:356 +#: ../data/geany.glade.h:354 msgid "Co_mmands" msgstr "_Kommandos" -#: ../data/geany.glade.h:357 ../src/keybindings.c:434 +#: ../data/geany.glade.h:355 ../src/keybindings.c:434 msgid "Cu_t Current Line(s)" msgstr "Aktuelle Zeile(n) _ausschneiden" -#: ../data/geany.glade.h:358 ../src/keybindings.c:431 +#: ../data/geany.glade.h:356 ../src/keybindings.c:431 msgid "_Copy Current Line(s)" msgstr "Aktuelle Zeile(n) _kopieren" -#: ../data/geany.glade.h:359 ../src/keybindings.c:384 +#: ../data/geany.glade.h:357 ../src/keybindings.c:384 msgid "_Delete Current Line(s)" msgstr "Aktuelle Zeile(n) _löschen" -#: ../data/geany.glade.h:360 ../src/keybindings.c:381 +#: ../data/geany.glade.h:358 ../src/keybindings.c:381 msgid "D_uplicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../data/geany.glade.h:361 ../src/keybindings.c:444 +#: ../data/geany.glade.h:359 ../src/keybindings.c:444 msgid "S_elect Current Line(s)" msgstr "Aktuelle Zeile(n) a_uswählen" -#: ../data/geany.glade.h:362 ../src/keybindings.c:447 +#: ../data/geany.glade.h:360 ../src/keybindings.c:447 msgid "Se_lect Current Paragraph" msgstr "Aktuellen Absatz au_swählen" -#: ../data/geany.glade.h:363 +#: ../data/geany.glade.h:361 msgid "_Move Line(s) Up" msgstr "Zeile(n) nach _oben bewegen" -#: ../data/geany.glade.h:364 +#: ../data/geany.glade.h:362 msgid "M_ove Line(s) Down" msgstr "Zeile(n) nach _unten bewegen" -#: ../data/geany.glade.h:365 ../src/keybindings.c:498 +#: ../data/geany.glade.h:363 ../src/keybindings.c:498 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../data/geany.glade.h:366 ../src/keybindings.c:500 +#: ../data/geany.glade.h:364 ../src/keybindings.c:500 msgid "_Reflow Lines/Block" msgstr "_Neuformatieren der Zeile/des Abschnitts" -#: ../data/geany.glade.h:367 ../src/keybindings.c:458 +#: ../data/geany.glade.h:365 ../src/keybindings.c:458 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../data/geany.glade.h:368 +#: ../data/geany.glade.h:366 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: ../data/geany.glade.h:369 +#: ../data/geany.glade.h:367 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: ../data/geany.glade.h:370 +#: ../data/geany.glade.h:368 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: ../data/geany.glade.h:371 +#: ../data/geany.glade.h:369 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: ../data/geany.glade.h:372 +#: ../data/geany.glade.h:370 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../data/geany.glade.h:373 ../src/keybindings.c:477 +#: ../data/geany.glade.h:371 ../src/keybindings.c:477 msgid "S_mart Line Indent" msgstr "Intelligentes _Einrücken" -#: ../data/geany.glade.h:374 +#: ../data/geany.glade.h:372 msgid "_Send Selection to" msgstr "_Auswahl senden an" -#: ../data/geany.glade.h:375 +#: ../data/geany.glade.h:373 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../data/geany.glade.h:376 +#: ../data/geany.glade.h:374 msgid "Preference_s" msgstr "E_instellungen" -#: ../data/geany.glade.h:377 ../src/keybindings.c:524 +#: ../data/geany.glade.h:375 ../src/keybindings.c:524 msgid "P_lugin Preferences" msgstr "Plugin-_Einstellungen" -#: ../data/geany.glade.h:378 +#: ../data/geany.glade.h:376 msgid "_Find..." msgstr "_Suchen" -#: ../data/geany.glade.h:379 +#: ../data/geany.glade.h:377 msgid "Find _Next" msgstr "_Nächstes" -#: ../data/geany.glade.h:380 +#: ../data/geany.glade.h:378 msgid "Find _Previous" msgstr "_Vorheriges" -#: ../data/geany.glade.h:381 ../src/symbols.c:2560 +#: ../data/geany.glade.h:379 ../src/symbols.c:2560 msgid "Find in F_iles..." msgstr "In _Dateien suchen..." -#: ../data/geany.glade.h:382 +#: ../data/geany.glade.h:380 msgid "_Replace..." msgstr "_Ersetzen..." -#: ../data/geany.glade.h:383 +#: ../data/geany.glade.h:381 msgid "Next Me_ssage" msgstr "Nä_chste Nachricht" -#: ../data/geany.glade.h:384 +#: ../data/geany.glade.h:382 msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../data/geany.glade.h:385 ../src/keybindings.c:573 +#: ../data/geany.glade.h:383 ../src/keybindings.c:573 msgid "Go to Ne_xt Marker" msgstr "Zur _nächsten Markierung springen" -#: ../data/geany.glade.h:386 ../src/keybindings.c:576 +#: ../data/geany.glade.h:384 ../src/keybindings.c:576 msgid "Go to Pre_vious Marker" msgstr "Zur _vorherigen Markierung springen" -#: ../data/geany.glade.h:387 +#: ../data/geany.glade.h:385 msgid "_Go to Line..." msgstr "_Gehe zu Zeile..." -#: ../data/geany.glade.h:388 ../src/keybindings.c:536 +#: ../data/geany.glade.h:386 ../src/keybindings.c:536 msgid "Find Next _Selection" msgstr "Auswahl _vorwärts im Dokument finden " -#: ../data/geany.glade.h:389 ../src/keybindings.c:538 +#: ../data/geany.glade.h:387 ../src/keybindings.c:538 msgid "Find Pre_vious Selection" msgstr "Auswahl _rückwärts im Dokument finden" -#: ../data/geany.glade.h:390 ../src/keybindings.c:555 +#: ../data/geany.glade.h:388 ../src/keybindings.c:555 msgid "_Mark All" msgstr "_Alles markieren" -#: ../data/geany.glade.h:391 +#: ../data/geany.glade.h:389 msgid "Go to Symbol Decl_aration" msgstr "Gehe zur Symbol-Dekl_aration" -#: ../data/geany.glade.h:392 +#: ../data/geany.glade.h:390 msgid "_View" msgstr "_Ansicht" -#: ../data/geany.glade.h:393 +#: ../data/geany.glade.h:391 msgid "Change _Font..." msgstr "_Schriftart ändern..." -#: ../data/geany.glade.h:394 +#: ../data/geany.glade.h:392 msgid "Change _Color Scheme..." msgstr "_Farbschemata..." -#: ../data/geany.glade.h:395 +#: ../data/geany.glade.h:393 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: ../data/geany.glade.h:396 +#: ../data/geany.glade.h:394 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: ../data/geany.glade.h:397 +#: ../data/geany.glade.h:395 msgid "Show White S_pace" msgstr "_Leerzeichen anzeigen" -#: ../data/geany.glade.h:398 +#: ../data/geany.glade.h:396 msgid "Show Line _Endings" msgstr "Zeile_nenden anzeigen" -#: ../data/geany.glade.h:399 +#: ../data/geany.glade.h:397 msgid "Show Indentation _Guides" msgstr "Zeige _Einrückungshinweise" -#: ../data/geany.glade.h:400 +#: ../data/geany.glade.h:398 msgid "Full_screen" msgstr "_Vollbild" -#: ../data/geany.glade.h:401 +#: ../data/geany.glade.h:399 msgid "Toggle All _Additional Widgets" msgstr "Zusätzliche _Infofenster ein-/ausblenden" -#: ../data/geany.glade.h:402 +#: ../data/geany.glade.h:400 msgid "Show Message _Window" msgstr "_Meldungsfenster anzeigen" -#: ../data/geany.glade.h:403 +#: ../data/geany.glade.h:401 msgid "Show _Toolbar" msgstr "W_erkzeugleiste anzeigen" -#: ../data/geany.glade.h:404 +#: ../data/geany.glade.h:402 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../data/geany.glade.h:405 +#: ../data/geany.glade.h:403 msgid "_Document" msgstr "D_okument" -#: ../data/geany.glade.h:406 +#: ../data/geany.glade.h:404 msgid "_Line Wrapping" msgstr "_Visueller Zeilenumbruch" -#: ../data/geany.glade.h:407 +#: ../data/geany.glade.h:405 msgid "Line _Breaking" msgstr "Automatischer Zeilen_umbruch" -#: ../data/geany.glade.h:408 +#: ../data/geany.glade.h:406 msgid "_Auto-indentation" msgstr "_Automatische Einrückung benutzen" -#: ../data/geany.glade.h:409 +#: ../data/geany.glade.h:407 msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../data/geany.glade.h:410 +#: ../data/geany.glade.h:408 msgid "_Detect from Content" msgstr "Aus _Inhalt lesen" -#: ../data/geany.glade.h:411 +#: ../data/geany.glade.h:409 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../data/geany.glade.h:412 +#: ../data/geany.glade.h:410 msgid "Indent Widt_h" msgstr "Einzugs_breite" -#: ../data/geany.glade.h:413 +#: ../data/geany.glade.h:411 msgid "_1" msgstr "_1" -#: ../data/geany.glade.h:414 +#: ../data/geany.glade.h:412 msgid "_2" msgstr "_2" -#: ../data/geany.glade.h:415 +#: ../data/geany.glade.h:413 msgid "_3" msgstr "_3" -#: ../data/geany.glade.h:416 +#: ../data/geany.glade.h:414 msgid "_4" msgstr "_4" -#: ../data/geany.glade.h:417 +#: ../data/geany.glade.h:415 msgid "_5" msgstr "_5" -#: ../data/geany.glade.h:418 +#: ../data/geany.glade.h:416 msgid "_6" msgstr "_6" -#: ../data/geany.glade.h:419 +#: ../data/geany.glade.h:417 msgid "_7" msgstr "_7" -#: ../data/geany.glade.h:420 +#: ../data/geany.glade.h:418 msgid "_8" msgstr "_8" -#: ../data/geany.glade.h:421 +#: ../data/geany.glade.h:419 msgid "Read _Only" msgstr "_Nur Lesen" -#: ../data/geany.glade.h:422 +#: ../data/geany.glade.h:420 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: ../data/geany.glade.h:423 +#: ../data/geany.glade.h:421 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: ../data/geany.glade.h:424 +#: ../data/geany.glade.h:422 msgid "Set _Encoding" msgstr "Ze_ichenkodierung festlegen" -#: ../data/geany.glade.h:425 +#: ../data/geany.glade.h:423 msgid "Set Line E_ndings" msgstr "Zeilenen_den festlegen" -#: ../data/geany.glade.h:426 +#: ../data/geany.glade.h:424 msgid "Convert and Set to _CR/LF (Windows)" msgstr "Auf _CR/LF setzen und umwandeln (Windows)" -#: ../data/geany.glade.h:427 +#: ../data/geany.glade.h:425 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: ../data/geany.glade.h:428 +#: ../data/geany.glade.h:426 msgid "Convert and Set to CR (Classic _Mac)" msgstr "Auf CR setzen und umwandeln (Klassischer _Apple)" -#: ../data/geany.glade.h:429 ../src/keybindings.c:664 +#: ../data/geany.glade.h:427 ../src/keybindings.c:664 msgid "_Clone" msgstr "_Klonen" -#: ../data/geany.glade.h:430 +#: ../data/geany.glade.h:428 msgid "_Strip Trailing Spaces" msgstr "Lee_rzeichen am Zeilenende entfernen" -#: ../data/geany.glade.h:431 +#: ../data/geany.glade.h:429 msgid "Replace Tabs with S_paces" msgstr "Tabulat_oren durch Leerzeichen ersetzen" -#: ../data/geany.glade.h:432 +#: ../data/geany.glade.h:430 msgid "_Replace Spaces with Tabs..." msgstr "_Leerzeichen durch Tabulatoren ersetzen..." -#: ../data/geany.glade.h:433 +#: ../data/geany.glade.h:431 msgid "_Fold All" msgstr "A_lle einklappen" -#: ../data/geany.glade.h:434 +#: ../data/geany.glade.h:432 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: ../data/geany.glade.h:435 +#: ../data/geany.glade.h:433 msgid "Remove _Markers" msgstr "Alle _Markierungen entfernen" -#: ../data/geany.glade.h:436 +#: ../data/geany.glade.h:434 msgid "Remove Error _Indicators" msgstr "Alle _Fehlermarkierungen entfernen" -#: ../data/geany.glade.h:437 +#: ../data/geany.glade.h:435 msgid "_Project" msgstr "_Projekt" -#: ../data/geany.glade.h:438 +#: ../data/geany.glade.h:436 msgid "_New..." msgstr "_Neu..." -#: ../data/geany.glade.h:439 +#: ../data/geany.glade.h:437 msgid "_Recent Projects" msgstr "_Zuletzt geöffnete Projekte" -#: ../data/geany.glade.h:440 +#: ../data/geany.glade.h:438 msgid "_Close" msgstr "S_chließen" -#: ../data/geany.glade.h:441 +#: ../data/geany.glade.h:439 msgid "Apply the default indentation settings to all documents" msgstr "Wende die Standardeinrückung auf alle Dokumente an" -#: ../data/geany.glade.h:442 +#: ../data/geany.glade.h:440 msgid "_Apply Default Indentation" msgstr "_Standardeinrückung anwenden" #. build the code -#: ../data/geany.glade.h:443 ../src/build.c:2392 ../src/build.c:2669 +#: ../data/geany.glade.h:441 ../src/build.c:2392 ../src/build.c:2669 msgid "_Build" msgstr "_Erstellen" -#: ../data/geany.glade.h:444 +#: ../data/geany.glade.h:442 msgid "_Tools" msgstr "_Werkzeuge" -#: ../data/geany.glade.h:445 +#: ../data/geany.glade.h:443 msgid "_Reload Configuration" msgstr "_Einstellungen erneut laden" -#: ../data/geany.glade.h:446 +#: ../data/geany.glade.h:444 msgid "C_onfiguration Files" msgstr "_Konfigurationsdateien" -#: ../data/geany.glade.h:447 +#: ../data/geany.glade.h:445 msgid "_Color Chooser" msgstr "_Farb-Wähler" -#: ../data/geany.glade.h:448 +#: ../data/geany.glade.h:446 msgid "_Word Count" msgstr "_Wörter zählen" -#: ../data/geany.glade.h:449 +#: ../data/geany.glade.h:447 msgid "Load Ta_gs File..." msgstr "_Symbole laden..." -#: ../data/geany.glade.h:450 +#: ../data/geany.glade.h:448 msgid "_Help" msgstr "_Hilfe" -#: ../data/geany.glade.h:451 +#: ../data/geany.glade.h:449 msgid "Keyboard _Shortcuts" msgstr "_Tastenkürzel" -#: ../data/geany.glade.h:452 +#: ../data/geany.glade.h:450 msgid "Debug _Messages" msgstr "Debug-_Meldungen" -#: ../data/geany.glade.h:453 +#: ../data/geany.glade.h:451 msgid "_Website" msgstr "_Webseite" -#: ../data/geany.glade.h:454 +#: ../data/geany.glade.h:452 msgid "Wi_ki" msgstr "Wi_ki" -#: ../data/geany.glade.h:455 +#: ../data/geany.glade.h:453 msgid "Report a _Bug..." msgstr "Einen Fehler _berichten..." -#: ../data/geany.glade.h:456 +#: ../data/geany.glade.h:454 msgid "_Donate..." msgstr "_Spenden..." -#: ../data/geany.glade.h:457 ../src/sidebar.c:126 +#: ../data/geany.glade.h:455 ../src/sidebar.c:126 msgid "Symbols" msgstr "Symbole" -#: ../data/geany.glade.h:458 +#: ../data/geany.glade.h:456 msgid "Documents" msgstr "Dokumente" -#: ../data/geany.glade.h:459 +#: ../data/geany.glade.h:457 msgid "Status" msgstr "Status" -#: ../data/geany.glade.h:460 +#: ../data/geany.glade.h:458 msgid "Compiler" msgstr "Compiler" -#: ../data/geany.glade.h:461 +#: ../data/geany.glade.h:459 msgid "Messages" msgstr "Meldungen" -#: ../data/geany.glade.h:462 +#: ../data/geany.glade.h:460 msgid "Scribble" msgstr "Notizen" -#: ../data/geany.glade.h:463 +#: ../data/geany.glade.h:461 msgid "Project Properties" msgstr "Projekteigenschaften" -#: ../data/geany.glade.h:464 ../src/project.c:180 +#: ../data/geany.glade.h:462 ../src/project.c:180 msgid "Filename:" msgstr "Dateiname:" -#: ../data/geany.glade.h:465 ../src/project.c:169 ../plugins/classbuilder.c:467 +#: ../data/geany.glade.h:463 ../src/project.c:169 ../plugins/classbuilder.c:467 #: ../plugins/classbuilder.c:477 msgid "Name:" msgstr "Name:" -#: ../data/geany.glade.h:466 +#: ../data/geany.glade.h:464 msgid "Description:" msgstr "Beschreibung:" -#: ../data/geany.glade.h:467 ../src/project.c:202 +#: ../data/geany.glade.h:465 ../src/project.c:202 msgid "Base path:" msgstr "Basisverzeichnis:" -#: ../data/geany.glade.h:468 +#: ../data/geany.glade.h:466 msgid "File patterns:" msgstr "Dateinamenmuster:" -#: ../data/geany.glade.h:469 +#: ../data/geany.glade.h:467 msgid "" "Space separated list of file patterns used for the find in files dialog (e." "g. *.c *.h)" msgstr "" "Mit Leerzeichen getrennte Liste mit Mustern für »in Dateien finden« (z.B. *." "c *.h)" -#: ../data/geany.glade.h:470 ../src/project.c:209 +#: ../data/geany.glade.h:468 ../src/project.c:209 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 " @@ -2205,79 +2197,79 @@ msgstr "" "Verzeichnis angeben. Weiterhin kann es sowohl in relativer als auch " "absoluter Form eingegeben werden." -#: ../data/geany.glade.h:471 ../src/keybindings.c:319 +#: ../data/geany.glade.h:469 ../src/keybindings.c:319 msgid "Project" msgstr "Projekt" -#: ../data/geany.glade.h:472 +#: ../data/geany.glade.h:470 msgid "Display:" msgstr "Anzeige:" -#: ../data/geany.glade.h:473 +#: ../data/geany.glade.h:471 msgid "Custom" msgstr "Benutzerdefiniert" -#: ../data/geany.glade.h:474 +#: ../data/geany.glade.h:472 msgid "Use global settings" msgstr "Benutze globale Einstellungen" -#: ../data/geany.glade.h:475 +#: ../data/geany.glade.h:473 msgid "Size:" msgstr "Größe" -#: ../data/geany.glade.h:476 +#: ../data/geany.glade.h:474 msgid "Location:" msgstr "Ort:" -#: ../data/geany.glade.h:477 +#: ../data/geany.glade.h:475 msgid "Read-only:" msgstr "Nur lesend:" -#: ../data/geany.glade.h:478 +#: ../data/geany.glade.h:476 msgid "Encoding:" msgstr "Kodierung" -#: ../data/geany.glade.h:479 +#: ../data/geany.glade.h:477 msgid "Modified:" msgstr "Modifiziert:" -#: ../data/geany.glade.h:480 +#: ../data/geany.glade.h:478 msgid "Changed:" msgstr "Geändert" -#: ../data/geany.glade.h:481 +#: ../data/geany.glade.h:479 msgid "Accessed:" msgstr "Zugegriffen:" -#: ../data/geany.glade.h:482 +#: ../data/geany.glade.h:480 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: ../data/geany.glade.h:483 +#: ../data/geany.glade.h:481 msgid "Permissions:" msgstr "Zugriffsrechte:" -#: ../data/geany.glade.h:484 +#: ../data/geany.glade.h:482 msgid "Read:" msgstr "Lesen:" -#: ../data/geany.glade.h:485 +#: ../data/geany.glade.h:483 msgid "Write:" msgstr "Schreiben:" -#: ../data/geany.glade.h:486 +#: ../data/geany.glade.h:484 msgid "Execute:" msgstr "Ausführen:" -#: ../data/geany.glade.h:487 +#: ../data/geany.glade.h:485 msgid "Owner:" msgstr "Eigentümer:" -#: ../data/geany.glade.h:488 +#: ../data/geany.glade.h:486 msgid "Group:" msgstr "Gruppe:" -#: ../data/geany.glade.h:489 +#: ../data/geany.glade.h:487 msgid "Other:" msgstr "Andere:" @@ -3822,12 +3814,12 @@ msgstr "Tastenkürzel" msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgenden Tastenkürzel sind frei definierbar:" -#: ../src/keyfile.c:1032 +#: ../src/keyfile.c:1027 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:1259 +#: ../src/keyfile.c:1254 msgid "Failed to load one or more session files." msgstr "" "Eine oder mehrere Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " @@ -4089,13 +4081,12 @@ msgid "Choose which plugins should be loaded at startup:" msgstr "Plugins, die beim Starten geladen werden sollen:" #: ../src/plugins.c:2060 -#, fuzzy, c-format msgid "" "Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " "plugin." msgstr "" -"Die Proxy-Plugin-Erweiterung »%s« beginnt mit einem Punkt. Bitte korrigiere " -"die Erweiterung." +"Für das Plugin »%s« beginnt die Erweiterung »%s« mit einem Punkt. " +"Bitte korrigiere dies." #: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -4126,33 +4117,33 @@ msgstr "Aktion" msgid "Shortcut" msgstr "Tastenkürzel" -#: ../src/prefs.c:1486 +#: ../src/prefs.c:1479 msgid "_Allow" msgstr "_Zulassen" -#: ../src/prefs.c:1488 +#: ../src/prefs.c:1481 msgid "_Override" msgstr "_Ersetzen" -#: ../src/prefs.c:1489 +#: ../src/prefs.c:1482 msgid "Override that keybinding?" msgstr "Diese Tastenkombination ersetzen?" -#: ../src/prefs.c:1490 +#: ../src/prefs.c:1483 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Die Tastenkombination '%s' wird bereits für »%s« verwendet." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1699 +#: ../src/prefs.c:1692 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an. Programme die nicht " "benötigt werden, können freigelassen werden." #. page Templates -#: ../src/prefs.c:1704 +#: ../src/prefs.c:1697 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -4163,7 +4154,7 @@ msgstr "" "Vorlagen zu erfahren." #. page Keybindings -#: ../src/prefs.c:1709 +#: ../src/prefs.c:1702 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 " @@ -4175,7 +4166,7 @@ msgstr "" "Sie die Tastenkombinationen auch direkt eingeben." #. page Editor->Indentation -#: ../src/prefs.c:1714 +#: ../src/prefs.c:1707 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -5506,24 +5497,24 @@ msgstr "CR" msgid "LF" msgstr "LF" -#: ../src/vte.c:487 +#: ../src/vte.c:577 #, c-format msgid "invalid VTE library \"%s\": missing symbol \"%s\"" msgstr "Ungültige VTE-Bibliothek \"%s\": Es fehlt das Symbol \"%s\"" -#: ../src/vte.c:636 +#: ../src/vte.c:758 msgid "_Set Path From Document" msgstr "Pfad des Dokumentes _übernehmen" -#: ../src/vte.c:641 +#: ../src/vte.c:763 msgid "_Restart Terminal" msgstr "Terminal _neustarten" -#: ../src/vte.c:664 +#: ../src/vte.c:796 msgid "_Input Methods" msgstr "Eingabe_methoden" -#: ../src/vte.c:754 +#: ../src/vte.c:888 msgid "" "Directory not changed because the terminal may contain some input (press Ctrl" "+C or Enter to clear it)." @@ -6050,6 +6041,12 @@ msgstr "Seite an Seite" msgid "Top and Bottom" msgstr "Oben und Unten" +#~ msgid "Background image:" +#~ msgstr "Hintergrundbild:" + +#~ msgid "Sets the path to the background image in the terminal widget" +#~ msgstr "Setzt den Pfad des Hintergrundbildes des Terminals." + #~ msgid "" #~ "Cannot execute command \"%s\" from the template: %s. Check the path in " #~ "the template." -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fdd976: Fix a little inside NEWS
by Frank Lanitz 13 Nov '16

13 Nov '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 13 Nov 2016 12:33:16 UTC Commit: fdd9768978b0ead00483e82d68cb0a5373d7f26e https://github.com/geany/geany/commit/fdd9768978b0ead00483e82d68cb0a5373d7f… Log Message: ----------- Fix a little inside NEWS Modified Paths: -------------- NEWS Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,7 @@ Geany 1.29 (unreleased) Bug fixes * Fix build when the CXX variable contains flags (PR#1155, Issue#829). - * Fix focusing the message window when the Terminal tab in active + * Fix focusing the message window when the Terminal tab is active (PR#1200, Issue#1198). Editor -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a74a6a: Another small update of Dutch translation
by Frank Lanitz 12 Nov '16

12 Nov '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 12 Nov 2016 16:19:40 UTC Commit: a74a6af2574d2b24b000f1e14fa9a0802db7d88a https://github.com/geany/geany/commit/a74a6af2574d2b24b000f1e14fa9a0802db7d… Log Message: ----------- Another small update of Dutch translation Modified Paths: -------------- po/nl.po Modified: po/nl.po 64 lines changed, 31 insertions(+), 33 deletions(-) =================================================================== @@ -2,17 +2,17 @@ # Copyright (C) 2016 the developers of Geany (msgids). # This file is distributed under the same license as the Geanty package. # -# Peter Scholtens <peter.scholtens(a)xs4all.nl>, 2009 - 2012, 2014, 2015. +# Peter Scholtens <peter.scholtens(a)xs4all.nl>, 2009 - 2012, 2014 - 2016. # Ayke van Laëthem <aykevanlaethem(a)gmail.com>, 2009, 2010. # Kurt De Bree <kdebree(a)telenet.be>, 2006. # Benno Schulenberg <benno(a)vertaalt.nl>, 2016. msgid "" msgstr "" -"Project-Id-Version: Geany 1.28\n" +"Project-Id-Version: Geany 1.29\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-29 20:21+0200\n" -"PO-Revision-Date: 2016-11-04 19:18+0100\n" -"Last-Translator: Peter Scholtens <peter.scholtens(a)xs4all.nl>\n" +"PO-Revision-Date: 2016-11-12 12:12+0100\n" +"Last-Translator: Benno Schulenberg <benno(a)vertaalt.nl>\n" "Language-Team: Dutch <geany-i18n(a)uvena.de>\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -2399,7 +2399,7 @@ msgid "" "Cannot execute build command \"%s\": %s. Check the Terminal setting in " "Preferences" msgstr "" -"Kan bouwcommando '%s' niet uitvoeren: %s. Controleer de terminalinstelling " +"Kan bouwcommando '%s' niet uitvoeren: %s; controleer de terminalinstelling " "in Voorkeuren." #: ../src/build.c:1016 @@ -3260,19 +3260,20 @@ msgstr "Bestand" #: ../src/keybindings.c:310 msgid "Clipboard" -msgstr "Klembord-plugin" +msgstr "Klembord" #: ../src/keybindings.c:311 msgid "Select" -msgstr "Selecteer" +msgstr "Selecteren" +# Het gaat hier om inspringingen en dergelijke. #: ../src/keybindings.c:312 msgid "Format" -msgstr "Indeling" +msgstr "Opmaak" #: ../src/keybindings.c:313 msgid "Insert" -msgstr "invoegen" +msgstr "Invoegen" #: ../src/keybindings.c:314 msgid "Settings" @@ -3357,7 +3358,7 @@ msgstr "Bestand herladen" #: ../src/keybindings.c:358 msgid "Re-open last closed tab" -msgstr "Her-open laatst gesloten tabblad" +msgstr "Laatst gesloten tabblad heropenen" #: ../src/keybindings.c:360 msgid "Quit" @@ -3369,7 +3370,7 @@ msgstr "Ongedaan maken" #: ../src/keybindings.c:379 msgid "Redo" -msgstr "Opnieuw" +msgstr "Herdoen" #: ../src/keybindings.c:388 msgid "Delete to line end" @@ -3381,27 +3382,27 @@ msgstr "Tot begin van de regel verwijderen" #: ../src/keybindings.c:394 msgid "_Transpose Current Line" -msgstr "_Verwissel huidige met bovenstaande regel" +msgstr "Huidige met bovenstaande regel _verwisselen" #: ../src/keybindings.c:396 msgid "Scroll to current line" -msgstr "Scroll naar huidige regel" +msgstr "Naar huidige regel scrollen" #: ../src/keybindings.c:398 msgid "Scroll up the view by one line" -msgstr "Scroll een regel naar boven" +msgstr "Een regel naar boven scrollen" #: ../src/keybindings.c:400 msgid "Scroll down the view by one line" -msgstr "Scroll een regel naar beneden" +msgstr "Een regel naar beneden scrollen" #: ../src/keybindings.c:402 msgid "Complete snippet" -msgstr "Fragment voltooiing" +msgstr "Fragment voltooien" #: ../src/keybindings.c:404 msgid "Move cursor in snippet" -msgstr "Verplaats cursor in fragment" +msgstr "Cursor verplaatsen in fragment" #: ../src/keybindings.c:406 msgid "Suppress snippet completion" @@ -4021,7 +4022,7 @@ msgid "" "i>\n" msgstr "" "\n" -"Andere plug-ins zijn hiervan afhankelijk. Schakel die eerst uit.\n" +"Andere plugins zijn hiervan afhankelijk. Schakel die eerst uit.\n" #. Four allocations is less than ideal but meh #: ../src/plugins.c:1652 @@ -4061,8 +4062,8 @@ msgid "" "Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " "plugin." msgstr "" -"Proxy plugin '%s' uitbreiding '%s' begint met een punt. Gelieve dit te " -"repareren." +"Uitbreiding '%2$s' van proxy-plugin '%1$s' begint met een punt. Gelieve dit " +"te repareren." #: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -5509,7 +5510,7 @@ msgstr "Uitvoerbaren" #: ../src/win32.c:802 #, c-format msgid "Failed to open URI \"%s\": %s" -msgstr "Kon URI '%s' niet openen: %s" +msgstr "Kan URI '%s' niet openen: %s" #: ../plugins/classbuilder.c:36 msgid "Class Builder" @@ -6033,10 +6034,10 @@ msgstr "Boven en Onder" #~ "padnaaminstelling in Voorkeuren." #~ msgid "Go to _Tag Definition" -#~ msgstr "Ga naar _tag definitie" +#~ msgstr "Ga naar _tag-definitie" #~ msgid "Go to T_ag Declaration" -#~ msgstr "Ga naar t_ag declaratie" +#~ msgstr "Ga naar t_ag-declaratie" #~ msgid "Printing of \"%s\" failed (return code: %s)." #~ msgstr "Afdrukken van \"%s\" mislukt (foutcode: %s)." @@ -6087,20 +6088,17 @@ msgstr "Boven en Onder" #~ msgid "Close _without saving" #~ msgstr "Sluit zonder op te slaan" -#~ msgid "%s %s" -#~ msgstr "%s %s" - #~ msgid "Description" #~ msgstr "Beschrijving:" #~ msgid "Plugin details:" -#~ msgstr "Plugin details:" +#~ msgstr "Plugin-details:" #~ msgid "Plugin:" #~ msgstr "Plugin" #~ msgid "Author(s):" -#~ msgstr "Auteurs(s):" +#~ msgstr "Auteur(s):" #~ msgid "Type:" #~ msgstr "Bestandstype:" @@ -6150,7 +6148,7 @@ msgstr "Boven en Onder" #~ "bestand in een nieuw tabblad" #~ msgid "The editor font is not a monospaced font!" -#~ msgstr "Het edit font is niet enkelgespatiëerd!" +#~ msgstr "Het edit font is niet enkelgespatieerd!" #~ msgid "Text will be wrongly spaced." #~ msgstr "Tekst zal verkeerd gespatieerd worden." @@ -6159,7 +6157,7 @@ msgstr "Boven en Onder" #~ msgstr "Ongeldige bestandsnaam" #~ msgid "_Debug Messages" -#~ msgstr "_Debug berichten" +#~ msgstr "_Debugberichten" #~ msgid "Project properties" #~ msgstr "Eigenschappen" @@ -6186,10 +6184,10 @@ msgstr "Boven en Onder" #~ msgstr "Ruim op" #~ msgid "_Set Build Menu Commands" -#~ msgstr "Bouw commando's instellen" +#~ msgstr "Bouwcommando's instellen" #~ msgid "SQL Dump file" -#~ msgstr "SQL Dump bestand" +#~ msgstr "SQL-dumpbestand" #~ msgid "M_iscellaneous Languages" #~ msgstr "Over_ige talen" @@ -6229,7 +6227,7 @@ msgstr "Boven en Onder" # #~ msgid "Hide object files" -#~ msgstr "Verberg object bestanden" +#~ msgstr "Verberg objectbestanden" #~ msgid "" #~ "Don't show generated object files in the file browser, this includes *.o, " -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2e97ec: Update of Greek translation
by Frank Lanitz 11 Nov '16

11 Nov '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 11 Nov 2016 08:22:20 UTC Commit: 2e97ec493ea79f6126e0650c826de726a10a9dad https://github.com/geany/geany/commit/2e97ec493ea79f6126e0650c826de726a10a9… Log Message: ----------- Update of Greek translation Modified Paths: -------------- NEWS po/el.po Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,7 @@ Geany 1.29 (unreleased) * Add `.exp` extension to TCL (Simon Marchi, PR#979). Internationalization - * Updated translations: ca, de, es, fr, id, it, kk, nl pt, pt_BR, + * Updated translations: ca, de, el, es, fr, id, it, kk, nl pt, pt_BR, sv, zh_CN, API Modified: po/el.po 539 lines changed, 269 insertions(+), 270 deletions(-) =================================================================== @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-29 20:21+0200\n" -"PO-Revision-Date: 2016-06-26 10:07+0200\n" +"POT-Creation-Date: 2016-11-11 09:21+0100\n" +"PO-Revision-Date: 2016-11-10 13:23+0200\n" "Last-Translator: Michael Misirlis <mmisirlis(a)gmail.com>\n" "Language-Team: Greek\n" "Language: el\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" -#: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 +#: ../geany.desktop.in.h:1 ../data/geany.glade.h:341 msgid "Geany" msgstr "Geany" @@ -282,7 +282,7 @@ msgid "" "new status message arrives" msgstr "" "Μετάβαση στην ετικέτα κατάστασης μηνυμάτων (κάτω μέρος στο παράθυρο του " -"σημειωματαρίου) όταν ένα νέο μήνυμα κατάστασης εμφανιστεί" +"σημειωματάριου) όταν ένα νέο μήνυμα κατάστασης εμφανιστεί" #: ../data/geany.glade.h:55 msgid "Suppress status messages in the status bar" @@ -308,7 +308,7 @@ msgid "" "fields and the VTE." msgstr "" "Δίνει την αυτόματη εστίαση στα widgets κάτω από τον κέρσορα του ποντικιού. " -"Λειτουργεί με τα widget τηςκύριας σύνταξης, τις σημειώσεις, την μπάρα " +"Λειτουργεί με τα widget της κύριας σύνταξης, τις σημειώσεις, την μπάρα " "εργαλείων, τη γραμμή πήγαινε και το VTE." #: ../data/geany.glade.h:59 @@ -355,11 +355,11 @@ msgid "" "Replace dialog and there is no selection" msgstr "" "Χρήση της λέξης κάτω από τον κέρσορα όταν ανοίγεται η Αναζήτηση, Αναζήτηση " -"σε Αρχεία ή Αντικατάσταση διαλόγων και οταν δεν υπάρχει επιλογή κειμένου" +"σε Αρχεία ή Αντικατάσταση διαλόγων και όταν δεν υπάρχει επιλογή κειμένου" #: ../data/geany.glade.h:68 msgid "Use the current file's directory for Find in Files" -msgstr "Χρήση του φακέλου του τρέχοντος αρχείου για Αναζήτης σε Αρχεία" +msgstr "Χρήση του φακέλου του τρέχοντος αρχείου για Αναζήτησης σε Αρχεία" #: ../data/geany.glade.h:69 msgid "Search" @@ -405,7 +405,7 @@ msgstr "Διάφορα" #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../data/geany.glade.h:76 ../src/prefs.c:1604 +#: ../data/geany.glade.h:76 ../src/prefs.c:1597 msgid "General" msgstr "Γενικά" @@ -495,7 +495,7 @@ msgstr "" "Κατά πόσο θα εμφανίζεται η γραμμή κατάστασης στο κάτω μέρος του κεντρικού " "παραθύρου" -#: ../data/geany.glade.h:98 ../src/prefs.c:1606 +#: ../data/geany.glade.h:98 ../src/prefs.c:1599 msgid "Interface" msgstr "Περιβάλλον εργασίας" @@ -581,7 +581,7 @@ msgstr "_Προσθήκη μπάρας εργαλείων στο μενού" msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Ενσωμάτωση της μπάρας εργαλείων στο κεντρικό μενού για εξοικονόμηση κάθετου " -"χόρου" +"χώρου" #: ../data/geany.glade.h:117 ../src/toolbar.c:944 msgid "Customize Toolbar" @@ -605,7 +605,7 @@ msgstr "Μόνο _κείμενο" #: ../data/geany.glade.h:122 msgid "Icon style" -msgstr "Στυλ εικονιδείων" +msgstr "Στυλ εικονιδίων" #: ../data/geany.glade.h:123 msgid "S_ystem default" @@ -631,7 +631,7 @@ msgstr "Μέγεθος εικονιδίων:" msgid "Toolbar" msgstr "Μπάρα εργαλείων" -#: ../data/geany.glade.h:129 ../src/prefs.c:1608 +#: ../data/geany.glade.h:129 ../src/prefs.c:1601 msgid "Toolbar" msgstr "Μπάρα εργαλείων" @@ -687,7 +687,7 @@ msgstr "Αναδίπλωση κώδικα" #: ../data/geany.glade.h:137 msgid "Fold/unfold all children of a fold point" -msgstr "Δίπλωση/Αναδίπλωση ώλων των παράγωγων ενός σημείου δίπλωσης" +msgstr "Δίπλωση/Αναδίπλωση όλων των παράγωγων ενός σημείου δίπλωσης" #: ../data/geany.glade.h:138 msgid "" @@ -700,15 +700,15 @@ msgstr "" #: ../data/geany.glade.h:139 msgid "Use indicators to show compile errors" -msgstr "Χρήση δεικτών για την εμφάνιση σφαλμάτων του μεταγλωτιστή" +msgstr "Χρήση δεικτών για την εμφάνιση σφαλμάτων του μεταγλωττιστή" #: ../data/geany.glade.h:140 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" msgstr "" "Εάν θα χρησιμοποιούνται δείκτες (μια καμπυλωτή υπογράμμιση) για να εστιάζουν " -"στις γραμμές που ο μεταγλωτιστής βρήκε μια προειδοποίηση ή ένα σφάλμα" +"στις γραμμές που ο μεταγλωττιστής βρήκε μια προειδοποίηση ή ένα σφάλμα" #: ../data/geany.glade.h:141 msgid "Newline strips trailing spaces" @@ -841,7 +841,7 @@ msgstr "Εσοχή" #: ../data/geany.glade.h:167 msgid "Snippet completion" -msgstr "Συμπλήρωση αποκομάτων" +msgstr "Συμπλήρωση αποκομμάτων" #: ../data/geany.glade.h:168 msgid "" @@ -990,7 +990,7 @@ msgstr "Συμπληρώσεις" #: ../data/geany.glade.h:198 msgid "Invert syntax highlighting colors" -msgstr "Αντιστροφή των χρωμάτων υπογράμμισηςτου συντάκτη" +msgstr "Αντιστροφή των χρωμάτων υπογράμμισης σύνταξης" #: ../data/geany.glade.h:199 msgid "Invert all colors, by default using white text on a black background" @@ -1056,7 +1056,7 @@ msgstr "" #: ../data/geany.glade.h:212 msgid "Lines visible _around the cursor:" -msgstr "" +msgstr "Ορ_ατές γραμμές γύρω από τον κέρσορα:" #: ../data/geany.glade.h:213 msgid "Display" @@ -1159,7 +1159,7 @@ msgstr "Virtual spaces" msgid "Display" msgstr "Εμφάνιση" -#: ../data/geany.glade.h:233 ../src/keybindings.c:309 ../src/prefs.c:1610 +#: ../data/geany.glade.h:233 ../src/keybindings.c:309 ../src/prefs.c:1603 msgid "Editor" msgstr "Επεξεργαστής" @@ -1220,22 +1220,22 @@ msgstr "Κωδικοποιήσεις:" #: ../data/geany.glade.h:245 msgid "Ensure new line at file end" -msgstr "Σιγούρευση για new line στο τέλος του αρχείου" +msgstr "Εξασφάλιση new line στο τέλος του αρχείου" #: ../data/geany.glade.h:246 msgid "Ensures that at the end of the file is a new line" -msgstr "Σιγουρεύει ότι υπάρχει στο τέλος του αρχείου το new line" +msgstr "Εγγυάται ότι υπάρχει στο τέλος του αρχείου το new line" #: ../data/geany.glade.h:247 msgid "Ensure consistent line endings" -msgstr "Σιγούρευση για new line στο τέλος του αρχείου" +msgstr "Εξασφάλιση για new line στο τέλος του αρχείου" #: ../data/geany.glade.h:248 msgid "" "Ensures that newline characters always get converted before saving, avoiding " "mixed line endings in the same file" msgstr "" -"Σιγουρεύει ότι οι χαρακτήρες νέας γραμμής (newline) πάντοτε θα μετατρέπονται " +"Εγγυάται ότι οι χαρακτήρες νέας γραμμής (newline) πάντοτε θα μετατρέπονται " "πριν το σώσιμο, αποφεύγοντας διενέξεις με το τέλος γραμμής στο ίδιο αρχείο" #: ../data/geany.glade.h:249 @@ -1279,7 +1279,7 @@ msgstr "" "Πόσο συχνά θα γίνεται έλεγχος για αλλαγές του εγγράφου στον δίσκο, σε " "δευτερόλεπτα. Το μηδέν απενεργοποιεί τον έλεγχο." -#: ../data/geany.glade.h:258 ../src/prefs.c:1612 ../src/symbols.c:466 +#: ../data/geany.glade.h:258 ../src/prefs.c:1605 ../src/symbols.c:466 #: ../plugins/filebrowser.c:1159 msgid "Files" msgstr "Αρχεία" @@ -1334,7 +1334,7 @@ msgstr "" msgid "Commands" msgstr "Εντολές" -#: ../data/geany.glade.h:270 ../src/keybindings.c:321 ../src/prefs.c:1614 +#: ../data/geany.glade.h:270 ../src/keybindings.c:321 ../src/prefs.c:1607 msgid "Tools" msgstr "Εργαλεία" @@ -1421,7 +1421,7 @@ msgstr "" msgid "Template data" msgstr "Δεδομένα πρότυπου" -#: ../data/geany.glade.h:288 ../src/prefs.c:1616 +#: ../data/geany.glade.h:288 ../src/prefs.c:1609 msgid "Templates" msgstr "Πρότυπα" @@ -1431,12 +1431,12 @@ msgstr "Α_λλαγή" #: ../data/geany.glade.h:290 msgid "Keyboard shortcuts" -msgstr "Συντομεύσεις πλήκτων" +msgstr "Συντομεύσεις πλήκτρων" #: ../data/geany.glade.h:291 ../src/plugins.c:1941 ../src/plugins.c:1978 -#: ../src/prefs.c:1618 +#: ../src/prefs.c:1611 msgid "Keybindings" -msgstr "Συνδυασμοί πλήκτων" +msgstr "Συνδυασμοί πλήκτρων" #: ../data/geany.glade.h:292 msgid "Command:" @@ -1517,7 +1517,7 @@ msgstr "Χρήση εγγενής εκτύπωσης GTK" msgid "Printing" msgstr "Εκτύπωση" -#: ../data/geany.glade.h:308 ../src/prefs.c:1620 +#: ../data/geany.glade.h:308 ../src/prefs.c:1613 msgid "Printing" msgstr "Γίνεται η Εκτύπωση" @@ -1542,86 +1542,77 @@ msgid "Background color:" msgstr "Χρώμα υπόβαθρου:" #: ../data/geany.glade.h:314 -msgid "Background image:" -msgstr "Εικόνα Φόντου:" - -#: ../data/geany.glade.h:315 msgid "Scrollback lines:" msgstr "Ιστορικό γραμμών:" -#: ../data/geany.glade.h:316 +#: ../data/geany.glade.h:315 msgid "Shell:" msgstr "Κέλυφος:" -#: ../data/geany.glade.h:317 +#: ../data/geany.glade.h:316 msgid "Sets the foreground color of the text in the terminal widget" msgstr "Καθορίζει το χρώμα πρώτου πλάνου για το κείμενο του τερματικού" -#: ../data/geany.glade.h:318 +#: ../data/geany.glade.h:317 msgid "Sets the background color of the text in the terminal widget" msgstr "Καθορίζει το χρώμα του φόντου για το κείμενο του πρόσθετου τερματικού" -#: ../data/geany.glade.h:319 -msgid "Sets the path to the background image in the terminal widget" -msgstr "" -"Καθορίζει τη διαδρομή της εικόνας φόντου για το πρόσθετο του τερματικού" - -#: ../data/geany.glade.h:320 +#: ../data/geany.glade.h:318 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "" "Καθορίζει το ιστορικό των γραμμών, που μπορείτε να γυρίζετε πίσω στο " "πρόσθετο τερματικού" -#: ../data/geany.glade.h:321 +#: ../data/geany.glade.h:319 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "" "Καθορίζει τη διαδρομή στο κέλυφος από την οποία θα ξεκινά μέσα στην " "εξομοίωση του τερματικού" -#: ../data/geany.glade.h:322 +#: ../data/geany.glade.h:320 msgid "Scroll on keystroke" msgstr "Σκρολάρισμα σε πάτημα πλήκτρου" -#: ../data/geany.glade.h:323 +#: ../data/geany.glade.h:321 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "Εάν θα σκρολάρει προς τα κάτω όταν ένα πλήκτρο έχει πατηθεί" -#: ../data/geany.glade.h:324 +#: ../data/geany.glade.h:322 msgid "Scroll on output" msgstr "Σκρολάρισμα στην πηγή εξόδου" -#: ../data/geany.glade.h:325 +#: ../data/geany.glade.h:323 msgid "Whether to scroll to the bottom when output is generated" msgstr "Εάν θα σκρολάρει προς τα κάτω όταν παράγεται output" -#: ../data/geany.glade.h:326 +#: ../data/geany.glade.h:324 msgid "Cursor blinks" msgstr "Ο κέρσορας αναβοσβήνει" -#: ../data/geany.glade.h:327 +#: ../data/geany.glade.h:325 msgid "Whether to blink the cursor" msgstr "Εάν θα αναβοσβήνει ο κέρσορας" -#: ../data/geany.glade.h:328 +#: ../data/geany.glade.h:326 msgid "Override Geany keybindings" msgstr "Παράκαμψη των συντομεύσεων πληκτρολογίου του Geany" -#: ../data/geany.glade.h:329 +#: ../data/geany.glade.h:327 msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" "Επιτρέπει το VTE να λαμβάνει συντομεύσεις πλήκτρων (εκτός από τις εντολές " "εστίασης)" -#: ../data/geany.glade.h:330 +#: ../data/geany.glade.h:328 msgid "Disable menu shortcut key (F10 by default)" msgstr "Απενεργοποίηση συντόμευσης του πλήκτρου μενού (προκαθορισμένο το F10)" -#: ../data/geany.glade.h:331 +#: ../data/geany.glade.h:329 msgid "" "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 " @@ -1631,21 +1622,21 @@ msgstr "" "μπάρας του μενού (προκαθορισμένο το F10). Απενεργοποιώντας το μπορεί να " "είναι χρήσιμο, για παράδειγμα, στο Midnight Commander μέσα από το VTE." -#: ../data/geany.glade.h:332 +#: ../data/geany.glade.h:330 msgid "Follow path of the current file" msgstr "Ακολούθησε τη διαδρομή του τρέχοντος αρχείου" -#: ../data/geany.glade.h:333 +#: ../data/geany.glade.h:331 msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Εάν θα εκτελείται το \"cd $path\" όταν θα γίνεται εναλλαγή μεταξύ ανοιγμένων " "αρχείων" -#: ../data/geany.glade.h:334 +#: ../data/geany.glade.h:332 msgid "Execute programs in the VTE" msgstr "Εκτέλεση προγραμμάτων στο VTE" -#: ../data/geany.glade.h:335 +#: ../data/geany.glade.h:333 msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -1654,11 +1645,11 @@ msgstr "" "τερματικού. Παρακαλώ σημειώστε, προγράμματα που εκτελούνται στο VTE δεν " "είναι δυνατόν να σταματήσουν" -#: ../data/geany.glade.h:336 +#: ../data/geany.glade.h:334 msgid "Don't use run script" msgstr "Μη χρήση της εκτέλεσης script" -#: ../data/geany.glade.h:337 +#: ../data/geany.glade.h:335 msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -1667,540 +1658,540 @@ msgstr "" "χρησιμοποιείται για να εμφανίζει τη κατάσταση εξόδου του εκτελέσιμου " "προγράμματος" -#: ../data/geany.glade.h:338 +#: ../data/geany.glade.h:336 msgid "Terminal" msgstr "Τερματικό" -#: ../data/geany.glade.h:339 ../src/prefs.c:1624 ../src/vte.c:320 +#: ../data/geany.glade.h:337 ../src/prefs.c:1617 ../src/vte.c:384 msgid "Terminal" msgstr "Τερματικό" -#: ../data/geany.glade.h:340 +#: ../data/geany.glade.h:338 msgid "Warning: read the manual before changing these preferences." msgstr "" "Προειδοποίηση: διαβάστε το εγχειρίδιο πριν αλλάξετε αυτές τις επιλογές.</" "i>" -#: ../data/geany.glade.h:341 +#: ../data/geany.glade.h:339 msgid "Various preferences" msgstr "Διάφορες ιδιότητες" -#: ../data/geany.glade.h:342 ../src/prefs.c:1622 +#: ../data/geany.glade.h:340 ../src/prefs.c:1615 msgid "Various" msgstr "Διάφορα" -#: ../data/geany.glade.h:344 +#: ../data/geany.glade.h:342 msgid "_File" msgstr "_Αρχείο" -#: ../data/geany.glade.h:345 +#: ../data/geany.glade.h:343 msgid "New (with _Template)" msgstr "Νέο (με _Πρότυπο)" -#: ../data/geany.glade.h:346 +#: ../data/geany.glade.h:344 msgid "_Open..." msgstr "_Άνοιγμα..." -#: ../data/geany.glade.h:347 +#: ../data/geany.glade.h:345 msgid "Recent _Files" msgstr "_Πρόσφατα Αρχεία" -#: ../data/geany.glade.h:348 +#: ../data/geany.glade.h:346 msgid "Save _As..." msgstr "Αποθήκευση _Ως..." -#: ../data/geany.glade.h:349 +#: ../data/geany.glade.h:347 msgid "Sa_ve All" msgstr "Αποθήκευση Ό_λων" -#: ../data/geany.glade.h:350 ../src/document.c:1651 ../src/document.c:3620 +#: ../data/geany.glade.h:348 ../src/document.c:1651 ../src/document.c:3620 #: ../src/sidebar.c:718 msgid "_Reload" msgstr "_Επαναφόρτωση" -#: ../data/geany.glade.h:351 +#: ../data/geany.glade.h:349 msgid "R_eload As" msgstr "_Επαναφόρτωση Ως" -#: ../data/geany.glade.h:352 +#: ../data/geany.glade.h:350 msgid "Page Set_up" msgstr "Ρύθμιση _Σελίδας" -#: ../data/geany.glade.h:353 +#: ../data/geany.glade.h:351 msgid "_Print..." msgstr "_Εκτύπωση..." -#: ../data/geany.glade.h:354 ../src/notebook.c:470 +#: ../data/geany.glade.h:352 ../src/notebook.c:470 msgid "Close Ot_her Documents" msgstr "Κλείσιμο Ά_λλων Εγγράφων" -#: ../data/geany.glade.h:355 ../src/notebook.c:476 +#: ../data/geany.glade.h:353 ../src/notebook.c:476 msgid "C_lose All" msgstr "_Κλείσιμο Όλων" -#: ../data/geany.glade.h:356 +#: ../data/geany.glade.h:354 msgid "Co_mmands" msgstr "Εν_τολές" -#: ../data/geany.glade.h:357 ../src/keybindings.c:434 +#: ../data/geany.glade.h:355 ../src/keybindings.c:434 msgid "Cu_t Current Line(s)" -msgstr "Απο_κοπή τρέχον γραμμής(ών)" +msgstr "Απο_κοπή τρέχουσας γραμμής(ών)" -#: ../data/geany.glade.h:358 ../src/keybindings.c:431 +#: ../data/geany.glade.h:356 ../src/keybindings.c:431 msgid "_Copy Current Line(s)" -msgstr "Α_ντιγραφή τρέχον γραμμής(ών)" +msgstr "Α_ντιγραφή τρέχουσας γραμμής(ών)" -#: ../data/geany.glade.h:359 ../src/keybindings.c:384 +#: ../data/geany.glade.h:357 ../src/keybindings.c:384 msgid "_Delete Current Line(s)" msgstr "Διαγραφή τρέχον γ_ραμμής(ών)" -#: ../data/geany.glade.h:360 ../src/keybindings.c:381 +#: ../data/geany.glade.h:358 ../src/keybindings.c:381 msgid "D_uplicate Line or Selection" msgstr "Αντίγρα_φο της Γραμμής ή της Επιλογής" -#: ../data/geany.glade.h:361 ../src/keybindings.c:444 +#: ../data/geany.glade.h:359 ../src/keybindings.c:444 msgid "S_elect Current Line(s)" -msgstr "Επιλο_γή τρέχον γραμμής(ών)" +msgstr "Επιλο_γή τρέχουσας γραμμής(ών)" -#: ../data/geany.glade.h:362 ../src/keybindings.c:447 +#: ../data/geany.glade.h:360 ../src/keybindings.c:447 msgid "Se_lect Current Paragraph" msgstr "Επιλογή Τρέχο_υσας Παραγράφου" -#: ../data/geany.glade.h:363 +#: ../data/geany.glade.h:361 msgid "_Move Line(s) Up" msgstr "_Μετακίνηση γραμμής(ών) Πάνω" -#: ../data/geany.glade.h:364 +#: ../data/geany.glade.h:362 msgid "M_ove Line(s) Down" msgstr "Μ_ετακίνηση γραμμής(ών) Κάτω" -#: ../data/geany.glade.h:365 ../src/keybindings.c:498 +#: ../data/geany.glade.h:363 ../src/keybindings.c:498 msgid "_Send Selection to Terminal" msgstr "Απ_οστολή Επιλογής στο Τερματικό" -#: ../data/geany.glade.h:366 ../src/keybindings.c:500 +#: ../data/geany.glade.h:364 ../src/keybindings.c:500 msgid "_Reflow Lines/Block" msgstr "_Αναδιάταξη Γραμμών/Μπλοκ" -#: ../data/geany.glade.h:367 ../src/keybindings.c:458 +#: ../data/geany.glade.h:365 ../src/keybindings.c:458 msgid "T_oggle Case of Selection" msgstr "Ενα_λλαγή Πεζών/Κεφαλαίων των Επιλεγμένων" -#: ../data/geany.glade.h:368 +#: ../data/geany.glade.h:366 msgid "_Comment Line(s)" msgstr "_Σχολιασμός της/των Γραμμής(ών)" -#: ../data/geany.glade.h:369 +#: ../data/geany.glade.h:367 msgid "U_ncomment Line(s)" msgstr "Α_ποσχολιασμός της/των Γραμμής(ών)" -#: ../data/geany.glade.h:370 +#: ../data/geany.glade.h:368 msgid "_Toggle Line Commentation" msgstr "Ενεργοποίηση/απενεργοποίηση Γραμμής _Σχολιασμού" -#: ../data/geany.glade.h:371 +#: ../data/geany.glade.h:369 msgid "_Increase Indent" msgstr "Αύξηση Εσο_χής" -#: ../data/geany.glade.h:372 +#: ../data/geany.glade.h:370 msgid "_Decrease Indent" msgstr "_Μείωση Εσοχής" -#: ../data/geany.glade.h:373 ../src/keybindings.c:477 +#: ../data/geany.glade.h:371 ../src/keybindings.c:477 msgid "S_mart Line Indent" msgstr "Έ_ξυπνη εσοχή γραμμής" -#: ../data/geany.glade.h:374 +#: ../data/geany.glade.h:372 msgid "_Send Selection to" msgstr "Απ_οστολή Επιλογής προς" -#: ../data/geany.glade.h:375 +#: ../data/geany.glade.h:373 msgid "I_nsert Comments" msgstr "Εισαγωγή Σχολί_ων" -#: ../data/geany.glade.h:376 +#: ../data/geany.glade.h:374 msgid "Preference_s" msgstr "Ιδιότητ_ες" -#: ../data/geany.glade.h:377 ../src/keybindings.c:524 +#: ../data/geany.glade.h:375 ../src/keybindings.c:524 msgid "P_lugin Preferences" msgstr "Ιδιότητες _Πρόσθετων" -#: ../data/geany.glade.h:378 +#: ../data/geany.glade.h:376 msgid "_Find..." msgstr "Ανα_ζήτηση..." -#: ../data/geany.glade.h:379 +#: ../data/geany.glade.h:377 msgid "Find _Next" msgstr "Αναζήτηση _Επόμενου" -#: ../data/geany.glade.h:380 +#: ../data/geany.glade.h:378 msgid "Find _Previous" msgstr "Αναζήτηση _Προηγούμενου" -#: ../data/geany.glade.h:381 ../src/symbols.c:2560 +#: ../data/geany.glade.h:379 ../src/symbols.c:2560 msgid "Find in F_iles..." msgstr "Αναζήτηση στα Α_ρχεία..." -#: ../data/geany.glade.h:382 +#: ../data/geany.glade.h:380 msgid "_Replace..." msgstr "Αν_τικατάσταση..." -#: ../data/geany.glade.h:383 +#: ../data/geany.glade.h:381 msgid "Next Me_ssage" msgstr "Επόμενο _Μήνυμα" -#: ../data/geany.glade.h:384 +#: ../data/geany.glade.h:382 msgid "Pr_evious Message" msgstr "Πρ_οηγούμενο Μήνυμα" -#: ../data/geany.glade.h:385 ../src/keybindings.c:573 +#: ../data/geany.glade.h:383 ../src/keybindings.c:573 msgid "Go to Ne_xt Marker" msgstr "Πήγαινε στον Επό_μενο Δείκτη" -#: ../data/geany.glade.h:386 ../src/keybindings.c:576 +#: ../data/geany.glade.h:384 ../src/keybindings.c:576 msgid "Go to Pre_vious Marker" msgstr "Πήγαινε στον Π_ροηγούμενο Δείκτη" -#: ../data/geany.glade.h:387 +#: ../data/geany.glade.h:385 msgid "_Go to Line..." msgstr "Πήγαιν_ε στη Γραμμή..." -#: ../data/geany.glade.h:388 ../src/keybindings.c:536 +#: ../data/geany.glade.h:386 ../src/keybindings.c:536 msgid "Find Next _Selection" msgstr "Αναζήτηση Επ_όμενου Επιλεγμένου" -#: ../data/geany.glade.h:389 ../src/keybindings.c:538 +#: ../data/geany.glade.h:387 ../src/keybindings.c:538 msgid "Find Pre_vious Selection" msgstr "Αναζήτηση Π_ροηγούμενου Επιλεγμένου" -#: ../data/geany.glade.h:390 ../src/keybindings.c:555 +#: ../data/geany.glade.h:388 ../src/keybindings.c:555 msgid "_Mark All" msgstr "Μαρκάρισμα _Όλων" -#: ../data/geany.glade.h:391 +#: ../data/geany.glade.h:389 msgid "Go to Symbol Decl_aration" msgstr "Πήγ_αινε στη Δήλωση Συμβόλου" -#: ../data/geany.glade.h:392 +#: ../data/geany.glade.h:390 msgid "_View" msgstr "_Προβολή" -#: ../data/geany.glade.h:393 +#: ../data/geany.glade.h:391 msgid "Change _Font..." msgstr "Αλλαγή Γραμμα_τοσειράς..." -#: ../data/geany.glade.h:394 +#: ../data/geany.glade.h:392 msgid "Change _Color Scheme..." msgstr "Επιλογέας _Χρωμάτων..." -#: ../data/geany.glade.h:395 +#: ../data/geany.glade.h:393 msgid "Show _Markers Margin" msgstr "Εμφάνιση _Δεικτών Περιθωρίου" -#: ../data/geany.glade.h:396 +#: ../data/geany.glade.h:394 msgid "Show _Line Numbers" msgstr "Εμφάνιση Μ_ετρητή Γραμμών" -#: ../data/geany.glade.h:397 +#: ../data/geany.glade.h:395 msgid "Show White S_pace" msgstr "Εμφάνιση των Κ_ενών" -#: ../data/geany.glade.h:398 +#: ../data/geany.glade.h:396 msgid "Show Line _Endings" msgstr "Εμφάνιση Τέλους _Γραμμής" -#: ../data/geany.glade.h:399 +#: ../data/geany.glade.h:397 msgid "Show Indentation _Guides" msgstr "Εμφάνιση Οδηγών _Εσοχής" -#: ../data/geany.glade.h:400 +#: ../data/geany.glade.h:398 msgid "Full_screen" msgstr "Πλήρης _Οθόνη" -#: ../data/geany.glade.h:401 +#: ../data/geany.glade.h:399 msgid "Toggle All _Additional Widgets" msgstr "Ενεργοποίηση/Απενεργοποίηση _Όλων των Επιπρόσθετων Widgets" -#: ../data/geany.glade.h:402 +#: ../data/geany.glade.h:400 msgid "Show Message _Window" msgstr "Προβολή Παράθυρου _Μηνυμάτων" -#: ../data/geany.glade.h:403 +#: ../data/geany.glade.h:401 msgid "Show _Toolbar" msgstr "Εμφάνιση _Μπάρας Εργαλείων" -#: ../data/geany.glade.h:404 +#: ../data/geany.glade.h:402 msgid "Show Side_bar" msgstr "Εμφάνιση Πλε_υρικής Μπάρας" -#: ../data/geany.glade.h:405 +#: ../data/geany.glade.h:403 msgid "_Document" msgstr "Έγγ_ραφο" -#: ../data/geany.glade.h:406 +#: ../data/geany.glade.h:404 msgid "_Line Wrapping" msgstr "Αναδίπλ_ωση Γραμμής" -#: ../data/geany.glade.h:407 +#: ../data/geany.glade.h:405 msgid "Line _Breaking" msgstr "Αποκοπή _Γραμμής" -#: ../data/geany.glade.h:408 +#: ../data/geany.glade.h:406 msgid "_Auto-indentation" msgstr "_Αυτόματη Εσοχή" -#: ../data/geany.glade.h:409 +#: ../data/geany.glade.h:407 msgid "In_dent Type" msgstr "Τύ_πος Εσοχής" -#: ../data/geany.glade.h:410 +#: ../data/geany.glade.h:408 msgid "_Detect from Content" msgstr "Ανί_χνευση από το Περιεχόμενο" -#: ../data/geany.glade.h:411 +#: ../data/geany.glade.h:409 msgid "T_abs and Spaces" msgstr "T_ab και Κενά" -#: ../data/geany.glade.h:412 +#: ../data/geany.glade.h:410 msgid "Indent Widt_h" msgstr "Εύρος _Εσοχής" -#: ../data/geany.glade.h:413 +#: ../data/geany.glade.h:411 msgid "_1" msgstr "_1" -#: ../data/geany.glade.h:414 +#: ../data/geany.glade.h:412 msgid "_2" msgstr "_2" -#: ../data/geany.glade.h:415 +#: ../data/geany.glade.h:413 msgid "_3" msgstr "_3" -#: ../data/geany.glade.h:416 +#: ../data/geany.glade.h:414 msgid "_4" msgstr "_4" -#: ../data/geany.glade.h:417 +#: ../data/geany.glade.h:415 msgid "_5" msgstr "_5" -#: ../data/geany.glade.h:418 +#: ../data/geany.glade.h:416 msgid "_6" msgstr "_6" -#: ../data/geany.glade.h:419 +#: ../data/geany.glade.h:417 msgid "_7" msgstr "_7" -#: ../data/geany.glade.h:420 +#: ../data/geany.glade.h:418 msgid "_8" msgstr "_8" -#: ../data/geany.glade.h:421 +#: ../data/geany.glade.h:419 msgid "Read _Only" msgstr "Μόνο για Ανάγ_νωση" -#: ../data/geany.glade.h:422 +#: ../data/geany.glade.h:420 msgid "_Write Unicode BOM" msgstr "Εγγραφή _Unicode BOM" -#: ../data/geany.glade.h:423 +#: ../data/geany.glade.h:421 msgid "Set File_type" msgstr "Καθορισμός _Τύπου Αρχείου" -#: ../data/geany.glade.h:424 +#: ../data/geany.glade.h:422 msgid "Set _Encoding" msgstr "Καθορισμός Κ_ωδικοποίησης" -#: ../data/geany.glade.h:425 +#: ../data/geany.glade.h:423 msgid "Set Line E_ndings" -msgstr "Καθορισμός Κατα_λίξεων Γραμμών" +msgstr "Καθορισμός Κατα_λήξεων Γραμμών" -#: ../data/geany.glade.h:426 +#: ../data/geany.glade.h:424 msgid "Convert and Set to _CR/LF (Windows)" msgstr "Μετατροπή και Καθορισμός σε _CR/LF (Windows)" -#: ../data/geany.glade.h:427 +#: ../data/geany.glade.h:425 msgid "Convert and Set to _LF (Unix)" msgstr "Μετατροπή και Καθορισμός σε _LF (Unix)" -#: ../data/geany.glade.h:428 +#: ../data/geany.glade.h:426 msgid "Convert and Set to CR (Classic _Mac)" msgstr "Μετατροπή και Καθορισμός σε CR (Τυπικό _Mac)" -#: ../data/geany.glade.h:429 ../src/keybindings.c:664 +#: ../data/geany.glade.h:427 ../src/keybindings.c:664 msgid "_Clone" msgstr "_Κλωνοποίηση" -#: ../data/geany.glade.h:430 +#: ../data/geany.glade.h:428 msgid "_Strip Trailing Spaces" msgstr "_Διαγραφή Λωρίδων Κενών" -#: ../data/geany.glade.h:431 +#: ../data/geany.glade.h:429 msgid "Replace Tabs with S_paces" msgstr "_Αντικατάσταση των Tab σε Κενά" -#: ../data/geany.glade.h:432 +#: ../data/geany.glade.h:430 msgid "_Replace Spaces with Tabs..." msgstr "_Αντικατάσταση των Κενών με Tab..." -#: ../data/geany.glade.h:433 +#: ../data/geany.glade.h:431 msgid "_Fold All" msgstr "Δίπλ_ωση Όλων" -#: ../data/geany.glade.h:434 +#: ../data/geany.glade.h:432 msgid "_Unfold All" msgstr "Αναδ_ίπλωση Όλων" -#: ../data/geany.glade.h:435 +#: ../data/geany.glade.h:433 msgid "Remove _Markers" msgstr "Απομάκρυνση _Δεικτών" -#: ../data/geany.glade.h:436 +#: ../data/geany.glade.h:434 msgid "Remove Error _Indicators" msgstr "Απομάκρυνση _Δεικτών Σφάλματος" -#: ../data/geany.glade.h:437 +#: ../data/geany.glade.h:435 msgid "_Project" msgstr "Έρ_γο" -#: ../data/geany.glade.h:438 +#: ../data/geany.glade.h:436 msgid "_New..." msgstr "_Νέο..." -#: ../data/geany.glade.h:439 +#: ../data/geany.glade.h:437 msgid "_Recent Projects" msgstr "_Πρόσφατα Έργα" -#: ../data/geany.glade.h:440 +#: ../data/geany.glade.h:438 msgid "_Close" msgstr "_Κλείσιμο" -#: ../data/geany.glade.h:441 +#: ../data/geany.glade.h:439 msgid "Apply the default indentation settings to all documents" msgstr "Εφαρμογή των προκαθορισμένων ρυθμίσεων εσοχής σε όλα τα έγγραφα" -#: ../data/geany.glade.h:442 +#: ../data/geany.glade.h:440 msgid "_Apply Default Indentation" msgstr "_Εφαρμογή Αυτόματης Εσοχής" #. build the code -#: ../data/geany.glade.h:443 ../src/build.c:2392 ../src/build.c:2669 +#: ../data/geany.glade.h:441 ../src/build.c:2392 ../src/build.c:2669 msgid "_Build" msgstr "_Κατασκευή (Build)" -#: ../data/geany.glade.h:444 +#: ../data/geany.glade.h:442 msgid "_Tools" msgstr "_Εργαλεία" -#: ../data/geany.glade.h:445 +#: ../data/geany.glade.h:443 msgid "_Reload Configuration" msgstr "_Επαναφόρτωση Ρυθμίσεων" -#: ../data/geany.glade.h:446 +#: ../data/geany.glade.h:444 msgid "C_onfiguration Files" msgstr "Αρχεία _Ρυθμίσεων" -#: ../data/geany.glade.h:447 +#: ../data/geany.glade.h:445 msgid "_Color Chooser" msgstr "Επιλογέας _Χρωμάτων" -#: ../data/geany.glade.h:448 +#: ../data/geany.glade.h:446 msgid "_Word Count" msgstr "_Μετρητής Λέξεων" -#: ../data/geany.glade.h:449 +#: ../data/geany.glade.h:447 msgid "Load Ta_gs File..." msgstr "Φόρτωση Αρχείου Ε_τικετών..." -#: ../data/geany.glade.h:450 +#: ../data/geany.glade.h:448 msgid "_Help" msgstr "_Βοήθεια" -#: ../data/geany.glade.h:451 +#: ../data/geany.glade.h:449 msgid "Keyboard _Shortcuts" msgstr "_Συντομεύσεις Πληκτρολογίου" -#: ../data/geany.glade.h:452 +#: ../data/geany.glade.h:450 msgid "Debug _Messages" msgstr "Μηνύματα _Αποσφαλμάτωσης (Debug)" -#: ../data/geany.glade.h:453 +#: ../data/geany.glade.h:451 msgid "_Website" msgstr "_Ιστοσελίδα" -#: ../data/geany.glade.h:454 +#: ../data/geany.glade.h:452 msgid "Wi_ki" msgstr "Wi_ki" -#: ../data/geany.glade.h:455 +#: ../data/geany.glade.h:453 msgid "Report a _Bug..." msgstr "Αναφορά _Σφάλματος..." -#: ../data/geany.glade.h:456 +#: ../data/geany.glade.h:454 msgid "_Donate..." msgstr "_Δωρεά..." -#: ../data/geany.glade.h:457 ../src/sidebar.c:126 +#: ../data/geany.glade.h:455 ../src/sidebar.c:126 msgid "Symbols" msgstr "Σύμβολα" -#: ../data/geany.glade.h:458 +#: ../data/geany.glade.h:456 msgid "Documents" msgstr "Έγγραφα" -#: ../data/geany.glade.h:459 +#: ../data/geany.glade.h:457 msgid "Status" msgstr "Κατάσταση" -#: ../data/geany.glade.h:460 +#: ../data/geany.glade.h:458 msgid "Compiler" -msgstr "Μεταγλωτιστής" +msgstr "Μεταγλωττιστής" -#: ../data/geany.glade.h:461 +#: ../data/geany.glade.h:459 msgid "Messages" msgstr "Μηνύματα" -#: ../data/geany.glade.h:462 +#: ../data/geany.glade.h:460 msgid "Scribble" msgstr "Σημειωματάριο" -#: ../data/geany.glade.h:463 +#: ../data/geany.glade.h:461 msgid "Project Properties" msgstr "Ιδιότητες Έργου" -#: ../data/geany.glade.h:464 ../src/project.c:180 +#: ../data/geany.glade.h:462 ../src/project.c:180 msgid "Filename:" msgstr "Όνομα αρχείου:" -#: ../data/geany.glade.h:465 ../src/project.c:169 ../plugins/classbuilder.c:467 +#: ../data/geany.glade.h:463 ../src/project.c:169 ../plugins/classbuilder.c:467 #: ../plugins/classbuilder.c:477 msgid "Name:" msgstr "Όνομα:" -#: ../data/geany.glade.h:466 +#: ../data/geany.glade.h:464 msgid "Description:" msgstr "Περιγραφή:" -#: ../data/geany.glade.h:467 ../src/project.c:202 +#: ../data/geany.glade.h:465 ../src/project.c:202 msgid "Base path:" msgstr "Βασική διαδρομή:" -#: ../data/geany.glade.h:468 +#: ../data/geany.glade.h:466 msgid "File patterns:" msgstr "Πρότυπα Αρχείων:" -#: ../data/geany.glade.h:469 +#: ../data/geany.glade.h:467 msgid "" "Space separated list of file patterns used for the find in files dialog (e." "g. *.c *.h)" msgstr "" "Λίστα πρότυπων αρχείων διαχωρισμένη με κενά για χρήση στο διάλογο αναζήτηση " "σε αρχεία (π.χ. *.c *.h)" -#: ../data/geany.glade.h:470 ../src/project.c:209 +#: ../data/geany.glade.h:468 ../src/project.c:209 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 " @@ -2210,79 +2201,79 @@ msgstr "" "μια νέα διαδρομή, ή ένας υπάρχον φάκελος. Μπορείτε να χρησιμοποιήσετε " "διαδρομές σχετικές με το όνομα του έργου." -#: ../data/geany.glade.h:471 ../src/keybindings.c:319 +#: ../data/geany.glade.h:469 ../src/keybindings.c:319 msgid "Project" msgstr "Έργο" -#: ../data/geany.glade.h:472 +#: ../data/geany.glade.h:470 msgid "Display:" msgstr "Εμφάνιση:" -#: ../data/geany.glade.h:473 +#: ../data/geany.glade.h:471 msgid "Custom" msgstr "Προσαρμοσμένο" -#: ../data/geany.glade.h:474 +#: ../data/geany.glade.h:472 msgid "Use global settings" msgstr "Χρήση γενικών ρυθμίσεων" -#: ../data/geany.glade.h:475 +#: ../data/geany.glade.h:473 msgid "Size:" msgstr "Μέγεθος:" -#: ../data/geany.glade.h:476 +#: ../data/geany.glade.h:474 msgid "Location:" msgstr "Τοποθεσία:" -#: ../data/geany.glade.h:477 +#: ../data/geany.glade.h:475 msgid "Read-only:" msgstr "Μόνο για ανάγνωση:" -#: ../data/geany.glade.h:478 +#: ../data/geany.glade.h:476 msgid "Encoding:" msgstr "Kωδικοποίηση:" -#: ../data/geany.glade.h:479 +#: ../data/geany.glade.h:477 msgid "Modified:" msgstr "Τροποποιημένο:" -#: ../data/geany.glade.h:480 +#: ../data/geany.glade.h:478 msgid "Changed:" msgstr "Αλλαγμένο:" -#: ../data/geany.glade.h:481 +#: ../data/geany.glade.h:479 msgid "Accessed:" msgstr "Προσπελάστηκε:" -#: ../data/geany.glade.h:482 +#: ../data/geany.glade.h:480 msgid "(only inside Geany)" msgstr "(μόνο εντός Geany)" -#: ../data/geany.glade.h:483 +#: ../data/geany.glade.h:481 msgid "Permissions:" msgstr "Δικαιώματα:" -#: ../data/geany.glade.h:484 +#: ../data/geany.glade.h:482 msgid "Read:" msgstr "Ανάγνωση:" -#: ../data/geany.glade.h:485 +#: ../data/geany.glade.h:483 msgid "Write:" msgstr "Εγγραφή:" -#: ../data/geany.glade.h:486 +#: ../data/geany.glade.h:484 msgid "Execute:" msgstr "Εκτέλεση:" -#: ../data/geany.glade.h:487 +#: ../data/geany.glade.h:485 msgid "Owner:" msgstr "Κάτοχος:" -#: ../data/geany.glade.h:488 +#: ../data/geany.glade.h:486 msgid "Group:" msgstr "Ομάδα:" -#: ../data/geany.glade.h:489 +#: ../data/geany.glade.h:487 msgid "Other:" msgstr "Άλλοι:" @@ -2425,11 +2416,11 @@ msgstr "" #: ../src/build.c:1016 msgid "Compilation failed." -msgstr "Αποτυχία μεταγλώτισης." +msgstr "Αποτυχία μεταγλώττισης." #: ../src/build.c:1030 msgid "Compilation finished successfully." -msgstr "Η μεταγλώτιση ολοκληρώθηκε με επιτυχία." +msgstr "Η μεταγλώττιση ολοκληρώθηκε με επιτυχία." #: ../src/build.c:1199 msgid "Custom Text" @@ -2471,7 +2462,7 @@ msgstr "" #: ../src/build.c:1591 msgid "Compile the current file with Make" -msgstr "Μεταγλώτιση του τρέχοντος αρχείου με Make" +msgstr "Μεταγλώττιση του τρέχοντος αρχείου με Make" #: ../src/build.c:1610 #, c-format @@ -2518,7 +2509,7 @@ msgstr "Χωρίς τύπο αρχείου" #: ../src/build.c:1931 ../src/build.c:1966 msgid "Error regular expression:" -msgstr "Σφάλμα regular expression:" +msgstr "Σφάλμα κανονικής έκφρασης:" #: ../src/build.c:1959 msgid "Independent commands" @@ -2548,7 +2539,7 @@ msgstr "Καθορισμός Εντολών Κατασκευής (Build)" #: ../src/build.c:2385 msgid "_Compile" -msgstr "_Μεταγλώτιση" +msgstr "_Μεταγλώττιση" #: ../src/build.c:2399 ../src/build.c:2429 ../src/build.c:2637 msgid "_Execute" @@ -2941,7 +2932,7 @@ msgstr "Αποτυχία εγγραφής αρχείου '%s': Το fwrite() α #: ../src/document.c:1998 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "Αποτυχία κλείσιμου αρχείου '%s': Το fclose() απέτυχε: %s" +msgstr "Αποτυχία κλεισίματος αρχείου '%s': Το fclose() απέτυχε: %s" #: ../src/document.c:2048 ../src/document.c:3621 msgid "_Overwrite" @@ -3272,7 +3263,7 @@ msgstr "Ο τρέχον τύπος αρχείου αναιρεί το προκα #: ../src/highlighting.c:1341 msgid "This may cause color schemes to display incorrectly." -msgstr "Αυτό μπορεί να εμφανίσει λάθος τη χρωματική παλλέτα." +msgstr "Αυτό μπορεί να εμφανίσει λάθος τη χρωματική παλέτα." #: ../src/highlighting.c:1366 msgid "Color Schemes" @@ -3401,9 +3392,8 @@ msgid "Delete to line end" msgstr "Διαγραφή έως το τέλος της γραμμής" #: ../src/keybindings.c:391 -#, fuzzy msgid "Delete to beginning of line" -msgstr "Διαγραφή έως το τέλος της γραμμής" +msgstr "Διαγραφή έως την αρχή της γραμμής" #: ../src/keybindings.c:394 msgid "_Transpose Current Line" @@ -3787,7 +3777,7 @@ msgstr "Απομάκρυνση Δεικτών και Δεικτών Σφάλμα #: ../src/keybindings.c:687 ../src/toolbar.c:72 msgid "Compile" -msgstr "Μεταγλώτιση" +msgstr "Μεταγλώττιση" #: ../src/keybindings.c:691 msgid "Make all" @@ -3829,13 +3819,13 @@ msgstr "Συντομεύσεις Πληκτρολογίου" msgid "The following keyboard shortcuts are configurable:" msgstr "Οι ακόλουθες συντομεύσεις πληκτρολογίου είναι διαμορφώσιμες:" -#: ../src/keyfile.c:1032 +#: ../src/keyfile.c:1027 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" -"Πληκτρολογείστε εδώ ότι θέλετε, χρησιμοποιείστε το ως ένα σημειωματάριο/" +"Πληκτρολογήστε εδώ ότι θέλετε, χρησιμοποιείστε το ως ένα σημειωματάριο/" "πίνακα μηνυμάτων" -#: ../src/keyfile.c:1259 +#: ../src/keyfile.c:1254 msgid "Failed to load one or more session files." msgstr "Αποτυχία φόρτωσης ενός ή περισσότερων αρχείων συνεδρίας." @@ -3849,7 +3839,7 @@ msgstr "" #: ../src/libmain.c:119 msgid "Use an alternate configuration directory" -msgstr "Χρήση ενός εναλλακτικού φακέλλου ρυθμίσεων" +msgstr "Χρήση ενός εναλλακτικού φακέλου ρυθμίσεων" #: ../src/libmain.c:120 msgid "Print internal filetype names" @@ -3944,7 +3934,7 @@ msgstr "Μετακίνηση τώρα;" #: ../src/libmain.c:653 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -"Το Geany πρέπει να μετακινήσει τον παλιό φάκελο ρυθμίσεων πρωτού ξεκινήσει." +"Το Geany πρέπει να μετακινήσει τον παλιό φάκελο ρυθμίσεων πριν ξεκινήσει." #: ../src/libmain.c:662 #, c-format @@ -3974,8 +3964,7 @@ msgid "" "Start Geany anyway?" msgstr "" "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων (%s).\n" -"Μπορεί να προκύψει πρόβλημα στη χρήση του Geany χωρίς τον φάκελλο " -"ρυθμίσεων.\n" +"Μπορεί να προκύψει πρόβλημα στη χρήση του Geany χωρίς τον φάκελο ρυθμίσεων.\n" "Να γίνει εκκίνηση του Geany;" #: ../src/libmain.c:1158 @@ -4044,8 +4033,8 @@ msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -"Το πρόσθετο \"%s\" δεν είναι συμβατό δυαδικά (binary compatible) με αυτή την " -"έκδοση του Geany - παρακαλούμε να γίνει επαναγλώττιση (recompile)." +"Το πρόσθετο \"%s\" δεν είναι συμβατό δυαδικά με αυτή την έκδοση του Geany - " +"παρακαλούμε να γίνει ξανά μεταγλώττιση." #: ../src/plugins.c:1271 msgid "_Plugin Manager" @@ -4099,6 +4088,8 @@ msgid "" "Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " "plugin." msgstr "" +"To proxy επιπρόσθετο '%s' έχει επέκταση '%s' η οποία ξεκινά με τελεία. " +"Διορθώστε το proxy plugin." #: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -4129,33 +4120,33 @@ msgstr "Δράση" msgid "Shortcut" msgstr "Συντόμευση" -#: ../src/prefs.c:1486 +#: ../src/prefs.c:1479 msgid "_Allow" msgstr "_Επίτρεψε" -#: ../src/prefs.c:1488 +#: ../src/prefs.c:1481 msgid "_Override" msgstr "_Παράκαμψη" -#: ../src/prefs.c:1489 +#: ../src/prefs.c:1482 msgid "Override that keybinding?" msgstr "Παράκαμψη αυτής της συντόμευσης;" -#: ../src/prefs.c:1490 +#: ../src/prefs.c:1483 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Ο συνδυασμός '%s' χρησιμοποιείται ήδη για \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1699 +#: ../src/prefs.c:1692 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Εισάγετε παρακάτω τις διαδρομές των εργαλείων. Τα εργαλεία που δεν " "χρειάζονται μπορούν να παραμείνουν κενά." #. page Templates -#: ../src/prefs.c:1704 +#: ../src/prefs.c:1697 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -4164,7 +4155,7 @@ msgstr "" "τεκμηρίωση για λεπτομέρειες." #. page Keybindings -#: ../src/prefs.c:1709 +#: ../src/prefs.c:1702 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 " @@ -4176,7 +4167,7 @@ msgstr "" "απευθείας τη αντίστοιχη συντόμευση." #. page Editor->Indentation -#: ../src/prefs.c:1714 +#: ../src/prefs.c:1707 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -4210,12 +4201,12 @@ msgstr "Σελίδα %d από %d" #: ../src/printing.c:501 #, c-format msgid "Did not send document %s to the printing subsystem." -msgstr "Δεν εστάλλει το έγγραφο %s στο υποσύστημα εκτύπωσης." +msgstr "Δεν στάλθηκε το έγγραφο %s στο υποσύστημα εκτύπωσης." #: ../src/printing.c:503 #, c-format msgid "Document %s was sent to the printing subsystem." -msgstr "Το έγγραφο %s εστάλλει στο υποσύστημα εκτύπωσης." +msgstr "Το έγγραφο %s στάλθηκε στο υποσύστημα εκτύπωσης." #: ../src/printing.c:554 #, c-format @@ -4320,7 +4311,7 @@ msgstr "Το έργο \"%s\" αποθηκεύτηκε." #: ../src/project.c:659 msgid "Do you want to close it before proceeding?" -msgstr "Θέλετε να το κλείσετε πρίν προχωρήσετε;" +msgstr "Θέλετε να το κλείσετε πριν προχωρήσετε;" #: ../src/project.c:660 #, c-format @@ -4342,7 +4333,7 @@ msgstr "Καθορίσατε ένα άκυρο όνομα αρχείου του #: ../src/project.c:750 msgid "Create the project's base path directory?" -msgstr "Δημιουργία φακέλλου της βασικής διαδρομής του έργου;" +msgstr "Δημιουργία φακέλου της βασικής διαδρομής του έργου;" #: ../src/project.c:751 #, c-format @@ -4380,16 +4371,15 @@ msgstr "Το έργο \"%s\" άνοιξε." #: ../src/search.c:308 ../src/search.c:960 msgid "_Use regular expressions" -msgstr "_Χρήση regular expressions" +msgstr "_Χρήση κανονικών εκφράσεων" #: ../src/search.c:311 -#, fuzzy msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" -"Χρήση POSIX-like regular expressions. Για λεπτομερείς πληροφορίες σχετικά με " -"τη χρήση regular expressions, παρακαλούμε διαβάστε την τεκμηρίωση." +"Χρήση κανονικών εκφράσεων τύπου Perl. Για λεπτομερείς πληροφορίες σχετικά με " +"τη χρήση κανονικών εκφράσεων, παρακαλούμε διαβάστε την τεκμηρίωση." #: ../src/search.c:316 msgid "Use _escape sequences" @@ -4414,11 +4404,11 @@ msgid "" "newline characters are part of the input and can be captured as normal " "characters by the pattern." msgstr "" -"Εκτέλεση ταιριάσματος με regular expression σε όλο τον buffer αντί για " -"γραμμή προς γραμμή, ώστε να βρεθούν ταιριάσματα που εκτείνονται σε πολλές " -"γραμμές. Σε αυτή τη μέθοδο λειτουργίας οι χαρακτήρες νέας γραμμής (newline) " -"αποτελούν μέρος της εισόδου και μπορούν να καταγράφονται ως κανονικοί " -"χαρακτήρες από το πρότυπο αναζήτησης." +"Εκτέλεση ταιριάσματος με κανονική έκφραση σε όλο τον buffer αντί για γραμμή " +"προς γραμμή, ώστε να βρεθούν ταιριάσματα που εκτείνονται σε πολλές γραμμές. " +"Σε αυτή τη μέθοδο λειτουργίας οι χαρακτήρες νέας γραμμής (newline) αποτελούν " +"μέρος της εισόδου και μπορούν να καταγράφονται ως κανονικοί χαρακτήρες από " +"το πρότυπο αναζήτησης." #: ../src/search.c:341 msgid "Search _backwards" @@ -4942,7 +4932,7 @@ msgstr "Συστατικά (Components)" #: ../src/symbols.c:768 msgid "Blocks" -msgstr "Μπλόκ (Blocks)" +msgstr "Μπλοκ (Blocks)" #: ../src/symbols.c:779 msgid "Defines" @@ -5064,6 +5054,8 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" +"Αδυναμία εκτέλεσης πρότυπου εντολής \"%s\". Σημείωση: συχνά προκαλούνται " +"προβλήματα από λάθος διαδρομές στην εντολή. Σφάλμα: %s." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 @@ -5112,11 +5104,11 @@ msgstr "Επανάληψη της τελευταίας τροποποίησης" #: ../src/toolbar.c:72 msgid "Compile the current file" -msgstr "Μεταγλώτιση του τρέχοντος αρχείου" +msgstr "Μεταγλώττιση του τρέχοντος αρχείου" #: ../src/toolbar.c:73 msgid "Run or view the current file" -msgstr "Εκτελέση ή εμφάνιση του τρέχοντος αρχείου" +msgstr "Εκτέλεση ή εμφάνιση του τρέχοντος αρχείου" #: ../src/toolbar.c:74 msgid "" @@ -5154,7 +5146,7 @@ msgstr "Εμφάνιση του διαλόγου προτιμήσεων" #: ../src/toolbar.c:82 msgid "Quit Geany" -msgstr "Κλείσιμου του Geany" +msgstr "Κλείσιμο του Geany" #: ../src/toolbar.c:83 msgid "Print document" @@ -5205,7 +5197,7 @@ msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -"Επιλογή των αντικειμένων που θα ενφανίζονται στην μπάρα εργαλείων. Η " +"Επιλογή των αντικειμένων που θα εμφανίζονται στην μπάρα εργαλείων. Η " "αναδιάταξη των αντικειμένων μπορεί να γίνει με drag και drop." #: ../src/toolbar.c:976 @@ -5508,24 +5500,24 @@ msgstr "CR" msgid "LF" msgstr "LF" -#: ../src/vte.c:487 +#: ../src/vte.c:577 #, c-format msgid "invalid VTE library \"%s\": missing symbol \"%s\"" msgstr "λανθασμένη βιβλιοθήκη VTE \"%s\": λείπει το σύμβολο \"%s\"" -#: ../src/vte.c:636 +#: ../src/vte.c:758 msgid "_Set Path From Document" msgstr "_Ρύθμιση Διαδρομής από το Έγγραφο" -#: ../src/vte.c:641 +#: ../src/vte.c:763 msgid "_Restart Terminal" msgstr "_Επανεκκίνηση Τερματικού" -#: ../src/vte.c:664 +#: ../src/vte.c:796 msgid "_Input Methods" msgstr "_Εισαγωγή Μεθόδων" -#: ../src/vte.c:754 +#: ../src/vte.c:888 msgid "" "Directory not changed because the terminal may contain some input (press Ctrl" "+C or Enter to clear it)." @@ -5819,7 +5811,7 @@ msgstr "Φυλλομετρητής Αρχείων" #: ../plugins/filebrowser.c:50 msgid "Adds a file browser tab to the sidebar." -msgstr "Προσθέτει μια ετικέτα φιλλομετρητή αρχείων στη πλευρική μπάρα." +msgstr "Προσθέτει μια ετικέτα φυλλομετρητή αρχείων στη πλευρική μπάρα." #: ../plugins/filebrowser.c:415 msgid "Too many items selected!" @@ -5868,8 +5860,8 @@ msgid "" "Filter your files with the usual wildcards. Separate multiple patterns with " "a space." msgstr "" -"Φιλτράρετε τα αρχεία σας με τα σύνηθη wildcards. Διαχωρίστε πολλαπλά πρότυπα " -"με ένα κενό." +"Φιλτράρετε τα αρχεία σας με τα συνηθισμένα wildcards. Διαχωρίστε πολλαπλά " +"πρότυπα με ένα κενό." #: ../plugins/filebrowser.c:1164 msgid "Focus File List" @@ -5997,7 +5989,7 @@ msgstr "Απο_θήκευση όλων των ανοιγμένων αρχείω #: ../plugins/saveactions.c:679 msgid "Instant Save" -msgstr "Στιμιαία Αποθήκευση" +msgstr "Στιγμιαία Αποθήκευση" #: ../plugins/saveactions.c:689 msgid "_Filetype to use for newly opened files:" @@ -6059,6 +6051,13 @@ msgstr "Από Πλευρά σε Πλευρά" msgid "Top and Bottom" msgstr "Άνω και κάτω" +#~ msgid "Background image:" +#~ msgstr "Εικόνα Φόντου:" + +#~ msgid "Sets the path to the background image in the terminal widget" +#~ msgstr "" +#~ "Καθορίζει τη διαδρομή της εικόνας φόντου για το πρόσθετο του τερματικού" + #~ msgid "" #~ "Cannot execute command \"%s\" from the template: %s. Check the path in " #~ "the template." -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2016