Branch: refs/heads/master
Author: LarsGit223 <LarsGit223(a)users.noreply.github.com>
Committer: Thomas Martitz <kugel(a)rockbox.org>
Date: Tue, 14 Nov 2017 22:02:00 UTC
Commit: b0d3b5ed0faadb34edb68bfd7715ffd5d9e0878a
https://github.com/geany/geany/commit/b0d3b5ed0faadb34edb68bfd7715ffd5d9e08…
Log Message:
-----------
Close "Deleted from Disk" Infobar on Reload. (#1628)
Cancel 'MSG_TYPE_RESAVE' info bar if still open in function 'document_reload_force'.
This closes the "Deleted from Disk" message if the user clicks on the reload button.
Fixes #1330.
Modified Paths:
--------------
src/document.c
Modified: src/document.c
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -1601,6 +1601,10 @@ gboolean document_reload_force(GeanyDocument *doc, const gchar *forced_enc)
g_return_val_if_fail(doc != NULL, FALSE);
+ /* Cancel resave bar if still open from previous file deletion */
+ if (doc->priv->info_bars[MSG_TYPE_RESAVE] != NULL)
+ gtk_info_bar_response(GTK_INFO_BAR(doc->priv->info_bars[MSG_TYPE_RESAVE]), GTK_RESPONSE_CANCEL);
+
/* Use cancel because the response handler would call this recursively */
if (doc->priv->info_bars[MSG_TYPE_RELOAD] != NULL)
gtk_info_bar_response(GTK_INFO_BAR(doc->priv->info_bars[MSG_TYPE_RELOAD]), GTK_RESPONSE_CANCEL);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Mon, 13 Nov 2017 13:18:33 UTC
Commit: 66abc600f38fec83b5bc644eee80e0e33f951c03
https://github.com/geany/geany/commit/66abc600f38fec83b5bc644eee80e0e33f951…
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.32 (unreleased)
Internationalization
- * Updated translations: ca, de, fr, it, lt, lv, nl, pt, ru, sk, sv, zh_CN
+ * Updated translations: ca, de, es, fr, it, lt, lv, nl, pt, ru, sk, sv, zh_CN
Geany 1.31 (July 16, 2017)
Modified: po/es.po
111 lines changed, 50 insertions(+), 61 deletions(-)
===================================================================
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Geany 1.30\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-05 14:41+0100\n"
-"PO-Revision-Date: 2017-03-07 15:49+0100\n"
+"POT-Creation-Date: 2017-11-09 00:11+0100\n"
+"PO-Revision-Date: 2017-11-06 10:09+0100\n"
"Last-Translator: Lucas Vieites <lucas(a)codexion.com>\n"
"Language-Team: Español <geany-i18n(a)uvena.de>\n"
"Language: es\n"
@@ -197,26 +197,20 @@ msgid "<b>Startup</b>"
msgstr "<b>Inicio</b>"
#: ../data/geany.glade.h:38
-#, fuzzy
msgid "Save window size"
-msgstr "Guardar la posición de la ventana y su geometría"
+msgstr "Guardar tamaño de la ventana"
#: ../data/geany.glade.h:39
-#, fuzzy
msgid "Saves the window size and restores it at the start"
-msgstr ""
-"Guarda la posición de la ventana y su tamaño y las restablece al inicio"
+msgstr "Guarda el tamaño de la ventana y lo restablece al inicio"
#: ../data/geany.glade.h:40
-#, fuzzy
msgid "Save window position"
-msgstr "Guardar la posición de la ventana y su geometría"
+msgstr "Guardar posición de la ventana"
#: ../data/geany.glade.h:41
-#, fuzzy
msgid "Saves the window position and restores it at the start"
-msgstr ""
-"Guarda la posición de la ventana y su tamaño y las restablece al inicio"
+msgstr "Guarda la posición de la ventana y la restablece al inicio"
#: ../data/geany.glade.h:42
msgid "Confirm exit"
@@ -2080,7 +2074,7 @@ msgid "_Apply Default Indentation"
msgstr "_Aplicar sangría predeterminada"
#. build the code
-#: ../data/geany.glade.h:443 ../src/build.c:2402 ../src/build.c:2679
+#: ../data/geany.glade.h:443 ../src/build.c:2403 ../src/build.c:2680
msgid "_Build"
msgstr "Con_struir"
@@ -2430,130 +2424,130 @@ msgstr "Texto personalizado"
msgid "Enter custom text here, all entered text is appended to the command."
msgstr "Introduzca su texto personalizado, éste se añadirá al comando."
-#: ../src/build.c:1299
+#: ../src/build.c:1300
msgid "_Next Error"
msgstr "Siguie_nte error"
-#: ../src/build.c:1301
+#: ../src/build.c:1302
msgid "_Previous Error"
msgstr "Error _anterior"
#. arguments
-#: ../src/build.c:1311 ../src/build.c:2719
+#: ../src/build.c:1312 ../src/build.c:2720
msgid "_Set Build Commands"
msgstr "Establecer comando_s de construcción"
-#: ../src/build.c:1586 ../src/toolbar.c:376
+#: ../src/build.c:1587 ../src/toolbar.c:376
msgid "Build the current file"
msgstr "Construir el archivo actual"
-#: ../src/build.c:1597
+#: ../src/build.c:1598
msgid "Build the current file with Make and the default target"
msgstr "Construir el archivo actual con «make» y el objetivo predeterminado"
-#: ../src/build.c:1599
+#: ../src/build.c:1600
msgid "Build the current file with Make and the specified target"
msgstr "Construir el archivo actual con «make» y el objetivo indicado"
-#: ../src/build.c:1601
+#: ../src/build.c:1602
msgid "Compile the current file with Make"
msgstr "Compilar el archivo actual con «make»"
-#: ../src/build.c:1620
+#: ../src/build.c:1621
#, c-format
msgid "Process could not be stopped (%s)."
msgstr "No se ha podido detener el proceso (%s)."
-#: ../src/build.c:1634 ../src/build.c:1646
+#: ../src/build.c:1635 ../src/build.c:1647
msgid "No more build errors."
msgstr "No hay más errores de construcción."
-#: ../src/build.c:1759 ../src/build.c:1761
+#: ../src/build.c:1760 ../src/build.c:1762
msgid "Set menu item label"
msgstr "Establecer etiqueta del elemento de menú"
-#: ../src/build.c:1786 ../src/symbols.c:522 ../src/tools.c:397
+#: ../src/build.c:1787 ../src/symbols.c:522 ../src/tools.c:397
msgid "Label"
msgstr "Etiqueta"
#. command column, holding status and command display
-#: ../src/build.c:1787 ../src/symbols.c:517 ../src/tools.c:382
+#: ../src/build.c:1788 ../src/symbols.c:517 ../src/tools.c:382
msgid "Command"
msgstr "Comando"
-#: ../src/build.c:1788
+#: ../src/build.c:1789
msgid "Working directory"
msgstr "Directorio de trabajo"
-#: ../src/build.c:1789
+#: ../src/build.c:1790
msgid "Reset"
msgstr "Reiniciar"
-#: ../src/build.c:1846
+#: ../src/build.c:1847
msgid "Click to set menu item label"
msgstr "Pulse para configurar etiqueta el elemento del menú"
-#: ../src/build.c:1930 ../src/build.c:1932
+#: ../src/build.c:1931 ../src/build.c:1933
#, c-format
msgid "%s commands"
msgstr "Comandos de %s"
-#: ../src/build.c:1932
+#: ../src/build.c:1933
msgid "No filetype"
msgstr "Sin tipo de archivo"
-#: ../src/build.c:1941 ../src/build.c:1976
+#: ../src/build.c:1942 ../src/build.c:1977
msgid "Error regular expression:"
msgstr "Expresión regular de error:"
-#: ../src/build.c:1969
+#: ../src/build.c:1970
msgid "Independent commands"
msgstr "Comandos independientes"
-#: ../src/build.c:2001
+#: ../src/build.c:2002
msgid "Note: Item 2 opens a dialog and appends the response to the command."
msgstr "Nota: El elemento 2 abre un diálogo y añade la respuesta al comando."
-#: ../src/build.c:2010
+#: ../src/build.c:2011
msgid "Execute commands"
msgstr "Comandos de ejecución"
-#: ../src/build.c:2022
+#: ../src/build.c:2023
msgid ""
"%d, %e, %f, %p, %l are substituted in command and directory fields, see "
"manual for details."
msgstr ""
"%d, %e, %f, %p y %l se sustituirán en los campos de comandos y directorios, "
"consulte el manual para más información."
-#: ../src/build.c:2180
+#: ../src/build.c:2181
msgid "Set Build Commands"
msgstr "Establecer los comandos de construcción"
-#: ../src/build.c:2395
+#: ../src/build.c:2396
msgid "_Compile"
msgstr "_Compilar"
-#: ../src/build.c:2409 ../src/build.c:2439 ../src/build.c:2647
+#: ../src/build.c:2410 ../src/build.c:2440 ../src/build.c:2648
msgid "_Execute"
msgstr "_Ejecutar"
#. build the code with make custom
-#: ../src/build.c:2454 ../src/build.c:2645 ../src/build.c:2699
+#: ../src/build.c:2455 ../src/build.c:2646 ../src/build.c:2700
msgid "Make Custom _Target..."
msgstr "Compilar obje_tivo personalizado..."
#. build the code with make object
-#: ../src/build.c:2456 ../src/build.c:2646 ../src/build.c:2707
+#: ../src/build.c:2457 ../src/build.c:2647 ../src/build.c:2708
msgid "Make _Object"
msgstr "Compilar _objeto"
-#: ../src/build.c:2458 ../src/build.c:2644
+#: ../src/build.c:2459 ../src/build.c:2645
msgid "_Make"
msgstr "_Compilar"
#. build the code with make all
-#: ../src/build.c:2691
+#: ../src/build.c:2692
msgid "_Make All"
msgstr "_Compilar todo"
@@ -3823,26 +3817,24 @@ msgid "Failed to load one or more session files."
msgstr "Error al cargar uno o más archivos de la sesión."
#: ../src/libmain.c:122
-#, fuzzy
msgid ""
"Set initial column number to COLUMN for the first opened file (useful in "
"conjunction with --line)"
msgstr ""
-"Establece el número inicial de columna para el primer archivo abierto (útil "
-"en conjunto con --line)"
+"Establece el número inicial de columna a COLUMN para el primer archivo "
+"abierto (útil en conjunto con --line)"
#: ../src/libmain.c:122
msgid "COLUMN"
-msgstr ""
+msgstr "COLUMN"
#: ../src/libmain.c:123
-#, fuzzy
msgid "Use alternate configuration directory DIR"
-msgstr "Usar un directorio de configuración alternativo"
+msgstr "Usar un directorio de configuración DIR alternativo"
#: ../src/libmain.c:123
msgid "DIR"
-msgstr ""
+msgstr "DIR"
#: ../src/libmain.c:124
msgid "Print internal filetype names"
@@ -3865,16 +3857,15 @@ msgstr ""
"nueva instancia"
#: ../src/libmain.c:129
-#, fuzzy
msgid ""
"Use socket filename FILE for communication with a running Geany instance"
msgstr ""
-"Utilice este nombre de archivo de socket para comunicarse con una instancia "
+"Usar el nombre de archivo de socket FILE para comunicarse con una instancia "
"en ejecución de Geany"
#: ../src/libmain.c:129 ../src/libmain.c:143
msgid "FILE"
-msgstr ""
+msgstr "FILE"
#: ../src/libmain.c:130
msgid "Return a list of open documents in a running Geany instance"
@@ -3883,13 +3874,13 @@ msgstr ""
"Geany"
#: ../src/libmain.c:132
-#, fuzzy
msgid "Set initial line number to LINE for the first opened file"
-msgstr "Establece el número de línea inicial para el primer archivo abierto"
+msgstr ""
+"Establece el número de línea inicial a LINE para el primer archivo abierto"
#: ../src/libmain.c:132
msgid "LINE"
-msgstr ""
+msgstr "LINE"
#: ../src/libmain.c:133
msgid "Don't show message window at startup"
@@ -3921,7 +3912,7 @@ msgstr "No cargar el soporte de terminal"
#: ../src/libmain.c:143
msgid "Use FILE as the dynamically-linked VTE library"
-msgstr ""
+msgstr "Usar FILE como biblioteca de enlace dinámico de VTE"
#: ../src/libmain.c:145
msgid "Be verbose"
@@ -3936,13 +3927,12 @@ msgid "[FILES...]"
msgstr "[ARCHIVOS...]"
#: ../src/libmain.c:538
-#, fuzzy
msgid "A fast and lightweight IDE."
-msgstr "Un IDE rápido y ligero"
+msgstr "Un IDE rápido y ligero."
#: ../src/libmain.c:539
msgid "Report bugs to https://github.com/geany/geany/issues."
-msgstr ""
+msgstr "Informe de errores en https://github.com/geany/geany/issues."
#. note for translators: library versions are printed after this
#: ../src/libmain.c:572
@@ -4050,9 +4040,8 @@ msgid "Open in New _Window"
msgstr "Abrir en _Ventana nueva"
#: ../src/notebook.c:502
-#, fuzzy
msgid "Close Documents to the _Right"
-msgstr "Mover el documento a la derecha"
+msgstr "Cerrar documentos a la de_recha"
#: ../src/plugins.c:233
#, c-format
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Giuseppe <giuspen(a)gmail.com>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Thu, 09 Nov 2017 09:01:45 UTC
Commit: b54a117de1026879cdb779884a1cfbbdd1d24d25
https://github.com/geany/geany/commit/b54a117de1026879cdb779884a1cfbbdd1d24…
Log Message:
-----------
updated it.po (#1680)
* updated it.po
* Small update of metadata on Italian translation
Modified Paths:
--------------
po/it.po
Modified: po/it.po
56 lines changed, 23 insertions(+), 33 deletions(-)
===================================================================
@@ -1,17 +1,17 @@
# Italian translations for geany package
# Traduzioni italiane per il pacchetto geany..
-# Copyright (C) 2006-2013 THE geany'S COPYRIGHT HOLDER
+# Copyright (C) 2006-2017 THE geany'S COPYRIGHT HOLDER
# This file is distributed under the same license as the geany package.
# <dario.santomarco(a)gmail.com>, 2006.
# <M.Baldinelli(a)agora.it>, 2006 - 2009
# Giuliano Manzitti <giuliano1979(a)hotmail.com>, 2011
-# Giuseppe Penone <giuspen(a)gmail.com>, 2013 - 2015
+# Giuseppe Penone <giuspen(a)gmail.com>, 2013 - 2017
msgid ""
msgstr ""
-"Project-Id-Version: Geany 1.30\n"
+"Project-Id-Version: Geany 1.32\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-05 14:41+0100\n"
-"PO-Revision-Date: 2017-02-22 22:01+0000\n"
+"PO-Revision-Date: 2017-11-08 23:32+0000\n"
"Last-Translator: Giuseppe Penone <giuspen(a)gmail.com>\n"
"Language-Team: geany-i18n(a)uvena.de\n"
"Language: it\n"
@@ -200,26 +200,20 @@ msgid "<b>Startup</b>"
msgstr "<b>Avvio</b>"
#: ../data/geany.glade.h:38
-#, fuzzy
msgid "Save window size"
-msgstr "Salva posizione e geometria della finestra"
+msgstr "Salva dimensione finestra"
#: ../data/geany.glade.h:39
-#, fuzzy
msgid "Saves the window size and restores it at the start"
-msgstr ""
-"Salva la posizione e la geometria della finestra e la ripristina all'avvio"
+msgstr "Salva la dimensione della finestra e la ripristina all'avvio"
#: ../data/geany.glade.h:40
-#, fuzzy
msgid "Save window position"
-msgstr "Salva posizione e geometria della finestra"
+msgstr "Salva posizione finestra"
#: ../data/geany.glade.h:41
-#, fuzzy
msgid "Saves the window position and restores it at the start"
-msgstr ""
-"Salva la posizione e la geometria della finestra e la ripristina all'avvio"
+msgstr "Salva la posizione della finestra e la ripristina all'avvio"
#: ../data/geany.glade.h:42
msgid "Confirm exit"
@@ -3856,26 +3850,24 @@ msgid "Failed to load one or more session files."
msgstr "Caricamento di uno o più file della sessione non riuscito."
#: ../src/libmain.c:122
-#, fuzzy
msgid ""
"Set initial column number to COLUMN for the first opened file (useful in "
"conjunction with --line)"
msgstr ""
-"Imposta il numero iniziale di colonna per il primo file aperto (utile "
-"insieme all'opzione --line)"
+"Imposta il numero iniziale a COLONNA per il primo file aperto (utile insieme "
+"all'opzione --line)"
#: ../src/libmain.c:122
msgid "COLUMN"
-msgstr ""
+msgstr "COLONNA"
#: ../src/libmain.c:123
-#, fuzzy
msgid "Use alternate configuration directory DIR"
-msgstr "Imposta una cartella di configurazione alternativa"
+msgstr "Utilizza cartella di configurazione alternativa DIR"
#: ../src/libmain.c:123
msgid "DIR"
-msgstr ""
+msgstr "DIR"
#: ../src/libmain.c:124
msgid "Print internal filetype names"
@@ -3896,28 +3888,28 @@ msgstr ""
"nuova istanza"
#: ../src/libmain.c:129
-#, fuzzy
msgid ""
"Use socket filename FILE for communication with a running Geany instance"
-msgstr "Usare questo socket per comunicare con un'istanza avviata di Geany"
+msgstr ""
+"Usa socket nome file FILE per comunicare con un'istanza in esecuzione di "
+"Geany"
#: ../src/libmain.c:129 ../src/libmain.c:143
msgid "FILE"
-msgstr ""
+msgstr "FILE"
#: ../src/libmain.c:130
msgid "Return a list of open documents in a running Geany instance"
msgstr ""
"Ritorna una lista di documenti aperti in un istanza Geany in esecuzione"
#: ../src/libmain.c:132
-#, fuzzy
msgid "Set initial line number to LINE for the first opened file"
-msgstr "Imposta il numero di riga iniziale per il primo file aperto"
+msgstr "Imposta il numero di riga iniziale a RIGA per il primo file aperto"
#: ../src/libmain.c:132
msgid "LINE"
-msgstr ""
+msgstr "RIGA"
#: ../src/libmain.c:133
msgid "Don't show message window at startup"
@@ -3951,7 +3943,7 @@ msgstr "Non caricare il supporto del terminale"
#: ../src/libmain.c:143
msgid "Use FILE as the dynamically-linked VTE library"
-msgstr ""
+msgstr "Usa FILE come libreria VTE dinamicamente collegata"
#: ../src/libmain.c:145
msgid "Be verbose"
@@ -3966,13 +3958,12 @@ msgid "[FILES...]"
msgstr "[FILE...]"
#: ../src/libmain.c:538
-#, fuzzy
msgid "A fast and lightweight IDE."
-msgstr "Un IDE veloce e leggero"
+msgstr "Un IDE veloce e leggero."
#: ../src/libmain.c:539
msgid "Report bugs to https://github.com/geany/geany/issues."
-msgstr ""
+msgstr "Notifica bug a https://github.com/geany/geany/issues."
#. note for translators: library versions are printed after this
#: ../src/libmain.c:572
@@ -4083,9 +4074,8 @@ msgid "Open in New _Window"
msgstr "Apri in _nuova finestra"
#: ../src/notebook.c:502
-#, fuzzy
msgid "Close Documents to the _Right"
-msgstr "Sposta il documento a destra"
+msgstr "Chiudi i documenti a _destra"
#: ../src/plugins.c:233
#, c-format
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).