Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Wed, 04 Nov 2015 17:03:51 UTC
Commit: 5beeacf26716c0571e7b6f8f042f8faa3c147f2d
https://github.com/geany/geany/commit/5beeacf26716c0571e7b6f8f042f8faa3c147…
Log Message:
-----------
Update of Spanish translation
Modified Paths:
--------------
NEWS
po/es.po
Modified: NEWS
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
Geany 1.26 (unreleased)
Internationalization
- * Updated translations: de, el, pt, sv
+ * Updated translations: de, el, es, pt, sv
Geany 1.25 (July 12, 2015)
Modified: po/es.po
84 lines changed, 41 insertions(+), 43 deletions(-)
===================================================================
@@ -6,11 +6,11 @@
# Lucas Vieites <lucas.vieites(a)gmail.com>, 2010 - 2015.
msgid ""
msgstr ""
-"Project-Id-Version: Geany 1.25\n"
+"Project-Id-Version: Geany 1.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-01 19:03+0100\n"
-"PO-Revision-Date: 2015-06-21 14:21+0100\n"
-"Last-Translator: Lucas Vieites <lucas(a)codexion.com>\n"
+"POT-Creation-Date: 2015-11-02 02:36+0000\n"
+"PO-Revision-Date: 2015-11-02 09:11+0100\n"
+"Last-Translator: Lucas Vieites <lucas.vieites(a)gmail.com>\n"
"Language-Team: Español <geany-i18n(a)uvena.de>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -1603,10 +1603,9 @@ msgid "Follow path of the current file"
msgstr "Seguir la ruta del archivo actual"
#: ../data/geany.glade.h:328
-#, fuzzy
msgid "Whether to execute \"cd $path\" when you switch between opened files"
msgstr ""
-"Indica si se ejecutará «cd $path» cuando se cambie entre archivos abiertos"
+"Indica si se ejecuta «cd $path» cuando se cambie entre archivos abiertos"
#: ../data/geany.glade.h:329
msgid "Execute programs in the VTE"
@@ -2140,8 +2139,8 @@ msgstr "Propiedades del proyecto"
msgid "Filename:"
msgstr "Nombre de archivo:"
-#: ../data/geany.glade.h:460 ../src/project.c:169 ../plugins/classbuilder.c:467
-#: ../plugins/classbuilder.c:477
+#: ../data/geany.glade.h:460 ../src/project.c:169
+#: ../plugins/classbuilder.c:467 ../plugins/classbuilder.c:477
msgid "Name:"
msgstr "Nombre:"
@@ -2252,7 +2251,6 @@ msgid "Other:"
msgstr "Otros:"
#: ../src/about.c:48
-#, fuzzy
msgid ""
"Copyright (c) 2005-2015\n"
"Colomban Wendling\n"
@@ -2262,7 +2260,7 @@ msgid ""
"Frank Lanitz\n"
"All rights reserved."
msgstr ""
-"Copyright (c) 2005-2014\n"
+"Copyright (c) 2005-2015\n"
"Colomban Wendling\n"
"Nick Treleaven\n"
"Matthew Brush\n"
@@ -2379,12 +2377,12 @@ msgstr ""
"(pulse Ctrl+C o Enter para limpiarlo)."
#: ../src/build.c:912
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot execute terminal command \"%s\": %s. Check the path setting in "
"Preferences."
msgstr ""
-"No se ha podido encontrar la herramienta grep «%s»; verifique la ruta en "
+"No se ha podido encontrar el comando «%s»: %s. Verifique la ruta en "
"«Preferencias»."
#: ../src/build.c:1020
@@ -2563,20 +2561,17 @@ msgstr "No se ha podido abrir el archivo %s (No se ha encontrado el archivo)"
#: ../src/callbacks.c:1473
msgid "Check the path setting in Filetype configuration."
-msgstr ""
+msgstr "Compruebe el ajuste de la ruta en Configuración de tipos de archivo"
#: ../src/callbacks.c:1478
-#, fuzzy
msgid "Check the path setting in Preferences."
-msgstr ""
-"No se ha podido encontrar la herramienta grep «%s»; verifique la ruta en "
-"«Preferencias»."
+msgstr "Verifique la ruta en «Preferencias»."
#. G_SHELL_ERROR is parsing error, it may be caused by %s word with quotes
#: ../src/callbacks.c:1491
-#, fuzzy, c-format
+#, c-format
msgid "Cannot execute context action command \"%s\": %s. %s"
-msgstr "No se ha podido ejecutar el comando externo configurado «%s» (%s)."
+msgstr "No se ha podido ejecutar el comando de acción de contexto «%s»: %s. %s"
#: ../src/dialogs.c:160 ../src/document.c:2308 ../src/document.c:2373
#: ../src/document.c:2381
@@ -2827,7 +2822,7 @@ msgstr ", sólo lectura"
#: ../src/document.c:1627
msgid "Discard history"
-msgstr ""
+msgstr "Borrar historia"
#: ../src/document.c:1628
msgid ""
@@ -2836,11 +2831,14 @@ msgid ""
"will not be displayed again but Your choice can be changed in the various "
"preferences."
msgstr ""
+"El estado anterior del búfer se almacena en la historia y deshacer lo "
+"restaura. Puede desactivar esto al Borrar historia al recargar. No se "
+"volverá a mostrar este mensaje pero puede cambiar su elección mediante los "
+"ajustes en Preferencias."
#: ../src/document.c:1632
-#, fuzzy
msgid "The file has been reloaded."
-msgstr "El documento ha sido cerrado."
+msgstr "El documento ha sido recargado."
#: ../src/document.c:1662
msgid "Any unsaved changes will be lost."
@@ -3956,9 +3954,8 @@ msgid "Switch to Document"
msgstr "Cambiar a documento"
#: ../src/notebook.c:451
-#, fuzzy
msgid "Open in New _Window"
-msgstr "Abrir en _Geany"
+msgstr "Abrir en _Ventana nueva"
#: ../src/plugins.c:223
#, c-format
@@ -3979,6 +3976,9 @@ msgid ""
"<i>Other plugins depend on this. Disable them first to allow deactivation.</"
"i>\n"
msgstr ""
+"\n"
+"<i>Otros plugins dependen de estos. Desactívelos antes para permitir "
+"desactivación.</i>\n"
#. Four allocations is less than ideal but meh
#: ../src/plugins.c:1602
@@ -4150,13 +4150,13 @@ msgstr ""
"%s"
#: ../src/printing.c:615
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot execute print command \"%s\": %s. Check the path setting in "
"Preferences."
msgstr ""
-"No se ha podido encontrar la herramienta grep «%s»; verifique la ruta en "
-"«Preferencias»."
+"No se ha podido encontrar la herramienta de impresión «%s»: %s. Verifique la "
+"ruta en «Preferencias»."
#: ../src/printing.c:622
#, c-format
@@ -4505,11 +4505,11 @@ msgid "%s %s -- %s (in directory: %s)"
msgstr "%s %s -- %s (en directorio: %s)"
#: ../src/search.c:1718
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot execute grep tool \"%s\": %s. Check the path setting in Preferences."
msgstr ""
-"No se ha podido encontrar la herramienta grep «%s»; verifique la ruta en "
+"No se ha podido encontrar la herramienta grep «%s»: %s. Verifique la ruta en "
"«Preferencias»."
#: ../src/search.c:1758
@@ -4549,11 +4549,8 @@ msgstr ""
"Esto es un error grave y Geany se cerrará."
#: ../src/spawn.c:90 ../src/spawn.c:140 ../src/spawn.c:184
-#, fuzzy
msgid "Text ended before matching quote was found"
-msgstr ""
-"Se acabó el teto antes de encontrar las comillas correspondientes a %c. (El "
-"texto era «%s»)"
+msgstr "Se acabó el texto antes de encontrar las comillas correspondientes"
#. TL note: from glib
#: ../src/spawn.c:126
@@ -4567,18 +4564,16 @@ msgstr ""
"de las comillas"
#: ../src/spawn.c:254
-#, fuzzy
msgid "Program not found"
-msgstr "No se ha encontrado el programa «%s»"
+msgstr "No se ha encontrado el programa"
#: ../src/spawn.c:668
-#, fuzzy
msgid "Failed to change to the working directory"
-msgstr "El proceso ha fallado, no hay directorio de trabajo"
+msgstr "No se ha podido cambiar el directorio de trabajo"
#: ../src/spawn.c:673
msgid "Unknown error executing child process"
-msgstr ""
+msgstr "Error desconocido al ejecutar proceso hijo"
#: ../src/stash.c:1150
msgid "Name"
@@ -4977,6 +4972,8 @@ msgid ""
"Cannot execute command \"%s\" from the template: %s. Check the path in the "
"template."
msgstr ""
+"No se puede ejecutar el comando «%s» desde la plantilla: %s. Compruebe la "
+"ruta en la plantilla."
#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build"
#: ../src/toolbar.c:58
@@ -5153,13 +5150,13 @@ msgid "The executed custom command exited with an unsuccessful exit code."
msgstr "El comando personalizado ejecutado salió con un código de error."
#: ../src/tools.c:242
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot execute custom command \"%s\": %s. Check the path setting in Custom "
"Commands."
msgstr ""
-"No se ha podido encontrar la herramienta grep «%s»; verifique la ruta en "
-"«Preferencias»."
+"No se ha podido encontrar el comando personalizado «%s»: %s. Verifique la "
+"ruta en «Preferencias»."
#: ../src/tools.c:357 ../src/tools.c:620
msgid "Set Custom Commands"
@@ -5568,8 +5565,9 @@ msgstr "Caracteres HTML"
msgid "Inserts HTML character entities like '&'."
msgstr "Insertar entidades HTML para carácteras como «&»."
-#: ../plugins/htmlchars.c:40 ../plugins/export.c:38 ../plugins/filebrowser.c:51
-#: ../plugins/saveactions.c:44 ../plugins/splitwindow.c:35
+#: ../plugins/htmlchars.c:40 ../plugins/export.c:38
+#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:44
+#: ../plugins/splitwindow.c:35
msgid "The Geany developer team"
msgstr "El equipo de desarrollo de Geany"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Wed, 04 Nov 2015 16:35:48 UTC
Commit: 10f7cb24b26d1a62cdf4851788e4363efacb1b78
https://github.com/geany/geany/commit/10f7cb24b26d1a62cdf4851788e4363efacb1…
Log Message:
-----------
Avoid possible invalid memory access when activating plugin
It may happen (and happens on OS X) that plugin activation using
plugin_new() triggers some action which causes the tree view to
update. However, as the old plugin was freed before, the tree view
contains an invalid pointer to p which causes invalid memory access.
After freeing the old pointer, set the tree view value to NULL - the
plugin pointer is checked at other places for NULL value so it
doesn't crash.
Modified Paths:
--------------
src/plugins.c
Modified: src/plugins.c
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -1478,6 +1478,9 @@ static void pm_plugin_toggled(GtkCellRendererToggle *cell, gchar *pth, gpointer
/* save shortcuts (only need this group, but it doesn't take long) */
keybindings_write_to_file();
+ /* plugin_new() below may cause a tree view refresh with invalid p - set to NULL */
+ gtk_tree_store_set(pm_widgets.store, &store_iter,
+ PLUGIN_COLUMN_PLUGIN, NULL, -1);
plugin_free(p);
/* reload plugin module and initialize it if item is checked */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Tue, 03 Nov 2015 23:35:46 UTC
Commit: cf19f75b2608ab9c1c183e94e4ce43f90d7e9e63
https://github.com/geany/geany-osx/commit/cf19f75b2608ab9c1c183e94e4ce43f90…
Log Message:
-----------
Test presence of ~/.config/geany/use_locale to check whether use localizations
In addition, add localizations to the bundle
Modified Paths:
--------------
geany.bundle
launcher.sh
Modified: geany.bundle
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -111,7 +111,6 @@
want to copy in to the bundle. The "dest" attribute is
optional, as usual. Bundler will find all translations of that
library/program under the indicated directory and copy them.-->
- <!--
<translations name="vte-0.0">
${prefix}/share/locale
</translations>
@@ -124,7 +123,6 @@
<translations name="geany-plugins">
${prefix}/share/locale
</translations>
- -->
<!-- Data to copy in, usually Glade/UI files, images, sounds files
Modified: launcher.sh
5 lines changed, 2 insertions(+), 3 deletions(-)
===================================================================
@@ -55,8 +55,7 @@ export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
export PANGO_LIBDIR="$bundle_lib"
export PANGO_SYSCONFDIR="$bundle_etc"
-test_locale="no"
-if test "x$test_locale" == "xyes"; then
+if test -e ~/.config/geany/use_locale; then
APP=$name
I18NDIR="$bundle_data/locale"
@@ -174,7 +173,7 @@ export LC_ALL=$LC_MESSAGES
unset APPLELOCALE FILES LOC
-#test_locale != yes
+#~/.config/geany/use_locale doesn't exist
else
export LANG="en_US"
export LC_MESSAGES="en_US"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Tue, 03 Nov 2015 22:58:24 UTC
Commit: bcb6279d5ac4a0e13bdc28092859a06b7578fabb
https://github.com/geany/geany-osx/commit/bcb6279d5ac4a0e13bdc28092859a06b7…
Log Message:
-----------
Remove im-quartz.so from the bundle as it causes crashes
The crash happens on scintilla focus out - maybe caused by some
changes in scintilla but it could also be caused by some gtk bug.
In any case, everything seems to work without the module too
so it probably isn't needed
Modified Paths:
--------------
geany.bundle
Modified: geany.bundle
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -73,11 +73,11 @@
<binary>
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
</binary>
-
+<!--
<binary>
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/im-quartz.so
</binary>
-
+-->
<!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
<binary>
${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 03 Nov 2015 18:30:53 UTC
Commit: 23323f53779ae54c8a9349bc4b1e0e48ac4acb5f
https://github.com/geany/geany/commit/23323f53779ae54c8a9349bc4b1e0e48ac4ac…
Log Message:
-----------
Cast windows HANDLE to intptr_t, not long
The cast in g_warning is not fixed. It's unimportant, displaying a
handle value does not provide any meaningful information anyway.
Closes #727.
Modified Paths:
--------------
src/win32.c
Modified: src/win32.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -812,7 +812,7 @@ static FILE *open_std_handle(DWORD handle, const char *mode)
g_free(err);
return NULL;
}
- hConHandle = _open_osfhandle((long)lStdHandle, _O_TEXT);
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
if (hConHandle == -1)
{
gchar *err = g_win32_error_message(GetLastError());
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Devyn Collier Johnson <DevynCJohnson(a)Gmail.com>
Committer: Devyn Collier Johnson <DevynCJohnson(a)Gmail.com>
Date: Tue, 03 Nov 2015 15:38:43 UTC
Commit: ac486449046338e81f0d8a3e8d9c8e0e5651c47f
https://github.com/geany/geany/commit/ac486449046338e81f0d8a3e8d9c8e0e5651c…
Log Message:
-----------
Update filetype_extensions.conf
Changes
- Ensured consistency by ending every line with a semicolon
- Added two MathML file-extensions (*.mml and *.mathml;) to "XML="
Justification for proposed changes
- Code consistency is important in programming
- MathML is a form of XML that is commonly used and is part of the HTML5 standard
- W3 MathML Specification: http://www.w3.org/TR/MathML3/
- Geany properly highlights the code when the MathML file-extension is recognized
Modified Paths:
--------------
data/filetype_extensions.conf
Modified: data/filetype_extensions.conf
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -16,7 +16,7 @@ CUDA=*.cu;*.cuh;*.h;
C#=*.cs;
CMake=CMakeLists.txt;*.cmake;*.ctest;
COBOL=*.cob;*.cpy;*.cbl;*.cobol;
-CoffeeScript=*.coffee;Cakefile;*.Cakefile;*.coffee.erb;*.iced;*.iced.erb
+CoffeeScript=*.coffee;Cakefile;*.Cakefile;*.coffee.erb;*.iced;*.iced.erb;
Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties;
CSS=*.css;
Cython=*.pyx;*.pxd;*.pxi;
@@ -24,10 +24,10 @@ D=*.d;*.di;
Diff=*.diff;*.patch;*.rej;
Docbook=*.docbook;
Erlang=*.erl;*.hrl;
-F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP
+F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP;
Ferite=*.fe;
Forth=*.fs;*.fth;
-Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08
+Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08;
FreeBasic=*.bas;*.bi;*.vbs;
Genie=*.gs;
GLSL=*.glsl;*.frag;*.vert;
@@ -65,7 +65,7 @@ Txt2tags=*.t2t;
Vala=*.vala;*.vapi;
Verilog=*.v;
VHDL=*.vhd;*.vhdl;
-XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl;
+XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml;*.xul;*.dtd;*.xtpl;*.mml;*.mathml;
YAML=*.yaml;*.yml;
Zephir=*.zep;
None=*;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).