Commits May 2007

commits@lists.geany.org

3 participants
94 discussions

SF.net SVN: geany: [1518] trunk/po
by eht16＠users.sourceforge.net 10 May '07

10 May '07

Revision: 1518 http://svn.sourceforge.net/geany/?rev=1518&view=rev Author: eht16 Date: 2007-05-10 07:52:48 -0700 (Thu, 10 May 2007) Log Message: ----------- Update of Spanish translation (Thanks to Dami?\195?\161n Viano) Update of simply Chinese translation (Thanks to Dormouse Young) Modified Paths: -------------- trunk/po/ChangeLog trunk/po/es.po trunk/po/zh_CN.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2007-05-09 11:23:50 UTC (rev 1517) +++ trunk/po/ChangeLog 2007-05-10 14:52:48 UTC (rev 1518) @@ -1,3 +1,10 @@ +2007-05-10 Enrico Tröger <enrico.troeger(a)uvena.de> + + * es.po: Update of Spanish translation (Thanks to Damián Viano) + * zh_CN.po: Update of simply Chinese translation + (Thanks to Dormouse Young) + + 2007-05-08 Enrico Tröger <enrico.troeger(a)uvena.de> * geany.pot: Update of catalog @@ -45,7 +52,7 @@ 2007-02-12 Frank Lanitz <frank(a)frank.uvena.de> - * es.po: Update of Spanish translation (Thanks to Damian Viano) + * es.po: Update of Spanish translation (Thanks to Damián Viano) * fi.po: Update of Finnish translation (Thanks to Harri Koskinen) @@ -112,7 +119,7 @@ 2006-12-18 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Fixed a typo (Thanks to Enrico for reporting) - * es.po: Update of Spanish translation (Thanks to Damian Viano and + * es.po: Update of Spanish translation (Thanks to Damián Viano and Nacho Cabanes) * vi.po: Update of Vietnamese translation (Thanks to Clytie Siddall) @@ -121,7 +128,7 @@ * ca.po, fr.po, hu.po: Small updates * de.po: Update of German translation - * es.po: Update of Spanish translation (Thanks to Damian Viano and + * es.po: Update of Spanish translation (Thanks to Damián Viano and Nacho Cabanes) Modified: trunk/po/es.po =================================================================== --- trunk/po/es.po 2007-05-09 11:23:50 UTC (rev 1517) +++ trunk/po/es.po 2007-05-10 14:52:48 UTC (rev 1518) @@ -1,7 +1,7 @@ # Spanish translation file for geany -# Copyright (C) 2006 Damián Viano <dviano(a)fi.uba.ar> +# Copyright (C) 2006 Damián Viano <des(a)damianv.com.ar> # This file is distributed under the same license as the geany package. -# Damián Viano <dviano(a)fi.uba.ar>, 2006, 2007. +# Damián Viano <des(a)damianv.com.ar>, 2006, 2007. # msgid "" msgstr "" @@ -9,7 +9,7 @@ "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-08 18:32+0200\n" "PO-Revision-Date: 2006-09-29 00:05+0100\n" -"Last-Translator: Damián Viano <dviano(a)fi.uba.ar>\n" +"Last-Translator: Damián Viano <des(a)damianv.com.ar>\n" "Language-Team: Spanish <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,9 +80,9 @@ "herramienta de terminal en las Preferencias" #: src/build.c:204 src/build.c:616 src/build.c:667 -#, fuzzy, c-format +#, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" -msgstr "Fallo al ejecutar %s (el guión de inicio no pudo ser creado)" +msgstr "Fallo al ejecutar \"%s\" (el guión de inicio no pudo ser creado)" #: src/build.c:232 src/build.c:497 src/build.c:765 src/search.c:1175 #, c-format @@ -90,9 +90,8 @@ msgstr "Falló el proceso (%s)" #: src/build.c:349 src/build.c:572 -#, fuzzy msgid "Command stopped because the current file has no extension." -msgstr "Convertir mayúsculas/minúsculas de la selección actual" +msgstr "Comando detenido porque el archivo actual no tiene extención." #: src/build.c:373 #, c-format @@ -217,9 +216,8 @@ msgstr "Ver Archivo DVI" #: src/build.c:1193 src/build.c:1206 -#, fuzzy msgid "Compile and view the current file" -msgstr "Compila y muestra el archivo actual" +msgstr "Compilar y muestrar el archivo actual" #. PDF view #: src/build.c:1202 @@ -342,14 +340,14 @@ msgstr "El archivo '%s' ya existe. ¿Quiere sobreescribirlo?" #: src/callbacks.c:1218 -#, fuzzy, c-format +#, c-format msgid "Forward declaration \"%s\" not found." -msgstr "Declaración de \"%s()\" no encontrada" +msgstr "Declaración de \"%s\" no encontrada" #: src/callbacks.c:1220 -#, fuzzy, c-format +#, c-format msgid "Definition of \"%s\" not found." -msgstr "Definición de \"%s()\" no encontrada" +msgstr "Definición de \"%s\" no encontrada" #: src/callbacks.c:1441 src/callbacks.c:1465 msgid "" @@ -631,9 +629,9 @@ msgstr "El archivo %s fue cerrado." #: src/document.c:463 -#, fuzzy, c-format +#, c-format msgid "New file \"%s\" opened." -msgstr "Nuevo archivo abierto" +msgstr "Nuevo archivo \"%s\" abierto." #: src/document.c:616 src/document.c:927 #, c-format @@ -641,7 +639,7 @@ msgstr "No se pudo abrir el archivo %s (%s)" #: src/document.c:635 -#, fuzzy, c-format +#, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " "can occur if the file contains a NULL byte. Be aware that saving it can " @@ -649,7 +647,8 @@ "The file was set to read-only." msgstr "" "El archivo \"%s\" no pudo ser abierto adecuadamente y probablemente fue " -"recortado. Esté consciente de que grabarlo puede provocar perdida de datos.\n" +"recortado. Esto puede ocurrir si el archivo contiene un byte NULL. Esté " +"consciente de que grabarlo puede provocar perdida de datos.\n" "El archivo fue abierto como sólo lectura." #: src/document.c:659 @@ -722,9 +721,9 @@ msgstr "No se encontraron coincidencias." #: src/document.c:1262 src/document.c:1269 -#, fuzzy, c-format +#, c-format msgid "%s: replaced %d occurrence(s) of \"%s\" with \"%s\"." -msgstr "%s: se reemplazaron %d ocurrencias de \"%s\" con \"%s\"." +msgstr "%s: se reemplazaron %d ocurrencia(s) de \"%s\" con \"%s\"." #: src/document.c:1646 msgid "Win (CRLF)" @@ -750,9 +749,9 @@ "%s" #: src/document.c:1766 -#, fuzzy, c-format +#, c-format msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "La impresión de \"%s\" ha fallado (código de retorno: %d)." +msgstr "La impresión de \"%s\" ha fallado (código de retorno: %s)." #: src/document.c:1772 #, c-format @@ -929,9 +928,8 @@ msgstr "Archivo de fuente PHP" #: src/filetypes.c:276 -#, fuzzy msgid "Javascript source file" -msgstr "Archivo de fuente Java" +msgstr "Archivo de fuente Javascript" #: src/filetypes.c:289 msgid "Python source file" @@ -946,18 +944,16 @@ msgstr "Archivo de fuente Tcl" #: src/filetypes.c:328 -#, fuzzy msgid "Lua source file" -msgstr "Archivo de fuente LaTeX" +msgstr "Archivo de fuente Lua" #: src/filetypes.c:341 msgid "Ferite source file" msgstr "Archivo de fuente Ferite" #: src/filetypes.c:354 -#, fuzzy msgid "Haskell source file" -msgstr "Archivo de fuente Pascal" +msgstr "Archivo de fuente Haskell" #: src/filetypes.c:367 msgid "Shell script file" @@ -1017,7 +1013,7 @@ #: src/filetypes.c:857 src/win32.c:78 msgid "All Source" -msgstr "" +msgstr "Todo codigo fuente" #: src/geany.h:50 msgid "untitled" @@ -1043,9 +1039,8 @@ msgstr "invisible" #: src/interface.c:313 src/interface.c:2010 -#, fuzzy msgid "Open Selected F_ile" -msgstr "Abrir archivo" +msgstr "Abrir Archivo Selecc_ionado" #: src/interface.c:317 msgid "Recent _Files" @@ -1065,11 +1060,11 @@ #: src/interface.c:370 msgid "Load Ta_gs" -msgstr "" +msgstr "Cargar Ta_gs" #: src/interface.c:373 msgid "Load global tags file" -msgstr "" +msgstr "Carga un archivo de tags global" #: src/interface.c:392 msgid "Prints the current file" @@ -1125,7 +1120,7 @@ #: src/interface.c:505 src/interface.c:2051 msgid "Du_plicate Line or Selection" -msgstr "Duplicar Línea o Selección" +msgstr "Du_plicar Línea o Selección" #: src/interface.c:514 src/interface.c:2060 msgid "_Increase Indent" @@ -1136,9 +1131,8 @@ msgstr "_Decrementar sangría" #: src/interface.c:535 src/interface.c:2081 -#, fuzzy msgid "_Send Selection to" -msgstr "En la Se_lección" +msgstr "Mandar _Selección a" #: src/interface.c:550 msgid "_Insert \"include <...>\"" @@ -1190,16 +1184,14 @@ "Inserta un aviso de licencia GPL (debería agregarse al principio del archivo)" #: src/interface.c:600 -#, fuzzy msgid "Insert BSD License Notice" -msgstr "Insertar aviso de licencia GPL" +msgstr "Insertar aviso de licencia BSD" #: src/interface.c:603 src/interface.c:2149 -#, fuzzy msgid "" "Inserts a BSD licence notice (should be done at the beginning of the file)" msgstr "" -"Inserta un aviso de licencia GPL (debería agregarse al principio del archivo)" +"Inserta un aviso de licencia BSD (debería agregarse al principio del archivo)" #: src/interface.c:605 src/interface.c:2151 msgid "Insert Dat_e" @@ -1226,18 +1218,16 @@ msgstr "_Reemplazar" #: src/interface.c:664 -#, fuzzy msgid "Find _Selected" -msgstr "Buscar _Sigiuente" +msgstr "Buscar _Selección" #: src/interface.c:668 -#, fuzzy msgid "Find Pre_v Selected" -msgstr "Buscar _Sigiuente" +msgstr "Buscar Selección Pre_v" #: src/interface.c:677 msgid "Next _Message" -msgstr "Próximo Mensaje" +msgstr "Próximo _Mensaje" #: src/interface.c:686 msgid "_Go to Line" @@ -1253,7 +1243,7 @@ #: src/interface.c:715 src/keybindings.c:173 msgid "Toggle all additional widgets" -msgstr "" +msgstr "Mostrar/Esconder todos los paneles accesorios" #: src/interface.c:719 msgid "Full_screen" @@ -1281,7 +1271,7 @@ #: src/interface.c:740 msgid "Show _Markers Margin" -msgstr "Muestra los _Marcadores de Margenes" +msgstr "Muestra las _Marcas de Margenes" #: src/interface.c:743 msgid "" @@ -1383,7 +1373,7 @@ #: src/interface.c:876 msgid "Remove _Markers" -msgstr "" +msgstr "Borrar _Marcas" #: src/interface.c:880 msgid "Remove Error _Indicators" @@ -1394,24 +1384,20 @@ msgstr "Borra todos los indicadores de errores en el documento actual." #: src/interface.c:885 -#, fuzzy msgid "_Project" -msgstr "Archivos recientes" +msgstr "_Proyecto" #: src/interface.c:892 -#, fuzzy msgid "_New" -msgstr "Nuevo" +msgstr "_Nuevo" #: src/interface.c:900 -#, fuzzy msgid "_Open" -msgstr "Abrir" +msgstr "_Abrir" #: src/interface.c:908 -#, fuzzy msgid "_Close" -msgstr "Cerrar" +msgstr "_Cerrar" #: src/interface.c:929 msgid "_Tools" @@ -1419,7 +1405,7 @@ #: src/interface.c:936 msgid "_Colour Chooser" -msgstr "Selector de Color" +msgstr "Selector de _Color" #: src/interface.c:939 src/interface.c:1064 msgid "" @@ -1444,7 +1430,7 @@ #: src/interface.c:954 msgid "_Help" -msgstr "Ayuda" +msgstr "A_yuda" #: src/interface.c:965 msgid "_Keyboard Shortcuts" @@ -1583,9 +1569,8 @@ msgstr "Insertar Comentarios" #: src/interface.c:2146 -#, fuzzy msgid "Insert BSD license Notice" -msgstr "Insertar aviso de licencia GPL" +msgstr "Insertar aviso de licencia BSD" #: src/interface.c:2170 src/keybindings.c:287 msgid "Find Usage" @@ -1600,9 +1585,8 @@ msgstr "Ir a la Declaración del Tag" #: src/interface.c:2186 src/keybindings.c:293 -#, fuzzy msgid "Context Action" -msgstr "En la Se_lección" +msgstr "Acción contextual" #: src/interface.c:2195 msgid "Go to Line" @@ -1699,33 +1683,31 @@ #: src/interface.c:2717 msgid "Context Action command:" -msgstr "" +msgstr "Comando de Acción Contextual:" #: src/interface.c:2724 #, c-format msgid "" "Context action command. The current selected word can be used with %s. It " "can be everywhere in the given command and will be replaced before execution." -msgstr "" +msgstr "Comando de acción contextual. La palabra actualmente seleccionada puede ser usada con %s. " +"Puede estar en cualquier lugar del comando dado y será remplazada antes de la ejecución." #: src/interface.c:2727 -#, fuzzy msgid "Context Action" -msgstr "Ubicación:" +msgstr "Acción Contextual" #: src/interface.c:2747 -#, fuzzy msgid "Project files:" -msgstr "Archivos recientes" +msgstr "Archivos del proyecto:" #: src/interface.c:2760 msgid "Path to start in when opening project files" -msgstr "" +msgstr "Ruta a iniciar cuando se abran archivos de proyectos" #: src/interface.c:2773 -#, fuzzy msgid "Paths" -msgstr "Rutas a las herramientas" +msgstr "Rutas" #: src/interface.c:2778 msgid "General" @@ -1744,9 +1726,8 @@ msgstr "Mostrar la lista de archivos abiertos" #: src/interface.c:2809 -#, fuzzy msgid "Toggle the open files list on and off" -msgstr "Mostrar/ocultar la lista de símbolos" +msgstr "Mostrar/ocultar la lista de archivos abiertos" #: src/interface.c:2812 msgid "Sidebar" @@ -1811,18 +1792,16 @@ msgstr "Ubicación de la tabulación" #: src/interface.c:2974 -#, fuzzy msgid "Show statusbar" -msgstr "Mostrar Barra de Herramientas" +msgstr "Mostrar Barra de Estado" #: src/interface.c:2977 msgid "Whether to show the status bar at the bottom of the main window." -msgstr "" +msgstr "Si mostrar la Barra de Estado debajo de la ventana principal." #: src/interface.c:2979 -#, fuzzy msgid "Miscellaneous" -msgstr "Misc." +msgstr "Miscelaneos" #: src/interface.c:2984 msgid "Interface" @@ -2097,25 +2076,25 @@ msgstr "Marcador de líneas largas" #: src/interface.c:3492 -#, fuzzy msgid "Auto indentation mode:" -msgstr "Usar formateo de código automático" +msgstr "Modo de formateo de código automático" #: src/interface.c:3499 msgid "" "Selects the indentation mode. Use None to disable auto indentation " "completely. Basic indents new lines with the same indentation as the " "previous line. Advanced does the same and indents also curly brackets." -msgstr "" +msgstr "Selecciona el modo de formateo de código. Usar Ninguno para deshabilitar " +"el formateo automático del todo. Básico formatea las lineas nuevas con el mismo nivel " +"que la linea anterior. Avanzado hace lo mismo y además formatea las llaves." #: src/interface.c:3505 -#, fuzzy msgid "Basic" -msgstr "Báltico" +msgstr "Básico" #: src/interface.c:3506 msgid "Advanced" -msgstr "" +msgstr "Avanzado" #: src/interface.c:3508 msgid "Line wrapping" @@ -2152,23 +2131,25 @@ #: src/interface.c:3531 msgid "Disable Drag and Drop" -msgstr "" +msgstr "Desactivar Arrastrar y Soltar (Drag and Drop)" #: src/interface.c:3534 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window." -msgstr "" +msgstr "Desactivar arrastrar y soltar completamente en la ventana del editor así no " +"podrá arrastrar o soltar ninguna selección dentro o hacia afuera de la ventana del editor." #: src/interface.c:3537 msgid "Use tabs when inserting whitespace" -msgstr "" +msgstr "Usar tabulaciones cuando se inserten espacios en blanco" #: src/interface.c:3540 msgid "" "Whenever some whitespace is inserted by Geany it will use tabs when enabled " "otherwise Geany will use just spaces." -msgstr "" +msgstr "Usar tabulaciones cuando algún espacio en blanco sea insertado por " +"Geany, de otra manera se usan simplemente espacios" #: src/interface.c:3543 msgid "Features" @@ -2193,15 +2174,15 @@ "Compleción automática de etiquetas XML abiertas (incluye etiquetas HTML)" #: src/interface.c:3574 -#, fuzzy msgid "Symbol autocompletion" -msgstr "Compleción automática de construcciones" +msgstr "Compleción automática de simbolos" #: src/interface.c:3577 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" -msgstr "" +msgstr "Compleción automática de símbolos conocidos en archivos abiertos (nombres de funciones, " +"variables globales, ...)" #: src/interface.c:3588 msgid "Rows of autocompletion list:" @@ -2371,18 +2352,16 @@ msgstr "Abrir" #: src/keybindings.c:126 -#, fuzzy msgid "Open selected file" -msgstr "Archivos" +msgstr "Abrir archivos seleccionados" #: src/keybindings.c:128 msgid "Save" msgstr "Guardar" #: src/keybindings.c:130 -#, fuzzy msgid "Save as" -msgstr "Guardar todo" +msgstr "Guardar como" #: src/keybindings.c:134 msgid "Print" @@ -2401,9 +2380,8 @@ msgstr "Recargar archivo" #: src/keybindings.c:142 -#, fuzzy msgid "Project properties" -msgstr "Propiedades" +msgstr "Propiedades del proyecto" #: src/keybindings.c:145 msgid "Undo" @@ -2430,14 +2408,12 @@ msgstr "Buscar Anterior" #: src/keybindings.c:160 -#, fuzzy msgid "Find Next Selection" -msgstr "En la Se_lección" +msgstr "Buscar Siguiente Selección" #: src/keybindings.c:162 -#, fuzzy msgid "Find Previous Selection" -msgstr "Buscar Anterior" +msgstr "Buscar Anterior Selección" #: src/keybindings.c:164 src/search.c:413 msgid "Replace" @@ -2536,9 +2512,8 @@ msgstr "Ir a la VTE" #: src/keybindings.c:226 -#, fuzzy msgid "Switch to Search Bar" -msgstr "Ir al Borrador" +msgstr "Ir a la Barra de Busqueda" #: src/keybindings.c:228 msgid "Switch to left document" @@ -2549,9 +2524,8 @@ msgstr "Ir al documento de la der." #: src/keybindings.c:232 -#, fuzzy msgid "Switch to last used document" -msgstr "Ir al documento de la izq." +msgstr "Ir al último documento usado" #: src/keybindings.c:235 msgid "Duplicate line or selection" @@ -2586,37 +2560,32 @@ msgstr "Decrementar sangría" #: src/keybindings.c:251 -#, fuzzy msgid "Send to Custom Command 1" -msgstr "Configurar Formato de Fecha Personalizado" +msgstr "Enviar al Comando Personalizado 1" #: src/keybindings.c:253 -#, fuzzy msgid "Send to Custom Command 2" -msgstr "Configurar Formato de Fecha Personalizado" +msgstr "Enviar al Comando Personalizado 2" #: src/keybindings.c:255 -#, fuzzy msgid "Send to Custom Command 3" -msgstr "Configurar Formato de Fecha Personalizado" +msgstr "Enviar al Comando Personalizado 3" #: src/keybindings.c:258 msgid "Goto matching brace" msgstr "Ir a la llave correspondiente" #: src/keybindings.c:261 -#, fuzzy msgid "Toggle marker" -msgstr "Marcador de líneas largas:" +msgstr "Activar/Desactivar marca" #: src/keybindings.c:264 -#, fuzzy msgid "Goto next marker" -msgstr "Marcador de líneas largas:" +msgstr "Ir a la siguiente marca" #: src/keybindings.c:267 msgid "Goto previous marker" -msgstr "" +msgstr "Ir a la marca anterior" #: src/keybindings.c:270 msgid "Complete word" @@ -2632,23 +2601,20 @@ #. has special callback #: src/keybindings.c:276 -#, fuzzy msgid "Complete construct" -msgstr "Completar palabra" +msgstr "Completar construcción" #: src/keybindings.c:278 -#, fuzzy msgid "Suppress construct completion" -msgstr "Evitar completado automático" +msgstr "Evitar completado de contrucciones" #: src/keybindings.c:281 -#, fuzzy msgid "Select current word" -msgstr "Grabar el archivo actual" +msgstr "Seleccionar palabra actual" #: src/keybindings.c:284 msgid "Insert alternative whitespace" -msgstr "" +msgstr "Insertar espacio en blanco alternativo" #: src/keybindings.c:289 msgid "Go to tag definition" @@ -2659,71 +2625,62 @@ msgstr "Ir a la declaración del tag" #: src/keybindings.c:460 -#, fuzzy msgid "File menu\n" -msgstr "Ubicación de la tabulación" +msgstr "Menu Archivo\n" #: src/keybindings.c:464 -#, fuzzy msgid "" "\n" "Edit menu\n" -msgstr "Codificación" +msgstr "\nMenu Editar\n" #: src/keybindings.c:468 -#, fuzzy msgid "" "\n" "Search menu\n" -msgstr "Apariencia" +msgstr "\nMenu Buscar\n" #: src/keybindings.c:472 -#, fuzzy msgid "" "\n" "View menu\n" -msgstr "Archivos nuevos" +msgstr "\nMenu Ver\n" #: src/keybindings.c:476 -#, fuzzy msgid "" "\n" "Document menu\n" -msgstr "Compleción automática:" +msgstr "\nMenu Documento\n" #: src/keybindings.c:480 -#, fuzzy msgid "" "\n" "Build menu\n" -msgstr "Barra lateral" +msgstr "\nMenu Construir\n" #: src/keybindings.c:484 -#, fuzzy msgid "" "\n" "Tools menu\n" -msgstr "Rutas a las herramientas" +msgstr "\nMenu Herramientas\n" #: src/keybindings.c:488 -#, fuzzy msgid "" "\n" "Focus commands\n" -msgstr "Fuentes" +msgstr "\nComandos de foco\n" #: src/keybindings.c:492 msgid "" "\n" "Editing commands\n" -msgstr "" +msgstr "\nComandos de edición\n" #: src/keybindings.c:496 -#, fuzzy msgid "" "\n" "Tag commands\n" -msgstr "Ubicación de la tabulación" +msgstr "\nComandos de marcas\n" #: src/keybindings.c:518 msgid "Keyboard shortcuts" @@ -2747,11 +2704,10 @@ msgstr "Error al cargar uno o más archivos de la sesión." #: src/main.c:94 -#, fuzzy msgid "" "set initial column number for the first opened file (useful in conjunction " "with --line)" -msgstr "seleccione el número inicial para el primer archivo abierto" +msgstr "selecciona el número inicial de colúmna para el primer archivo abierto (útil en conjunto con --line)" #: src/main.c:95 msgid "use an alternate configuration directory" @@ -2762,9 +2718,8 @@ msgstr "corre en modo de depuración (significa ser verborrajico)" #: src/main.c:97 -#, fuzzy msgid "generate global tags file (see documentation)" -msgstr "no cargar los datos de compleción automática (ver la documentación)" +msgstr "generar archivo global de tags (ver la documentación)" #: src/main.c:100 msgid "don't open files in a running instance, force opening a new instance" @@ -2821,9 +2776,9 @@ "¿Iniciar Geany de todas formas?" #: src/main.c:559 src/socket.c:143 -#, fuzzy, c-format +#, c-format msgid "Could not find file '%s'." -msgstr "No se pudo encontrar la imagen: %s" +msgstr "No se pudo encontrar el archivo '%s'." #: src/main.c:688 #, c-format @@ -2833,7 +2788,7 @@ #: src/main.c:690 #, c-format msgid "Configuration directory could not be created (%s)." -msgstr "La carpeta de configuración no pudo ser creada (%s)." +msgstr "El directorio de configuración no pudo ser creada (%s)." #: src/msgwindow.c:112 msgid "Status messages" @@ -2869,159 +2824,145 @@ #. "projects" is part of the default project base path so be careful when translating #. please avoid special characters and spaces, look at the source for details or ask Frank #: src/project.c:85 -#, fuzzy msgid "projects" -msgstr "Make object" +msgstr "proyectos" #: src/project.c:105 -#, fuzzy msgid "New Project" -msgstr "Archivos recientes" +msgstr "Nuevo Proyecto" #: src/project.c:112 -#, fuzzy msgid "C_reate" -msgstr "Carácter" +msgstr "C_rear" #: src/project.c:126 src/project.c:336 -#, fuzzy msgid "Name:" -msgstr "Make:" +msgstr "Nómbre:" #: src/project.c:138 src/project.c:348 -#, fuzzy msgid "Filename:" -msgstr "Vietnamita" +msgstr "Nombre de Archivo:" #: src/project.c:158 src/project.c:377 msgid "Base path:" -msgstr "" +msgstr "Ruta base:" #: src/project.c:166 msgid "" "Base directory of all files that make up the project. This can be a new " "path, or an existing directory tree." -msgstr "" +msgstr "Directorio base de todos los archivos que componen este proyecto. Esta " +"puede ser una ruta nueva o un árbol de directorios ya existente." #: src/project.c:220 src/project.c:809 -#, fuzzy, c-format +#, c-format msgid "Project file \"%s\" could not be loaded." -msgstr "El proceso no pudo ser detenido (%s)." +msgstr "El archivo de proyecto \"%s\" no pudo ser cargado." #: src/project.c:244 src/project.c:252 -#, fuzzy msgid "Open Project" -msgstr "Make object" +msgstr "Abrir Proyecto" #: src/project.c:271 -#, fuzzy msgid "Project files" -msgstr "Archivos recientes" +msgstr "Archivos del proyecto" #: src/project.c:292 -#, fuzzy, c-format +#, c-format msgid "Project \"%s\" closed." -msgstr "El archivo %s fue cerrado." +msgstr "Proyecto \"%s\" cerrado." #: src/project.c:323 -#, fuzzy msgid "Project Properties" -msgstr "Propiedades" +msgstr "Propiedades del Proyecto" #: src/project.c:360 -#, fuzzy msgid "Description:" -msgstr "Creación de DVI:" +msgstr "Descripción:" #: src/project.c:385 msgid "Directory to run Make All from. Leave blank to use the default command." -msgstr "" +msgstr "Directorio desde el cual correr Make All. Dejar en blanco para usar el comando por defecto." #: src/project.c:399 -#, fuzzy msgid "Run command:" -msgstr "Comando de impresión:" +msgstr "Comando de ejecución:" #: src/project.c:407 msgid "" "Command-line to run in the project base directory. Options can be appended " "to the command. Leave blank to use the default run command." -msgstr "" +msgstr "Linea de comandos a correr en la ruta base del proyecto. Opciones pueden ser " +"agregadas al comando. Dejar en blanco para usar el comando por defecto." #: src/project.c:423 -#, fuzzy msgid "File patterns:" -msgstr "_Cercano Oriente" +msgstr "Patrones de archivos:" #: src/project.c:503 -#, fuzzy msgid "Do you want to close it before proceeding?" -msgstr "¿Quiere guardarlo antes de cerrar?" +msgstr "¿Quiere cerrarlo antes de proceder?" #: src/project.c:504 #, c-format msgid "The '%s' project is already open. " -msgstr "" +msgstr "El proyecto '%s' ya está abierto. " #: src/project.c:532 msgid "The specified project name is too short." -msgstr "" +msgstr "El nombre de proyecto especificado es muy corto." #: src/project.c:538 #, c-format msgid "The specified project name is too long (max. %d characters)." -msgstr "" +msgstr "El nombre de proyecto especificado es muy largo (máx. %d carácteres)." #: src/project.c:546 msgid "You have specified an invalid project filename." -msgstr "" +msgstr "Ha especificado un nombre de archivo de proyecto inválido." #: src/project.c:558 msgid "Create the project's base path directory?" -msgstr "" +msgstr "¿Crear el directorio de la ruta base del proyecto?" #: src/project.c:559 -#, fuzzy, c-format +#, c-format msgid "The path \"%s\" does not exist." -msgstr "El archivo \"%s\" no es %s válido." +msgstr "La ruta \"%s\" no existe." #: src/project.c:577 -#, fuzzy msgid "Project file could not be written." -msgstr "El proceso no pudo ser detenido (%s)." +msgstr "El archivo de proyecto no pudo ser escrito." #: src/project.c:627 -#, fuzzy, c-format +#, c-format msgid "Project \"%s\" created." -msgstr "Propiedades" +msgstr "Proyecto \"%s\" creado." #: src/project.c:629 -#, fuzzy, c-format +#, c-format msgid "Project \"%s\" saved." -msgstr "Archivo %s guardado." +msgstr "Proyecto \"%s\" guardado." #. initialise the dialog #: src/project.c:673 src/project.c:684 -#, fuzzy msgid "Choose Project Filename" -msgstr "Archivos recientes" +msgstr "Elija el Nombre del archivo de Proyecto" #. initialise the dialog #: src/project.c:701 src/project.c:712 -#, fuzzy msgid "Choose Project Base Path" -msgstr "Archivos recientes" +msgstr "Elija la Ruta Base del Proyecto" #. initialise the dialog #: src/project.c:729 src/project.c:740 -#, fuzzy msgid "Choose Project Run Command" -msgstr "Archivos recientes" +msgstr "Elija el Comando de Ejecución del Proyecto" #: src/project.c:802 -#, fuzzy, c-format +#, c-format msgid "Project \"%s\" opened." -msgstr "Propiedades" +msgstr "Proyecto \"%s\" abierto." #: src/search.c:139 msgid "_Use regular expressions" @@ -3089,9 +3030,8 @@ msgstr "_Marcar" #: src/search.c:342 -#, fuzzy msgid "Mark all matches in the current document." -msgstr "Borra todos los indicadores de errores en el documento actual." +msgstr "Marcar todas las coincidencias en el documento actual." #: src/search.c:347 src/search.c:487 msgid "In Sessi_on" @@ -3135,7 +3075,7 @@ #: src/search.c:568 msgid "Directory:" -msgstr "Carpeta:" +msgstr "Directorio:" #: src/search.c:600 msgid "_Fixed strings" @@ -3155,7 +3095,7 @@ #: src/search.c:624 msgid "_Recurse in subfolders" -msgstr "" +msgstr "Operar _Recursivamente en los subdirectorios" #: src/search.c:640 msgid "_Invert search results" @@ -3169,11 +3109,11 @@ #: src/search.c:661 msgid "E_xtra options:" -msgstr "" +msgstr "Opciónes e_xtra:" #: src/search.c:673 msgid "Other options to pass to Grep" -msgstr "" +msgstr "Otras opciones a pasar a Grep" #: src/search.c:864 src/search.c:1388 src/search.c:1389 #, c-format @@ -3181,9 +3121,9 @@ msgstr "No se encontraron coincidencias para '%s'." #: src/search.c:866 src/search.c:1395 src/search.c:1396 -#, fuzzy, c-format +#, c-format msgid "Found %d matches for '%s'." -msgstr "No se encontraron coincidencias para '%s'." +msgstr "Se encontraron %d coincidencias para '%s'." #: src/search.c:984 #, c-format @@ -3203,12 +3143,12 @@ msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "No se pudo encontrar la herramienta grep '%s'; verifique la ruta en las " -"Preferencias" +"Preferencias." #: src/search.c:1189 -#, fuzzy, c-format +#, c-format msgid "%s %s -- %s (in directory: %s)" -msgstr "%s (en directorio: %s)" +msgstr "%s %s -- %s (en directorio: %s)" #: src/search.c:1250 #, c-format @@ -3220,9 +3160,9 @@ msgstr "Búsqueda fallida." #: src/search.c:1306 src/search.c:1307 -#, fuzzy, c-format +#, c-format msgid "Search completed with %d matches." -msgstr "Búsqueda completada." +msgstr "Búsqueda completada con %d coincidencias." #: src/support.c:90 src/support.c:114 #, c-format @@ -3355,12 +3295,12 @@ #: src/symbols.c:755 #, c-format msgid "Unknown filetype extension for \"%s\".\n" -msgstr "" +msgstr "Extención de archivo desconocide para \"%s\".\n" #: src/symbols.c:770 #, c-format msgid "Failed to create tags file.\n" -msgstr "" +msgstr "Fállo al crear el archivo de tags.\n" #: src/symbols.c:776 #, c-format @@ -3368,6 +3308,8 @@ "Usage: %s -g <Tag File> <File list>\n" "\n" msgstr "" +"Uso: %s -g <Archivo de Tags> <Lista de archivos>\n" +"\n" #: src/symbols.c:777 #, c-format @@ -3376,24 +3318,27 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" msgstr "" +"Ejemplo:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" #: src/symbols.c:791 msgid "Load Tags" -msgstr "" +msgstr "Cargar Tags" #: src/symbols.c:797 msgid "Geany tag files (*.tags)" -msgstr "" +msgstr "Archivos de tags de Geany (*.tags)" #: src/symbols.c:816 -#, fuzzy, c-format +#, c-format msgid "Loaded %s tags file '%s'." -msgstr "No se pudo encontrar la imagen: %s" +msgstr "Cargado %s archivo de tags '%s'." #: src/symbols.c:818 -#, fuzzy, c-format +#, c-format msgid "Could not load tags file '%s'." -msgstr "No se pudo encontrar la imagen: %s" +msgstr "No se pudo cargar el archivo de tags '%s'." #: src/tools.c:81 msgid "Special characters" @@ -3454,26 +3399,26 @@ #: src/tools.c:608 #, c-format msgid "Passing data and executing custom command: %s" -msgstr "" +msgstr "Pasando datos y ejecutando comando personalizado: %s" #: src/tools.c:660 src/tools.c:888 -#, fuzzy msgid "Set Custom Commands" -msgstr "Configurar Formato de Fecha Personalizado" +msgstr "Configurar Comandos Personalizados" #: src/tools.c:666 msgid "" "You can send the current selection to any of these commands and the output " "of the command replaces the current selection." -msgstr "" +msgstr "Puede enviar la selección actual a cualquiera de estos comandos y la salida " +"del comando remplaza la selección actual." #: src/tools.c:857 src/tools.c:861 msgid "No custom commands defined." -msgstr "" +msgstr "No hay comandos personalizados definidos." #: src/treeviews.c:126 msgid "No tags found" -msgstr "No se encontraron etiquetas" +msgstr "No se encontraron tags" #: src/treeviews.c:280 src/treeviews.c:332 msgid "Hide" @@ -3490,17 +3435,17 @@ #. Status bar statistics: col = column, sel = selection, RO = read-only, #. * OVR = overwrite/overtype, INS = insert, MOD = modified #: src/ui_utils.c:124 -#, fuzzy, c-format +#, c-format msgid "" "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s %" "s filetype: %s scope: %s" msgstr "" -"%c línea: % 4d columna: % 3d seleccion: % 4d %s modo: %s%s fun. " -"actual: %s codificación: %s %s tipo de archivo: %s" +"línea: %d\t columna: %d\t seleccion: %d\t %s %s modo: %s " +"codificación: %s %s tipo de archivo: %s vista: %s" #: src/ui_utils.c:128 msgid "RO " -msgstr "" +msgstr "SL" #: src/ui_utils.c:129 msgid "OVR" @@ -3512,7 +3457,7 @@ #: src/ui_utils.c:130 msgid "MOD" -msgstr "" +msgstr "MOD" #: src/ui_utils.c:210 #, c-format @@ -3544,14 +3489,12 @@ msgstr "Configurar Formato de Fecha Personalizado" #: src/ui_utils.c:1183 -#, fuzzy msgid "Select Folder" -msgstr "Seleccionar carpeta" +msgstr "Seleccionar Carpeta" #: src/ui_utils.c:1183 -#, fuzzy msgid "Select File" -msgstr "Seleccionar Todo" +msgstr "Seleccionar Archivo" #: src/utils.c:354 msgid "Do you want to reload it?" @@ -3625,13 +3568,12 @@ msgstr "Emulación de terminal:" #: src/vte.c:603 -#, fuzzy msgid "" "Controls how the terminal emulator should behave. Do not change this value " "unless you know exactly what you are doing." msgstr "" -"Controla cómo debe comportarse el emulador de terminal, xterm es un buen " -"inicio." +"Controla cómo debe comportarse el emulador de terminal. No cambiar esto a " +"menos que se sepa exactamente lo que se esta haciendo. " #: src/vte.c:605 msgid "Shell:" @@ -3701,9 +3643,8 @@ msgstr "Ejecutables" #: src/win32.c:108 -#, fuzzy msgid "Geany project files" -msgstr "Archivos recientes" +msgstr "Archivos de proyectos Geany" #: src/win32.c:500 msgid "Error" @@ -3720,229 +3661,3 @@ #: src/win32.c:518 msgid "Information" msgstr "Información" - -#~ msgid "Add the same indentation as the previous line after pressing enter" -#~ msgstr "Agregar la misma sangría que la línea anterior al presionar retorno" - -#, fuzzy -#~ msgid "" -#~ "There is already an open project \"%s\". Do you want to close it before " -#~ "proceed?" -#~ msgstr "" -#~ "El archivo '%s' no fue guardado.\n" -#~ "¿Quiere guardarlo antes de cerrar?" - -#~ msgid "Declaration of \"%s()\" not found" -#~ msgstr "Declaración de \"%s()\" no encontrada" - -#~ msgid "(Unsaved)" -#~ msgstr "(sin grabar)" - -#, fuzzy -#~ msgid "File location:" -#~ msgstr "Creación de PDF:" - -#~ msgid "" -#~ "You have opened too many files. There is a limit of %d concurrent open " -#~ "files." -#~ msgstr "" -#~ "Ha abierto demasiados archivos. Hay un límite de %d archivos abiertos a " -#~ "la vez." - -#~ msgid "Du_plicate Line" -#~ msgstr "Du_plicar línea" - -#~ msgid "Count _words" -#~ msgstr "C_ontar palabras" - -#~ msgid "Show _Colour Chooser" -#~ msgstr "Mostrar Selector de _Colores" - -#~ msgid "Find usage" -#~ msgstr "Encontrar uso" - -#~ msgid "Symbol list font" -#~ msgstr "Fuente de la lista de símbolos" - -#~ msgid "Message window font" -#~ msgstr "Fuente de la ventana de mensajes" - -#~ msgid "Sets the font for the editors windows" -#~ msgstr "Selecciona la fuente para las ventanas de edición" - -#~ msgid "Enter custom options for the make tool" -#~ msgstr "Ingresar opciones personalizadas para la herramienta make" - -#~ msgid "" -#~ "Range:\t\t%s\n" -#~ "\n" -#~ "Lines:\t\t%d\n" -#~ "Words:\t\t%d\n" -#~ "Characters:\t%d\n" -#~ msgstr "" -#~ "Rango:\t\t%s\n" -#~ "\n" -#~ "Líneas:\t\t%d\n" -#~ "Palabras:\t\t%d\n" -#~ "Carácteres:\t%d\n" - -#~ msgid "" -#~ "Enter here the (La)TeX command (for DVI creation) and some useful options." -#~ msgstr "" -#~ "Ingrese aquí el comando (La)TeX (para creación de DVI) y otras opciones " -#~ "útiles." - -#~ msgid "" -#~ "Enter here the (La)TeX command (for PDF creation) and some useful options." -#~ msgstr "" -#~ "Ingrese aquí el comando (La)TeX (para creación de PDF) y otras opciones " -#~ "útiles." - -#~ msgid "" -#~ "Enter here the (La)TeX command (for DVI preview) and some useful options." -#~ msgstr "" -#~ "Ingrese aquí el comando (La)TeX (para previsualizar DVI) y otras opciones " -#~ "útiles." - -#~ msgid "" -#~ "Enter here the (La)TeX command (for PDF preview) and some useful options." -#~ msgstr "" -#~ "Ingrese aquí el comando (La)TeX (para previsualizar PDF) y otras opciones " -#~ "útiles." - -#~ msgid "" -#~ "The document has been searched completely but the match \"%s\" was not " -#~ "found. Wrap search around the document?" -#~ msgstr "" -#~ "El patrón \"%s\" no fue encontrado. ¿Buscar dando vuelta al documento?" - -#~ msgid "Begin" -#~ msgstr "Principio" - -#~ msgid "Match only word s_tart" -#~ msgstr "Ocurrencias sólo al _inicio de la palabra" - -#~ msgid "" -#~ "Replaces the search text in all opened files. This option is only useful" -#~ "(and used) if you click on \"Replace All\"." -#~ msgstr "" -#~ "Reemplaza el texto buscado en todos los archivos abiertos. Esta opción " -#~ "sólo es útil si luego se selecciona \"Reemplazar todas\"." - -#~ msgid "_Don't close this dialog" -#~ msgstr "No cerrar esta ventana" - -#~ msgid "The dialog window won't be closed when you start the operation." -#~ msgstr "Esta ventana no será cerrada cuando se inicie la operación." - -#~ msgid "" -#~ "Geany is exiting because a named pipe was found. Mostly this means, Geany " -#~ "is already running. If you know Geany is not running, you can delete the " -#~ "file and start Geany anyway.\n" -#~ "Delete the named pipe and start Geany?" -#~ msgstr "" -#~ "Geany saldrá porque se encontró una tubería con nombre (named pipe). Esto " -#~ "probablemente significa que Geany ya está corriendo. Si está seguro que " -#~ "Geany no está corriendo puede borrar esa tubería e iniciar Geany de todas " -#~ "formas.\n" -#~ "Borrar la tubería nombrada e iniciar Geany?" - -#~ msgid "Inserts a typical ChangeLog entry in the current " -#~ msgstr "Inserta una entrada típica de ChangeLog en el archivo actual " - -#~ msgid "Build with \"make\"" -#~ msgstr "Contruir con \"make\"" - -#~ msgid "Build with make (custom target)" -#~ msgstr "Construye con make (objetivo personalizado)" - -#~ msgid "Enter the search text here:" -#~ msgstr "Ingrese el texto a buscar aquí:" - -#~ msgid "Enter the replace text here:" -#~ msgstr "Ingrese el texto de reemplazo aquí:" - -#~ msgid "" -#~ "Sets the includes and library paths for the compiler and the program " -#~ "arguments for execution\n" -#~ msgstr "" -#~ "Selecciona las rutas de inclusión y librerías para el compilador y los " -#~ "argumentos del programa para su ejecución\n" - -#~ msgid "Enter here arguments to your compiler." -#~ msgstr "Ingrese aquí argumentos para su compilador." - -#~ msgid "Enter here arguments to your linker." -#~ msgstr "Ingrese aquí argumentos para su enlazador." - -#~ msgid "Enter here arguments to your program." -#~ msgstr "Ingrese aquí argumentos para su programa." - -#~ msgid "PHP / HTML source file" -#~ msgstr "Archivo de fuente PHP / HTML" - -#~ msgid "" -#~ " VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on " -#~ "keystroke;scroll on output;follow path of file" -#~ msgstr "" -#~ " opciones de VTE: FUENTE;FRENTE;FONDO;historico;tipo;descender al " -#~ "presionar tecla;descender al haber salida;seguir ruta de archivo" - -#~ msgid "compilation finished unsuccessful" -#~ msgstr "la compilación terminó sin éxito" - -#~ msgid "Reloads the current file with the specified encoding" -#~ msgstr "Recarga el archivo actual con la codificación especificada" - -#~ msgid "Change _Selection" -#~ msgstr "Cambiar _Selección" - -#~ msgid "To lower-case" -#~ msgstr "A minúsculas" - -#~ msgid "To upper-case" -#~ msgstr "A mayúsculas" - -#~ msgid "Break the line at the window border and continue it on the next line" -#~ msgstr "" -#~ "Cortar la línea en el borde de la ventana y continuarla en la siguiente " -#~ "línea" - -#~ msgid "Change Selection" -#~ msgstr "Cambiar selección" - -#~ msgid "error: too many open files" -#~ msgstr "error: demasiados archivos abiertos" - -#~ msgid "Current directory: %s" -#~ msgstr "Directorio actual: %s" - -#~ msgid "Build with \"_make\" (custom _target)" -#~ msgstr "Construye con \"make\" (objetivo _personalizado)" - -#~ msgid "tag list updating failed" -#~ msgstr "fallo la actualización del archivo de etiquetas" - -#~ msgid "Build with \"make\" (custom target)" -#~ msgstr "Construye con \"make\" (objetivo personalizado)" - -#~ msgid "New (with template)" -#~ msgstr "Nuevo (desde plantilla)" - -#~ msgid "Change Font" -#~ msgstr "Cambiar Fuente" - -#~ msgid "Show Color Chooser" -#~ msgstr "Mostrar Selector de Colores" - -#~ msgid "Show messages window" -#~ msgstr "Mostrar ventana de mensajes" - -#~ msgid "Show Markers Margin" -#~ msgstr "Muestra los Marcadores de Margenes" - -#~ msgid "Show Line Numbers" -#~ msgstr "Mostrar Números de Línea" - -#~ msgid "Use auto indention" -#~ msgstr "Usar formateo automático de código" Modified: trunk/po/zh_CN.po =================================================================== --- trunk/po/zh_CN.po 2007-05-09 11:23:50 UTC (rev 1517) +++ trunk/po/zh_CN.po 2007-05-10 14:52:48 UTC (rev 1518) @@ -10,13 +10,12 @@ "Project-Id-Version: geany 0.11\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-08 18:32+0200\n" -"PO-Revision-Date: 2006-12-14 22:25+0800\n" +"PO-Revision-Date: 2007-05-09 23:05+0800\n" "Last-Translator: Dormouse Young <dormouse.young(a)gmail.com>\n" "Language-Team: Chinese Simplified <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" +"Content-Transfer-Encoding: 8bit" #: src/about.c:126 msgid "About Geany" @@ -81,7 +80,7 @@ msgstr "无法找到虚拟终端 '%s' (请检查在首选项中的设置)" #: src/build.c:204 src/build.c:616 src/build.c:667 -#, fuzzy, c-format +#, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "执行 %s 失败(开始代码无法创建)" @@ -91,9 +90,8 @@ msgstr "进程失败(%s)" #: src/build.c:349 src/build.c:572 -#, fuzzy msgid "Command stopped because the current file has no extension." -msgstr "选中文字大小写转换" +msgstr "命令中止因为当前文件没有扩展名。" #: src/build.c:373 #, c-format @@ -212,7 +210,6 @@ msgstr "查看DVI文件" #: src/build.c:1193 src/build.c:1206 -#, fuzzy msgid "Compile and view the current file" msgstr "编译并查看当前文件" @@ -332,14 +329,14 @@ msgstr "文件 '%s' 已存在。您要覆盖吗？" #: src/callbacks.c:1218 -#, fuzzy, c-format +#, c-format msgid "Forward declaration \"%s\" not found." -msgstr " \"%s()\" 的声明未找到" +msgstr " \"%s()\" 的声明未找到。" #: src/callbacks.c:1220 -#, fuzzy, c-format +#, c-format msgid "Definition of \"%s\" not found." -msgstr " \"%s()\" 的定义未找到" +msgstr " \"%s()\" 的定义未找到。" #: src/callbacks.c:1441 src/callbacks.c:1465 msgid "" @@ -607,9 +604,9 @@ msgstr "文件 %s 已关闭。" #: src/document.c:463 -#, fuzzy, c-format +#, c-format msgid "New file \"%s\" opened." -msgstr "新文件已打开。" +msgstr "新文件\"%s\"已打开。" #: src/document.c:616 src/document.c:927 #, c-format @@ -617,15 +614,15 @@ msgstr "无法打开文件 %s (%s)" #: src/document.c:635 -#, fuzzy, c-format +#, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " "can occur if the file contains a NULL byte. Be aware that saving it can " "cause data loss.\n" "The file was set to read-only." msgstr "" -"文件 \"%s\" 无法正确打开，如果保存该文件会导致数据丢失。\n" -"文件被设置为只读。" +"文件\"%s\"无法正确打开并已被截短。可以因为文件含有空字节。保存文件会导致数据丢失。\n" +"文件被设置为只读状态。" #: src/document.c:659 #, c-format @@ -695,7 +692,7 @@ msgstr "未找到匹配项。" #: src/document.c:1262 src/document.c:1269 -#, fuzzy, c-format +#, c-format msgid "%s: replaced %d occurrence(s) of \"%s\" with \"%s\"." msgstr "%s:替换了 %d 处，由\"%s\" 变为 \"%s\"。" @@ -723,9 +720,9 @@ "%s" #: src/document.c:1766 -#, fuzzy, c-format +#, c-format msgid "Printing of \"%s\" failed (return code: %s)." -msgstr "打印 \"%s\" 失败 (返回代码: %d)." +msgstr "打印 \"%s\" 失败 (返回代码: %s)。" #: src/document.c:1772 #, c-format @@ -902,9 +899,8 @@ msgstr "PHP 源文件" #: src/filetypes.c:276 -#, fuzzy msgid "Javascript source file" -msgstr "Java 源文件" +msgstr "Javascript 源文件" #: src/filetypes.c:289 msgid "Python source file" @@ -919,18 +915,16 @@ msgstr "Tcl 源文件" #: src/filetypes.c:328 -#, fuzzy msgid "Lua source file" -msgstr "LaTeX 源文件" +msgstr "Lua 源文件" #: src/filetypes.c:341 msgid "Ferite source file" msgstr "Ferite 源文件" #: src/filetypes.c:354 -#, fuzzy msgid "Haskell source file" -msgstr "Pascal 源文件" +msgstr "Haskell 源文件" #: src/filetypes.c:367 msgid "Shell script file" @@ -990,7 +984,7 @@ #: src/filetypes.c:857 src/win32.c:78 msgid "All Source" -msgstr "" +msgstr "所有源文件" #: src/geany.h:50 msgid "untitled" @@ -1016,9 +1010,8 @@ msgstr "不可见" #: src/interface.c:313 src/interface.c:2010 -#, fuzzy msgid "Open Selected F_ile" -msgstr "打开文件" +msgstr "打开选择的文件(_I)" #: src/interface.c:317 msgid "Recent _Files" @@ -1038,11 +1031,11 @@ #: src/interface.c:370 msgid "Load Ta_gs" -msgstr "" +msgstr "载入标记文件(_G)" #: src/interface.c:373 msgid "Load global tags file" -msgstr "" +msgstr "载入全局标记文件" #: src/interface.c:392 msgid "Prints the current file" @@ -1109,9 +1102,8 @@ msgstr "减少缩进(_D)" #: src/interface.c:535 src/interface.c:2081 -#, fuzzy msgid "_Send Selection to" -msgstr "在选中的文字中(_L)" +msgstr "发送选中的文字到(_S)" #: src/interface.c:550 msgid "_Insert \"include <...>\"" @@ -1162,15 +1154,13 @@ msgstr "插入GPL告知(在文件头部)" #: src/interface.c:600 -#, fuzzy msgid "Insert BSD License Notice" -msgstr "插入GPL告知" +msgstr "插入BSD许可公告" #: src/interface.c:603 src/interface.c:2149 -#, fuzzy msgid "" "Inserts a BSD licence notice (should be done at the beginning of the file)" -msgstr "插入GPL告知(在文件头部)" +msgstr "插入BSD许可公告(在文件头部)" #: src/interface.c:605 src/interface.c:2151 msgid "Insert Dat_e" @@ -1186,7 +1176,7 @@ #: src/interface.c:643 msgid "Find _Previous" -msgstr "查找上一个(_P_)" +msgstr "查找上一个(_P)" #: src/interface.c:647 msgid "Find in F_iles" @@ -1197,13 +1187,12 @@ msgstr "替换(_R)" #: src/interface.c:664 -#, fuzzy msgid "Find _Selected" -msgstr "查找下一个(_N)" +msgstr "查找选择的(_S)" #: src/interface.c:668 msgid "Find Pre_v Selected" -msgstr "" +msgstr "查找前一个选择的(_V)" #: src/interface.c:677 msgid "Next _Message" @@ -1223,7 +1212,7 @@ #: src/interface.c:715 src/keybindings.c:173 msgid "Toggle all additional widgets" -msgstr "" +msgstr "开头所有附加组件" #: src/interface.c:719 msgid "Full_screen" @@ -1350,7 +1339,7 @@ #: src/interface.c:876 msgid "Remove _Markers" -msgstr "" +msgstr "去除记号(_M)" #: src/interface.c:880 msgid "Remove Error _Indicators" @@ -1362,22 +1351,19 @@ #: src/interface.c:885 msgid "_Project" -msgstr "" +msgstr "项目(_P)" #: src/interface.c:892 -#, fuzzy msgid "_New" -msgstr "新建" +msgstr "新建(_N)" #: src/interface.c:900 -#, fuzzy msgid "_Open" -msgstr "打开" +msgstr "打开(_O)" #: src/interface.c:908 -#, fuzzy msgid "_Close" -msgstr "关闭" +msgstr "关闭(_C)" #: src/interface.c:929 msgid "_Tools" @@ -1547,9 +1533,8 @@ msgstr "插入注释" #: src/interface.c:2146 -#, fuzzy msgid "Insert BSD license Notice" -msgstr "插入GPL告知" +msgstr "插入BSD许可公告" #: src/interface.c:2170 src/keybindings.c:287 msgid "Find Usage" @@ -1564,9 +1549,8 @@ msgstr "跳转到标记说明" #: src/interface.c:2186 src/keybindings.c:293 -#, fuzzy msgid "Context Action" -msgstr "在选中的文字中(_L)" +msgstr "背景运行" #: src/interface.c:2195 msgid "Go to Line" @@ -1654,33 +1638,30 @@ #: src/interface.c:2717 msgid "Context Action command:" -msgstr "" +msgstr "背景运行命令:" #: src/interface.c:2724 #, c-format msgid "" "Context action command. The current selected word can be used with %s. It " "can be everywhere in the given command and will be replaced before execution." -msgstr "" +msgstr "背景运行命令。当前选中的文字可以和%s一起使用。它可以在给出的命令的任何地方，并且在执行前会被替换。" #: src/interface.c:2727 -#, fuzzy msgid "Context Action" -msgstr "位置:" +msgstr "背景运行" #: src/interface.c:2747 -#, fuzzy msgid "Project files:" -msgstr "属性" +msgstr "项目路径:" #: src/interface.c:2760 msgid "Path to start in when opening project files" -msgstr "" +msgstr "当打开项目时的路径" #: src/interface.c:2773 -#, fuzzy msgid "Paths" -msgstr "工具路径" +msgstr "路径" #: src/interface.c:2778 msgid "General" @@ -1699,9 +1680,8 @@ msgstr "显示打开的文件的列表" #: src/interface.c:2809 -#, fuzzy msgid "Toggle the open files list on and off" -msgstr "开关标记列表" +msgstr "开关打开文件列表" #: src/interface.c:2812 msgid "Sidebar" @@ -1766,16 +1746,14 @@ msgstr "标签位置" #: src/interface.c:2974 -#, fuzzy msgid "Show statusbar" -msgstr "显示工具栏" +msgstr "显示状态栏" #: src/interface.c:2977 msgid "Whether to show the status bar at the bottom of the main window." -msgstr "" +msgstr "是否在主窗口底部显示状态栏" #: src/interface.c:2979 -#, fuzzy msgid "Miscellaneous" msgstr "杂项" @@ -2035,25 +2013,23 @@ msgstr "长行标志" #: src/interface.c:3492 -#, fuzzy msgid "Auto indentation mode:" -msgstr "自动缩进" +msgstr "自动缩进模式:" #: src/interface.c:3499 msgid "" "Selects the indentation mode. Use None to disable auto indentation " "completely. Basic indents new lines with the same indentation as the " "previous line. Advanced does the same and indents also curly brackets." -msgstr "" +msgstr "选择缩进模式。“禁用”表示不自动缩进；“基本”表示新的一行使用上一行缩进；“高级”表示更智能的缩进，会根据括号来缩进。" #: src/interface.c:3505 -#, fuzzy msgid "Basic" -msgstr "波罗的海语系" +msgstr "基本" #: src/interface.c:3506 msgid "Advanced" -msgstr "" +msgstr "高级" #: src/interface.c:3508 msgid "Line wrapping" @@ -2087,23 +2063,23 @@ #: src/interface.c:3531 msgid "Disable Drag and Drop" -msgstr "" +msgstr "禁用拖放" #: src/interface.c:3534 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window." -msgstr "" +msgstr "在编辑窗口完全禁用拖放。" #: src/interface.c:3537 msgid "Use tabs when inserting whitespace" -msgstr "" +msgstr "插入空白时使用tab" #: src/interface.c:3540 msgid "" "Whenever some whitespace is inserted by Geany it will use tabs when enabled " "otherwise Geany will use just spaces." -msgstr "" +msgstr "插入空白时用tab代替" #: src/interface.c:3543 msgid "Features" @@ -2126,15 +2102,14 @@ msgstr "XML标记自动完成(包括HTML标记)" #: src/interface.c:3574 -#, fuzzy msgid "Symbol autocompletion" -msgstr "结构自动完成" +msgstr "符号自动完成" #: src/interface.c:3577 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" -msgstr "" +msgstr "在打开的文件中用已知的符号自动自动补全(函数名、全局变量等等)" #: src/interface.c:3588 msgid "Rows of autocompletion list:" @@ -2293,18 +2268,16 @@ msgstr "打开" #: src/keybindings.c:126 -#, fuzzy msgid "Open selected file" -msgstr "已打开文件" +msgstr "打开选择的文件" #: src/keybindings.c:128 msgid "Save" msgstr "保存" #: src/keybindings.c:130 -#, fuzzy msgid "Save as" -msgstr "全部保存" +msgstr "另存为" #: src/keybindings.c:134 msgid "Print" @@ -2323,9 +2296,8 @@ msgstr "重新载入文件" #: src/keybindings.c:142 -#, fuzzy msgid "Project properties" -msgstr "属性" +msgstr "项目属性" #: src/keybindings.c:145 msgid "Undo" @@ -2352,14 +2324,12 @@ msgstr "查找上一个" #: src/keybindings.c:160 -#, fuzzy msgid "Find Next Selection" -msgstr "在选中的文字中(_L)" +msgstr "查找下一个选择" #: src/keybindings.c:162 -#, fuzzy msgid "Find Previous Selection" -msgstr "查找上一个" +msgstr "查找上一个选择" #: src/keybindings.c:164 src/search.c:413 msgid "Replace" @@ -2458,9 +2428,8 @@ msgstr "切换到虚拟终端" #: src/keybindings.c:226 -#, fuzzy msgid "Switch to Search Bar" -msgstr "切换到便签" +msgstr "切换到查找栏" #: src/keybindings.c:228 msgid "Switch to left document" @@ -2471,9 +2440,8 @@ msgstr "切换到右文档" #: src/keybindings.c:232 -#, fuzzy msgid "Switch to last used document" -msgstr "切换到左文档" +msgstr "切换到上次使用的文楼" #: src/keybindings.c:235 msgid "Duplicate line or selection" @@ -2508,37 +2476,32 @@ msgstr "减小缩进" #: src/keybindings.c:251 -#, fuzzy msgid "Send to Custom Command 1" -msgstr "设置自定义日期格式" +msgstr "发送自定义命令 1" #: src/keybindings.c:253 -#, fuzzy msgid "Send to Custom Command 2" -msgstr "设置自定义日期格式" +msgstr "发送自定义命令 2" #: src/keybindings.c:255 -#, fuzzy msgid "Send to Custom Command 3" -msgstr "设置自定义日期格式" +msgstr "发送自定义命令 3" #: src/keybindings.c:258 msgid "Goto matching brace" msgstr "跳转到对应花括号" #: src/keybindings.c:261 -#, fuzzy msgid "Toggle marker" -msgstr "长行标志:" +msgstr "开关记号" #: src/keybindings.c:264 -#, fuzzy msgid "Goto next marker" -msgstr "长行标志:" +msgstr "到下一个记号" #: src/keybindings.c:267 msgid "Goto previous marker" -msgstr "" +msgstr "回到前一个记号" #: src/keybindings.c:270 msgid "Complete word" @@ -2554,23 +2517,20 @@ #. has special callback #: src/keybindings.c:276 -#, fuzzy msgid "Complete construct" -msgstr "自动完成" +msgstr "完成结构" #: src/keybindings.c:278 -#, fuzzy msgid "Suppress construct completion" -msgstr "禁止自动完成" +msgstr "禁止完成结构" #: src/keybindings.c:281 -#, fuzzy msgid "Select current word" -msgstr "保存文件" +msgstr "选择当前词" #: src/keybindings.c:284 msgid "Insert alternative whitespace" -msgstr "" +msgstr "插入可选择的空白" #: src/keybindings.c:289 msgid "Go to tag definition" @@ -2581,71 +2541,80 @@ msgstr "跳转到标记说明" #: src/keybindings.c:460 -#, fuzzy msgid "File menu\n" -msgstr "标签位置" +msgstr "文件菜单\n" #: src/keybindings.c:464 -#, fuzzy msgid "" "\n" "Edit menu\n" -msgstr "编码:" +msgstr "" +"\n" +"编辑菜单\n" #: src/keybindings.c:468 -#, fuzzy msgid "" "\n" "Search menu\n" -msgstr "外观" +msgstr "" +"\n" +"查找菜单\n" #: src/keybindings.c:472 -#, fuzzy msgid "" "\n" "View menu\n" -msgstr "新建文件" +msgstr "" +"\n" +"视图菜单\n" #: src/keybindings.c:476 -#, fuzzy msgid "" "\n" "Document menu\n" -msgstr "自动完成" +msgstr "" +"\n" +"文档菜单\n" #: src/keybindings.c:480 -#, fuzzy msgid "" "\n" "Build menu\n" -msgstr "边栏" +msgstr "" +"\n" +"生成菜单\n" #: src/keybindings.c:484 -#, fuzzy msgid "" "\n" "Tools menu\n" -msgstr "工具路径" +msgstr "" +"\n" +"工具菜单\n" #: src/keybindings.c:488 -#, fuzzy msgid "" "\n" "Focus commands\n" -msgstr "字体" +msgstr "" +"\n" +"焦点命令\n" #: src/keybindings.c:492 msgid "" "\n" "Editing commands\n" msgstr "" +"\n" +"编辑命令\n" #: src/keybindings.c:496 -#, fuzzy msgid "" "\n" "Tag commands\n" -msgstr "标签位置" +msgstr "" +"\n" +"标记命令\n" #: src/keybindings.c:518 msgid "Keyboard shortcuts" @@ -2669,11 +2638,10 @@ msgstr "打开一个或多个上次会话的文件失败。" #: src/main.c:94 -#, fuzzy msgid "" "set initial column number for the first opened file (useful in conjunction " "with --line)" -msgstr "设置第一个打开的文件的初始行号" +msgstr "设置第一个打开的文件的初始列（用于以--联结的行）" #: src/main.c:95 msgid "use an alternate configuration directory" @@ -2684,9 +2652,8 @@ msgstr "在DEBUG模式下运行" #: src/main.c:97 -#, fuzzy msgid "generate global tags file (see documentation)" -msgstr "不要载入自动完成数据" +msgstr "生成全局标记文件(参见文档)" #: src/main.c:100 msgid "don't open files in a running instance, force opening a new instance" @@ -2741,9 +2708,9 @@ "不管他，继续使用？" #: src/main.c:559 src/socket.c:143 -#, fuzzy, c-format +#, c-format msgid "Could not find file '%s'." -msgstr "无法找到名为%s的pixmap文件" +msgstr "无法找到 '%s'文件。" #: src/main.c:688 #, c-format @@ -2790,155 +2757,142 @@ #. please avoid special characters and spaces, look at the source for details or ask Frank #: src/project.c:85 msgid "projects" -msgstr "" +msgstr "projects" #: src/project.c:105 -#, fuzzy msgid "New Project" -msgstr "生成目标" +msgstr "新项目" #: src/project.c:112 -#, fuzzy msgid "C_reate" -msgstr "字符" +msgstr "创建(_R)" #: src/project.c:126 src/project.c:336 -#, fuzzy msgid "Name:" -msgstr "生成:" +msgstr "名称:" #: src/project.c:138 src/project.c:348 -#, fuzzy msgid "Filename:" -msgstr "越南语" +msgstr "文件名:" #: src/project.c:158 src/project.c:377 msgid "Base path:" -msgstr "" +msgstr "根路径:" #: src/project.c:166 msgid "" "Base directory of all files that make up the project. This can be a new " "path, or an existing directory tree." -msgstr "" +msgstr "组成项目的所有文件的根路径，可以是一个新路径或一个已存在的路径。" #: src/project.c:220 src/project.c:809 -#, fuzzy, c-format +#, c-format msgid "Project file \"%s\" could not be loaded." -msgstr "进程无法停止(%s)" +msgstr "项目文件 \"%s\" 无法载入。" #: src/project.c:244 src/project.c:252 -#, fuzzy msgid "Open Project" -msgstr "生成目标" +msgstr "打开项目" #: src/project.c:271 -#, fuzzy msgid "Project files" -msgstr "属性" +msgstr "项目文件" #: src/project.c:292 -#, fuzzy, c-format +#, c-format msgid "Project \"%s\" closed." -msgstr "文件 %s 已关闭。" +msgstr "项目 %s 已关闭。" #: src/project.c:323 -#, fuzzy msgid "Project Properties" -msgstr "属性" +msgstr "项目属性" #: src/project.c:360 -#, fuzzy msgid "Description:" -msgstr "DVI生成:" +msgstr "描述:" #: src/project.c:385 msgid "Directory to run Make All from. Leave blank to use the default command." -msgstr "" +msgstr "Make All的目录。留空则使用缺省命令。" #: src/project.c:399 -#, fuzzy msgid "Run command:" -msgstr "打印命令:" +msgstr "运行命令:" #: src/project.c:407 msgid "" "Command-line to run in the project base directory. Options can be appended " "to the command. Leave blank to use the default run command." -msgstr "" +msgstr "在项目根目录中运行的命令行。可以给命令添加参数。留空则使用缺省的运行命令。" #: src/project.c:423 -#, fuzzy msgid "File patterns:" -msgstr "中东语系(_M)" +msgstr "文件模式:" #: src/project.c:503 -#, fuzzy msgid "Do you want to close it before proceeding?" -msgstr "您要在关闭文件前保存吗？" +msgstr "您要在执行前关闭文件吗？" #: src/project.c:504 #, c-format msgid "The '%s' project is already open. " -msgstr "" +msgstr "'%s'项目已经打开。" #: src/project.c:532 msgid "The specified project name is too short." -msgstr "" +msgstr "定义的项目名称太短。" #: src/project.c:538 #, c-format msgid "The specified project name is too long (max. %d characters)." -msgstr "" +msgstr "定义的项目名称太短。(最大%d个字符)。" #: src/project.c:546 msgid "You have specified an invalid project filename." -msgstr "" +msgstr "项目文件名非法。" #: src/project.c:558 msgid "Create the project's base path directory?" -msgstr "" +msgstr "创建项目根目录？" #: src/project.c:559 -#, fuzzy, c-format +#, c-format msgid "The path \"%s\" does not exist." -msgstr "文件 \"%s\" 是非法的 %s." +msgstr "路径 \"%s\" 不存在。" #: src/project.c:577 -#, fuzzy msgid "Project file could not be written." -msgstr "进程无法停止(%s)" +msgstr "项目文件无法写入。" #: src/project.c:627 #, c-format msgid "Project \"%s\" created." -msgstr "" +msgstr "项目\"%s\"已创建。" #: src/project.c:629 -#, fuzzy, c-format +#, c-format msgid "Project \"%s\" saved." -msgstr "文件 %s 已保存。" +msgstr "项目 \"%s\" 已保存。" #. initialise the dialog #: src/project.c:673 src/project.c:684 -#, fuzzy msgid "Choose Project Filename" -msgstr "属性" +msgstr "选择项目文件名" #. initialise the dialog #: src/project.c:701 src/project.c:712 msgid "Choose Project Base Path" -msgstr "" +msgstr "选择项目根目录" #. initialise the dialog #: src/project.c:729 src/project.c:740 msgid "Choose Project Run Command" -msgstr "" +msgstr "选择项目运行命令" #: src/project.c:802 #, c-format msgid "Project \"%s\" opened." -msgstr "" +msgstr "项目\"%s\"已打开。" #: src/search.c:139 msgid "_Use regular expressions" @@ -3002,9 +2956,8 @@ msgstr "标记(_M)" #: src/search.c:342 -#, fuzzy msgid "Mark all matches in the current document." -msgstr "去除文件中所有出错指示" +msgstr "在当前文档中标记所有匹配项。" #: src/search.c:347 src/search.c:487 msgid "In Sessi_on" @@ -3066,7 +3019,7 @@ #: src/search.c:624 msgid "_Recurse in subfolders" -msgstr "" +msgstr "搜索子目录(_R)" #: src/search.c:640 msgid "_Invert search results" @@ -3078,11 +3031,11 @@ #: src/search.c:661 msgid "E_xtra options:" -msgstr "" +msgstr "额外的参数:" #: src/search.c:673 msgid "Other options to pass to Grep" -msgstr "" +msgstr "传给Grep的其它参数" #: src/search.c:864 src/search.c:1388 src/search.c:1389 #, c-format @@ -3090,9 +3043,9 @@ msgstr "未找到匹配项'%s'。" #: src/search.c:866 src/search.c:1395 src/search.c:1396 -#, fuzzy, c-format +#, c-format msgid "Found %d matches for '%s'." -msgstr "未找到匹配项'%s'。" +msgstr "找到 %d 个 '%s'的匹配项。" #: src/search.c:984 #, c-format @@ -3113,9 +3066,9 @@ msgstr "无法执行grep工具 '%s'，请检查首选项中的设置。" #: src/search.c:1189 -#, fuzzy, c-format +#, c-format msgid "%s %s -- %s (in directory: %s)" -msgstr "%s (在目录%s中)" +msgstr "%s %s -- %s (在目录 %s中)" #: src/search.c:1250 #, c-format @@ -3127,9 +3080,9 @@ msgstr "搜索失败。" #: src/search.c:1306 src/search.c:1307 -#, fuzzy, c-format +#, c-format msgid "Search completed with %d matches." -msgstr "搜索完成。" +msgstr "搜索完成，找到 %d 个匹配项。" #: src/support.c:90 src/support.c:114 #, c-format @@ -3262,12 +3215,12 @@ #: src/symbols.c:755 #, c-format msgid "Unknown filetype extension for \"%s\".\n" -msgstr "" +msgstr "\"%s\"是未知的文件类型。\n" #: src/symbols.c:770 #, c-format msgid "Failed to create tags file.\n" -msgstr "" +msgstr "创建标记文件失败。\n" #: src/symbols.c:776 #, c-format @@ -3275,6 +3228,8 @@ "Usage: %s -g <Tag File> <File list>\n" "\n" msgstr "" +"用法: %s -g <标记文件> <文件列表>\n" +"\n" #: src/symbols.c:777 #, c-format @@ -3283,24 +3238,27 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" msgstr "" +"示例:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" #: src/symbols.c:791 msgid "Load Tags" -msgstr "" +msgstr "载入标记" #: src/symbols.c:797 msgid "Geany tag files (*.tags)" -msgstr "" +msgstr "Geany 标记文件 (*.tags)" #: src/symbols.c:816 -#, fuzzy, c-format +#, c-format msgid "Loaded %s tags file '%s'." -msgstr "无法找到名为%s的pixmap文件" +msgstr "载入 %s 标记文件 '%s'。" #: src/symbols.c:818 -#, fuzzy, c-format +#, c-format msgid "Could not load tags file '%s'." -msgstr "无法找到名为%s的pixmap文件" +msgstr "无法载入标记文件 '%s'。" #: src/tools.c:81 msgid "Special characters" @@ -3361,22 +3319,22 @@ #: src/tools.c:608 #, c-format msgid "Passing data and executing custom command: %s" -msgstr "" +msgstr "传送数据并执行自定义命令: %s" #: src/tools.c:660 src/tools.c:888 -#, fuzzy msgid "Set Custom Commands" -msgstr "设置自定义日期格式" +msgstr "设置自定义命令" #: src/tools.c:666 msgid "" "You can send the current selection to any of these commands and the output " "of the command replaces the current selection." msgstr "" +"你可以发送当前选择给这些命令中的任一个，命令的输出替换当前选择。" #: src/tools.c:857 src/tools.c:861 msgid "No custom commands defined." -msgstr "" +msgstr "没有自定义命令被定义。" #: src/treeviews.c:126 msgid "No tags found" @@ -3397,29 +3355,29 @@ #. Status bar statistics: col = column, sel = selection, RO = read-only, #. * OVR = overwrite/overtype, INS = insert, MOD = modified #: src/ui_utils.c:124 -#, fuzzy, c-format +#, c-format msgid "" "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s %" "s filetype: %s scope: %s" msgstr "" -"%c 行: % 4d 列: % 3d 选中: % 4d %s 模式: %s%s 当前函数: %" -"s 编码: %s %s 文件类型: %s" +"行: %d\t 列: %d\t 选择: %d\t %s %s 模式: %s 编码: %s %" +"s 文件类型: %s 范围: %s" #: src/ui_utils.c:128 msgid "RO " -msgstr "" +msgstr "只读 " #: src/ui_utils.c:129 msgid "OVR" -msgstr "OVR" +msgstr "覆盖" #: src/ui_utils.c:129 msgid "INS" -msgstr "INS" +msgstr "插入" #: src/ui_utils.c:130 msgid "MOD" -msgstr "" +msgstr "已修改" #: src/ui_utils.c:210 #, c-format @@ -3451,14 +3409,12 @@ msgstr "设置自定义日期格式" #: src/ui_utils.c:1183 -#, fuzzy msgid "Select Folder" msgstr "选择目录" #: src/ui_utils.c:1183 -#, fuzzy msgid "Select File" -msgstr "全选" +msgstr "选择文件" #: src/utils.c:354 msgid "Do you want to reload it?" @@ -3530,11 +3486,10 @@ msgstr "虚拟终端:" #: src/vte.c:603 -#, fuzzy msgid "" "Controls how the terminal emulator should behave. Do not change this value " "unless you know exactly what you are doing." -msgstr "定义终端行为，如Xterm就是一个好的例子。" +msgstr "控制终端行为，不知道如何使用就不要更改。" #: src/vte.c:605 msgid "Shell:" @@ -3599,9 +3554,8 @@ msgstr "可执行" #: src/win32.c:108 -#, fuzzy msgid "Geany project files" -msgstr "属性" +msgstr "Geany 项目文件" #: src/win32.c:500 msgid "Error" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1517] trunk
by ntrel＠users.sourceforge.net 09 May '07

09 May '07

Revision: 1517 http://svn.sourceforge.net/geany/?rev=1517&view=rev Author: ntrel Date: 2007-05-09 04:23:50 -0700 (Wed, 09 May 2007) Log Message: ----------- Make backspace unindent when using spaces for indentation. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-08 17:45:54 UTC (rev 1516) +++ trunk/ChangeLog 2007-05-09 11:23:50 UTC (rev 1517) @@ -1,3 +1,9 @@ +2007-05-09 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/document.c: + Make backspace unindent when using spaces for indentation. + + 2007-05-08 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sci_cb.c: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-05-08 17:45:54 UTC (rev 1516) +++ trunk/src/document.c 2007-05-09 11:23:50 UTC (rev 1517) @@ -197,7 +197,10 @@ sci_set_mark_long_lines(sci, app->long_line_type, app->long_line_column, app->long_line_color); sci_set_tab_width(sci, app->pref_editor_tab_width); + sci_set_use_tabs(sci, app->pref_editor_use_tabs); + if (! app->pref_editor_use_tabs) + SSM(sci, SCI_SETBACKSPACEUNINDENTS, TRUE, 0); // remove indent spaces on backspace sci_set_autoc_max_height(sci, app->autocompletion_max_height); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1516] trunk
by ntrel＠users.sourceforge.net 08 May '07

08 May '07

Revision: 1516 http://svn.sourceforge.net/geany/?rev=1516&view=rev Author: ntrel Date: 2007-05-08 10:45:54 -0700 (Tue, 08 May 2007) Log Message: ----------- Fix auto-indentation when the filetype is not set. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-08 17:13:22 UTC (rev 1515) +++ trunk/ChangeLog 2007-05-08 17:45:54 UTC (rev 1516) @@ -1,3 +1,9 @@ +2007-05-08 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sci_cb.c: + Fix auto-indentation when the filetype is not set. + + 2007-05-08 Enrico Tröger <enrico.troeger(a)uvena.de> * src/sciwrappers.c, src/sciwrappers.h: Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-05-08 17:13:22 UTC (rev 1515) +++ trunk/src/sci_cb.c 2007-05-08 17:45:54 UTC (rev 1516) @@ -363,8 +363,6 @@ { gint pos = sci_get_current_position(sci); - if (doc_list[idx].file_type == NULL) return; - // simple indentation if (doc_list[idx].use_auto_indention) { @@ -374,7 +372,7 @@ if (app->pref_editor_indention_mode == INDENT_ADVANCED) { // add extra indentation for Python after colon - if (doc_list[idx].file_type->id == GEANY_FILETYPES_PYTHON && + if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_PYTHON && sci_get_char_at(sci, pos - 2) == ':' && sci_get_style_at(sci, pos - 2) == SCE_P_OPERATOR) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1515] trunk/po
by eht16＠users.sourceforge.net 08 May '07

08 May '07

Revision: 1515 http://svn.sourceforge.net/geany/?rev=1515&view=rev Author: eht16 Date: 2007-05-08 10:13:22 -0700 (Tue, 08 May 2007) Log Message: ----------- Update of main catalog. Issued make update-po and edited version string. Modified Paths: -------------- trunk/po/ChangeLog trunk/po/be.po trunk/po/ca.po trunk/po/cs.po trunk/po/de.po trunk/po/es.po trunk/po/fi.po trunk/po/fr.po trunk/po/geany.pot trunk/po/hu.po trunk/po/it.po trunk/po/nl.po trunk/po/pl.po trunk/po/pt_BR.po trunk/po/ru.po trunk/po/vi.po trunk/po/zh_CN.po trunk/po/zh_TW.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2007-05-08 16:03:07 UTC (rev 1514) +++ trunk/po/ChangeLog 2007-05-08 17:13:22 UTC (rev 1515) @@ -1,3 +1,9 @@ +2007-05-08 Enrico Tröger <enrico.troeger(a)uvena.de> + + * geany.pot: Update of catalog + * *.po: Issued make update-po and edited version string + + 2007-05-02 Frank Lanitz <frank(a)frank.uvena.de> * fr.po: Update of French translation (Thanks to Jean-Philippe Moal) Modified: trunk/po/be.po =================================================================== --- trunk/po/be.po 2007-05-08 16:03:07 UTC (rev 1514) +++ trunk/po/be.po 2007-05-08 17:13:22 UTC (rev 1515) @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.11svn \n" +"Project-Id-Version: geany 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-14 20:21+0100\n" +"POT-Creation-Date: 2007-05-08 18:32+0200\n" "PO-Revision-Date: 2006-06-01 10:55+0200\n" "Last-Translator: Yura Semashko <yurand2(a)gmail.com>\n" "Language-Team: Belarusian <geany-i18n(a)uvena.de>\n" @@ -18,62 +18,62 @@ "X-Poedit-Country: BELARUS\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/about.c:122 +#: src/about.c:126 msgid "About Geany" msgstr "Пра Geany" -#: src/about.c:171 +#: src/about.c:175 msgid "A fast and lightweight IDE" msgstr "Хуткае лёгкае IDE" -#: src/about.c:192 +#: src/about.c:196 #, c-format msgid "(built on %s)" msgstr "(збудаваны на %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: src/about.c:223 +#: src/about.c:227 msgid "Info" msgstr "Інфармацыя" -#: src/about.c:235 +#: src/about.c:239 msgid "Developers" msgstr "Распрацоўшчыкі" -#: src/about.c:235 +#: src/about.c:239 msgid "Maintainer" msgstr "Падтрымка" -#: src/about.c:235 +#: src/about.c:239 msgid "developer" msgstr "распрацоўшчык" -#: src/about.c:236 +#: src/about.c:240 msgid "translation maintainer" msgstr "падтрымка перакладу" -#: src/about.c:236 +#: src/about.c:240 msgid "Translators" msgstr "Перакладчыкі" -#: src/about.c:237 +#: src/about.c:241 msgid "language" msgstr "мова" -#: src/about.c:243 +#: src/about.c:247 msgid "Credits" msgstr "Аўтары" -#: src/about.c:256 +#: src/about.c:260 msgid "License" msgstr "Ліцэнзія" -#: src/build.c:155 +#: src/build.c:159 #, c-format msgid "Failed to view %s (make sure it is already compiled)" msgstr "Немагчыма глядзець %s (пераканайся што ён скампіляваны)" -#: src/build.c:188 src/build.c:584 +#: src/build.c:192 src/build.c:740 #, c-format msgid "" "Could not find terminal '%s' (check path for Terminal tool setting in " @@ -81,275 +81,330 @@ msgstr "" "Немагчыма знайсьці тэрмінал '%s' (правер пуць да тэрмінала ў уласьцівасьцях)" -#: src/build.c:202 src/build.c:621 -#, c-format -msgid "Failed to execute %s (start-script could not be created)" +#: src/build.c:204 src/build.c:616 src/build.c:667 +#, fuzzy, c-format +msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Немагчыма запусьціць %s (нельга стварыць start-script)" -#: src/build.c:230 src/build.c:455 src/build.c:666 src/search.c:1113 +#: src/build.c:232 src/build.c:497 src/build.c:765 src/search.c:1175 #, c-format msgid "Process failed (%s)" msgstr "Працэс скончыўся непасьпяхова (%s)" -#: src/build.c:340 src/build.c:545 +#: src/build.c:349 src/build.c:572 #, fuzzy msgid "Command stopped because the current file has no extension." msgstr "Ператварыць рэгістар цякучага вылучэньня" -#: src/build.c:364 +#: src/build.c:373 #, c-format msgid "Something very strange is occurred, could not stat %s (%s)." msgstr "Здарылася нешта страннае, немагчыма %s (%s)." -#: src/build.c:443 +#: src/build.c:484 #, c-format msgid "%s (in directory: %s)" msgstr "%s (у дырэкторыі: %s)" -#: src/build.c:560 +#: src/build.c:581 #, c-format msgid "Failed to execute %s (make sure it is already built)" msgstr "Немагчыма запусьціць %s (пераканайся што ён створаны)" -#: src/build.c:598 +#: src/build.c:595 src/build.c:653 #, c-format msgid "Failed to change the working directory to %s" msgstr "Немагчыма замяніць працоўную дырэкторыю на %s" -#: src/build.c:794 +#: src/build.c:882 msgid "Compilation failed." msgstr "Кампіляцыя скончылася непасьпяхова." -#: src/build.c:808 +#: src/build.c:896 msgid "Compilation finished successfully." msgstr "Кампіляцыя скончылася пасьпяхова." #. compile the code -#: src/build.c:913 +#: src/build.c:1001 msgid "_Compile" msgstr "Кампіляваць" -#: src/build.c:916 +#: src/build.c:1004 msgid "Compiles the current file" msgstr "Кампіляваць цякучы файл" #. build the code -#: src/build.c:925 src/interface.c:879 +#: src/build.c:1013 src/interface.c:925 msgid "_Build" msgstr "Пабудаваць" -#: src/build.c:929 +#: src/build.c:1017 msgid "Builds the current file (generate an executable file)" msgstr "Будаваць цякучы файл (стварыць запускаемы)" #. build the code with make all -#: src/build.c:939 src/build.c:1061 +#: src/build.c:1027 src/build.c:1149 msgid "_Make All" msgstr "Будаваць усе" -#: src/build.c:942 src/build.c:1064 +#: src/build.c:1030 src/build.c:1152 msgid "Builds the current file with the make tool and the default target" msgstr "Збудаваць цякучы файл выкарыстоўваючы прыладу make." #. build the code with make custom -#: src/build.c:950 src/build.c:1072 +#: src/build.c:1038 src/build.c:1160 msgid "Make Custom _Target" msgstr "Будаваць з make (свая цэль)" -#: src/build.c:954 src/build.c:1076 +#: src/build.c:1042 src/build.c:1164 msgid "Builds the current file with the make tool and the specified target" msgstr "Збудаваць цякучы файл выкарыстоўваючы прыладу make i указаную цэль" #. build the code with make object -#: src/build.c:961 +#: src/build.c:1049 msgid "Make _Object" msgstr "Будаваць аб'ект" -#: src/build.c:965 +#: src/build.c:1053 msgid "Compiles the current file using the make tool" msgstr "Кампіляваць цякучы файл выкарыстоўвая прыладу make" #. next error -#: src/build.c:977 src/build.c:1088 +#: src/build.c:1065 src/build.c:1176 msgid "_Next Error" msgstr "Наступная памылка" -#: src/build.c:992 src/interface.c:1007 +#: src/build.c:1080 src/interface.c:1053 msgid "Run or view the current file" msgstr "Выканаць альбо глядзець цякучы файл" #. arguments -#: src/build.c:1003 +#: src/build.c:1091 msgid "_Set Includes and Arguments" msgstr "Усталяваць Includes і аргумэнты" -#: src/build.c:1008 +#: src/build.c:1096 msgid "" "Sets the includes and library paths for the compiler and the program " "arguments for execution" msgstr "Усталяваць includes і library пуці для кампілятара і аргумэнты праграм" #. DVI -#: src/build.c:1031 +#: src/build.c:1119 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/build.c:1034 +#: src/build.c:1122 msgid "Compiles the current file into a DVI file" msgstr "Кампіляваць цякучы файл у DVI" #. PDF -#: src/build.c:1044 +#: src/build.c:1132 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/build.c:1047 +#: src/build.c:1135 msgid "Compiles the current file into a PDF file" msgstr "Кампіляваць цякучы файл у PDF" #. DVI view -#: src/build.c:1100 +#: src/build.c:1188 msgid "View DVI File" msgstr "Глядзець DVI" -#: src/build.c:1105 src/build.c:1118 -msgid "Compiles and view the current file" +#: src/build.c:1193 src/build.c:1206 +#, fuzzy +msgid "Compile and view the current file" msgstr "Кампіляваць і глядзець цякучы файл" #. PDF view -#: src/build.c:1114 +#: src/build.c:1202 msgid "View PDF File" msgstr "Глядзець PDF" #. arguments -#: src/build.c:1133 src/dialogs.c:642 +#: src/build.c:1221 src/build.c:1300 msgid "Set Arguments" msgstr "Усталяваць аргумэнты" -#: src/build.c:1138 +#: src/build.c:1226 msgid "Sets the program paths and arguments" msgstr "Усталяваць пуці праграм і аргумэнты" -#: src/build.c:1405 +#: src/build.c:1306 +msgid "Set programs and options for compiling and viewing (La)TeX files." +msgstr "" +"Усталяваць праграмы і наладкі дзеля кампіляцыі і прагляду (La)TeX файлаў." + +#: src/build.c:1317 +msgid "DVI creation:" +msgstr "Стварэньне DVI" + +#: src/build.c:1336 +msgid "PDF creation:" +msgstr "Стварэньне PDF" + +#: src/build.c:1355 +msgid "DVI preview:" +msgstr "Прагляд DVI:" + +#: src/build.c:1374 +msgid "PDF preview:" +msgstr "Прагляд PDF:" + +#: src/build.c:1390 src/build.c:1560 +#, c-format +msgid "" +"%f will be replaced by the current filename, e.g. test_file.c\n" +"%e will be replaced by the filename without extension, e.g. test_file" +msgstr "" +"%f будзе заменены на поўнае імя, напрыклад, test_file.c\n" +"%e будзе заменены на імя файла без расшырэньня, напрыклад, test_file" + +#: src/build.c:1468 +msgid "Set Includes and Arguments" +msgstr "Усталяваць Includes і аргумэнты" + +#: src/build.c:1474 +msgid "Set the commands for building and running programs." +msgstr "Вызначыць каманды для будоўлі і выкананьня праграм." + +#: src/build.c:1481 +msgid " commands" +msgstr "Каманды" + +#: src/build.c:1496 +msgid "Compile:" +msgstr "Кампіляваць:" + +#: src/build.c:1517 +msgid "Build:" +msgstr "Пабудаваць:" + +#: src/build.c:1538 src/dialogs.c:884 +msgid "Execute:" +msgstr "Выканаць:" + +#: src/build.c:1846 msgid "Make Custom Target" msgstr "Будаваць з make (свая цэль)" -#: src/build.c:1406 +#: src/build.c:1847 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "Увядзі свае наладкі тут, тэкст будзе перададзены make." -#: src/build.c:1445 +#: src/build.c:1886 msgid "Failed to execute the view program" msgstr "Немагчыма запусьціць праграму прагляду" -#: src/build.c:1464 +#: src/build.c:1905 msgid "Failed to execute the terminal program" msgstr "Немагчыма запусьціць тэрмінальную праграму" -#: src/build.c:1523 +#: src/build.c:1953 #, c-format msgid "Process could not be stopped (%s)." msgstr "Немагчыма зрабіць наладкавую дырэкторыю (%s)." -#: src/build.c:1539 +#: src/build.c:1973 msgid "No more build errors." msgstr "Няма больш памылак" -#: src/callbacks.c:175 +#: src/callbacks.c:181 msgid "Do you really want to quit?" msgstr "Вы ўпэўнены што жадаеце выйсьці?" -#: src/callbacks.c:491 src/interface.c:334 src/utils.c:347 +#: src/callbacks.c:488 src/interface.c:343 src/utils.c:353 msgid "_Reload" msgstr "Загрузіць зноў" -#: src/callbacks.c:492 +#: src/callbacks.c:489 msgid "Any unsaved changes will be lost." msgstr "Усе незахаваныя зьмяненьні зьнікнуць." -#: src/callbacks.c:493 +#: src/callbacks.c:490 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Вы упэўнены што жадаеце загрузіць зноў '%s?'" -#: src/callbacks.c:878 +#: src/callbacks.c:856 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' ужо існуе. Замяніць яго?" -#: src/callbacks.c:1251 +#: src/callbacks.c:1218 #, fuzzy, c-format msgid "Forward declaration \"%s\" not found." msgstr "Аб'яуленне \"%s()\" не знойдзена" -#: src/callbacks.c:1253 +#: src/callbacks.c:1220 #, fuzzy, c-format msgid "Definition of \"%s\" not found." msgstr "Рэалізацыя \"%s()\" не знойдзена\"" -#: src/callbacks.c:1474 src/callbacks.c:1498 +#: src/callbacks.c:1441 src/callbacks.c:1465 msgid "" "Please set the filetype for the current file before using this function." msgstr "Калі ласка вызначыце тып файла перад выкарыстоўваньнем гэтай функцыі" -#: src/callbacks.c:1609 src/ui_utils.c:416 +#: src/callbacks.c:1576 src/ui_utils.c:429 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: src/callbacks.c:1611 src/ui_utils.c:417 +#: src/callbacks.c:1578 src/ui_utils.c:430 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: src/callbacks.c:1613 src/ui_utils.c:418 +#: src/callbacks.c:1580 src/ui_utils.c:431 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: src/callbacks.c:1615 src/ui_utils.c:427 +#: src/callbacks.c:1582 src/ui_utils.c:440 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: src/callbacks.c:1617 src/ui_utils.c:428 +#: src/callbacks.c:1584 src/ui_utils.c:441 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: src/callbacks.c:1619 src/ui_utils.c:429 +#: src/callbacks.c:1586 src/ui_utils.c:442 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: src/callbacks.c:1621 src/ui_utils.c:438 +#: src/callbacks.c:1588 src/ui_utils.c:451 msgid "Use Custom Date Format" msgstr "Выкарыстоўваць свой фармат даты" -#: src/callbacks.c:1632 +#: src/callbacks.c:1599 msgid "Custom Date Format" msgstr "Свой фармат даты" -#: src/callbacks.c:1633 +#: src/callbacks.c:1600 msgid "" "Enter here a custom date and time format. You can use any conversion " "specifiers which can be used with the ANSI C strftime function. See \"man " "strftime\" for more information." msgstr "" -#: src/callbacks.c:1653 +#: src/callbacks.c:1620 msgid "Date format string could not be converted (possibly too long)." msgstr "Фармат даты ня можа быць пераўтвораны (магчыма надта доўгі)." -#: src/callbacks.c:2041 +#: src/callbacks.c:1932 msgid "No more message items." msgstr "Няма больш паведамленьняў." #. initialize the dialog -#: src/dialogs.c:75 src/prefs.c:1048 +#: src/dialogs.c:80 src/prefs.c:1077 msgid "Open File" msgstr "Адчыніць файл" -#: src/dialogs.c:78 src/interface.c:656 +#: src/dialogs.c:83 src/interface.c:694 msgid "_View" msgstr "_Выгляд" -#: src/dialogs.c:80 +#: src/dialogs.c:85 msgid "" "Opens the file in read-only mode. If you choose more than one file to open, " "all files will be opened read-only." @@ -357,24 +412,24 @@ "Адчыніць файл у рэжыме толькі-чытаньне. Калі выбрана больш за адзін файл, " "усе будуць адчынены ў рэжыме талькі-чытаньне." -#: src/dialogs.c:113 +#: src/dialogs.c:121 msgid "Detect by file extension" msgstr "Вызначаць файлы па расшырэньню" -#: src/dialogs.c:124 +#: src/dialogs.c:132 msgid "Detect from file" msgstr "Вызначыць з файла" #. line 1 with checkbox and encoding combo -#: src/dialogs.c:170 +#: src/dialogs.c:178 msgid "Show _hidden files" msgstr "Паказваць схаваныя файлы" -#: src/dialogs.c:182 +#: src/dialogs.c:190 msgid "Set encoding:" msgstr "Усталяваць знаканабор:" -#: src/dialogs.c:192 +#: src/dialogs.c:200 msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " "This is useful when you know that the encoding of a file cannot be detected " @@ -387,11 +442,11 @@ "аўтаматычна Заўвага: Калі ты вы-бярэш некалькі файлаў усе яны адчыняцца з " "наданым тыпам." -#: src/dialogs.c:212 +#: src/dialogs.c:220 msgid "Set filetype:" msgstr "Усталюй тып файла:" -#: src/dialogs.c:222 +#: src/dialogs.c:230 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -401,234 +456,173 @@ "Уласна ўкажы тып файла калі ён не адзначыўся па расшырэньню.\n" "Заўвага: Калі ты вы-бярэш некалькі файлаў усе яны адчыняцца з наданым тыпам." -#: src/dialogs.c:261 +#: src/dialogs.c:269 msgid "Save File" msgstr "Захаваць файл" -#: src/dialogs.c:353 +#: src/dialogs.c:361 #, c-format msgid "The file '%s' is not saved." msgstr "Файл '%s' не захаваны." -#: src/dialogs.c:363 +#: src/dialogs.c:371 msgid "Do you want to save it before closing?" msgstr "Жадаеш захаваць яго перад зачыненьнем?" -#: src/dialogs.c:366 +#: src/dialogs.c:374 msgid "_Don't save" msgstr "Не захоўваць" -#: src/dialogs.c:410 +#: src/dialogs.c:418 msgid "Choose font" msgstr "Выбраць шрыфт" -#: src/dialogs.c:448 +#: src/dialogs.c:456 msgid "Word Count" msgstr "Лічыць словы" -#: src/dialogs.c:457 +#: src/dialogs.c:465 msgid "selection" msgstr "вылучэньне" -#: src/dialogs.c:463 +#: src/dialogs.c:471 msgid "whole document" msgstr "увесь дакумэнт" -#: src/dialogs.c:472 +#: src/dialogs.c:480 msgid "Range:" msgstr "Дыстанцыя:" -#: src/dialogs.c:484 +#: src/dialogs.c:492 msgid "Lines:" msgstr "Радкі:" -#: src/dialogs.c:498 +#: src/dialogs.c:506 msgid "Words:" msgstr "Словы:" -#: src/dialogs.c:512 +#: src/dialogs.c:520 msgid "Characters:" msgstr "Літары:" -#: src/dialogs.c:544 src/interface.c:3208 src/vte.c:552 src/vte.c:559 +#: src/dialogs.c:552 src/interface.c:3431 src/vte.c:569 src/vte.c:576 msgid "Color Chooser" msgstr "Выбар колеру" -#: src/dialogs.c:611 src/keybindings.c:157 +#: src/dialogs.c:619 src/keybindings.c:170 msgid "Go to line" msgstr "Перайсьці да радка" -#: src/dialogs.c:617 +#: src/dialogs.c:625 msgid "Enter the line you want to go to:" msgstr "Увядзі радок да якога жадаеш перайсьці:" -#: src/dialogs.c:648 -msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Усталяваць праграмы і наладкі дзеля кампіляцыі і прагляду (La)TeX файлаў." - -#: src/dialogs.c:659 -msgid "DVI creation:" -msgstr "Стварэньне DVI" - -#: src/dialogs.c:678 -msgid "PDF creation:" -msgstr "Стварэньне PDF" - -#: src/dialogs.c:697 -msgid "DVI preview:" -msgstr "Прагляд DVI:" - -#: src/dialogs.c:716 -msgid "PDF preview:" -msgstr "Прагляд PDF:" - -#: src/dialogs.c:732 src/dialogs.c:847 -#, c-format +#: src/dialogs.c:672 msgid "" -"%f will be replaced by the current filename, e.g. test_file.c\n" -"%e will be replaced by the filename without extension, e.g. test_file" -msgstr "" -"%f будзе заменены на поўнае імя, напрыклад, test_file.c\n" -"%e будзе заменены на імя файла без расшырэньня, напрыклад, test_file" - -#: src/dialogs.c:759 -msgid "Set Includes and Arguments" -msgstr "Усталяваць Includes і аргумэнты" - -#: src/dialogs.c:765 -msgid "Set the commands for building and running programs." -msgstr "Вызначыць каманды для будоўлі і выкананьня праграм." - -#: src/dialogs.c:772 -msgid " commands" -msgstr "Каманды" - -#: src/dialogs.c:787 -msgid "Compile:" -msgstr "Кампіляваць:" - -#: src/dialogs.c:808 -msgid "Build:" -msgstr "Пабудаваць:" - -#: src/dialogs.c:829 src/dialogs.c:1101 -msgid "Execute:" -msgstr "Выканаць:" - -#: src/dialogs.c:894 -msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "" "Адбылася памылка, ці немагчыма атрымаць інфармацыю а файле (г.з. з новага " "файла)." -#: src/dialogs.c:913 src/dialogs.c:914 src/dialogs.c:915 src/dialogs.c:921 -#: src/dialogs.c:922 src/dialogs.c:923 src/ui_utils.c:121 src/ui_utils.c:124 -#: src/utils.c:515 src/utils.c:567 +#: src/dialogs.c:696 src/dialogs.c:697 src/dialogs.c:698 src/dialogs.c:704 +#: src/dialogs.c:705 src/dialogs.c:706 src/ui_utils.c:132 src/utils.c:515 +#: src/utils.c:536 src/utils.c:589 msgid "unknown" msgstr "невядомы" -#: src/dialogs.c:927 +#: src/dialogs.c:710 msgid "Properties" msgstr "Уласьцівасьці" -#: src/dialogs.c:955 +#: src/dialogs.c:738 msgid "Type:" msgstr "Тып:" -#: src/dialogs.c:968 +#: src/dialogs.c:751 msgid "Size:" msgstr "Памер:" -#: src/dialogs.c:983 +#: src/dialogs.c:766 msgid "Location:" msgstr "Месца:" -#: src/dialogs.c:996 +#: src/dialogs.c:779 msgid "Read-only:" msgstr "Толькі чытаць:" -#: src/dialogs.c:1003 +#: src/dialogs.c:786 msgid "(only inside Geany)" msgstr "(толькі ў Geany)" -#: src/dialogs.c:1012 +#: src/dialogs.c:795 msgid "Encoding:" msgstr "Знаканабор:" -#: src/dialogs.c:1022 src/ui_utils.c:123 +#: src/dialogs.c:805 src/ui_utils.c:134 msgid "(with BOM)" msgstr "(з BOM)" -#: src/dialogs.c:1022 src/ui_utils.c:123 +#: src/dialogs.c:805 msgid "(without BOM)" msgstr "(без BOM)" -#: src/dialogs.c:1032 +#: src/dialogs.c:815 msgid "Modified:" msgstr "Зьменены:" -#: src/dialogs.c:1045 +#: src/dialogs.c:828 msgid "Changed:" msgstr "Зьменены:" -#: src/dialogs.c:1058 +#: src/dialogs.c:841 msgid "Accessed:" msgstr "Даступаўся:" -#: src/dialogs.c:1079 +#: src/dialogs.c:862 msgid "Permissions:" msgstr "Дазваленьні:" #. Header -#: src/dialogs.c:1087 +#: src/dialogs.c:870 msgid "Read:" msgstr "Чытаць:" -#: src/dialogs.c:1094 +#: src/dialogs.c:877 msgid "Write:" msgstr "Пісаць:" #. Owner -#: src/dialogs.c:1109 +#: src/dialogs.c:892 msgid "Owner:" msgstr "Уладальнік:" #. Group -#: src/dialogs.c:1145 +#: src/dialogs.c:928 msgid "Group:" msgstr "Група:" #. Other -#: src/dialogs.c:1181 +#: src/dialogs.c:964 msgid "Other:" msgstr "Другі:" -#: src/dialogs.c:1302 -msgid "Keyboard shortcuts" -msgstr "Наладка клявіш" - -#: src/dialogs.c:1311 -msgid "The following keyboard shortcuts are defined:" -msgstr "Вызначаны наступныя клявішы." - -#: src/document.c:351 +#: src/document.c:372 #, c-format msgid "File %s closed." msgstr "Файл %s зачынены." -#: src/document.c:437 -msgid "New file opened." +#: src/document.c:463 +#, fuzzy, c-format +msgid "New file \"%s\" opened." msgstr "Адчынены новы файл." -#: src/document.c:587 src/document.c:872 +#: src/document.c:616 src/document.c:927 #, c-format msgid "Could not open file %s (%s)" msgstr "Немагчыма адчыніць файл %s (%s)" -#: src/document.c:610 +#: src/document.c:635 #, fuzzy, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -640,12 +634,12 @@ "захаваньне яго можа вызваць страту дадзеных.\n" "Усталёваны толькі чытаньне рэжым." -#: src/document.c:634 +#: src/document.c:659 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файл \"%s\" не з'яўляецца сапраўдным %s." -#: src/document.c:643 +#: src/document.c:668 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -653,29 +647,29 @@ msgstr "" "Файл \"%s\" не выглядае як тэкст, альбо яго знаканабор не падтрымліваецца." -#: src/document.c:711 +#: src/document.c:737 msgid "Invalid filename" msgstr "Благі файл" -#: src/document.c:798 +#: src/document.c:829 #, c-format msgid "File %s reloaded." msgstr "Файл %s загружаны зноў." -#: src/document.c:800 +#: src/document.c:831 #, c-format msgid "File %s opened(%d%s)." msgstr "Файл %s адчынены (%d%s)." -#: src/document.c:802 +#: src/document.c:833 msgid ", read-only" msgstr ", толькі чытаць" -#: src/document.c:900 src/document.c:983 +#: src/document.c:955 src/document.c:1038 msgid "Error saving file." msgstr "Памылка пры захаваньні файла." -#: src/document.c:947 +#: src/document.c:1002 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -686,47 +680,47 @@ "незахаваным.\n" "Памылка: %s\n" -#: src/document.c:971 +#: src/document.c:1026 #, c-format msgid "Error saving file (%s)." msgstr "Памылка пры захаваньні файла (%s)." -#: src/document.c:1014 +#: src/document.c:1069 #, c-format msgid "File %s saved." msgstr "Файл %s захаваны." -#: src/document.c:1062 src/document.c:1114 src/document.c:1122 +#: src/document.c:1117 src/document.c:1169 src/document.c:1177 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" не знайдзён." -#: src/document.c:1122 +#: src/document.c:1177 msgid "Wrap search and find again?" msgstr "Шукаць зноў с пачатку?" -#: src/document.c:1197 src/search.c:1232 +#: src/document.c:1252 src/search.c:1311 msgid "No matches found." msgstr "Супадзеньні ня знойдзены" -#: src/document.c:1207 src/document.c:1214 -#, c-format -msgid "%s: replaced %d occurrences of \"%s\" with \"%s\"." +#: src/document.c:1262 src/document.c:1269 +#, fuzzy, c-format +msgid "%s: replaced %d occurrence(s) of \"%s\" with \"%s\"." msgstr "%s: заменена %d выпадкаў \"%s\" на \"%s\"." -#: src/document.c:1468 +#: src/document.c:1646 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:1469 +#: src/document.c:1647 msgid "Mac (CR)" msgstr "Max (CR)" -#: src/document.c:1471 +#: src/document.c:1649 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/document.c:1569 +#: src/document.c:1751 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -737,511 +731,538 @@ "\n" "%s" -#: src/document.c:1578 -#, c-format -msgid "Printing of \"%s\" failed (return code: %d)." +#: src/document.c:1766 +#, fuzzy, c-format +msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Друкаваньне \"%s\" скончылася непасьпяхова (код зваротку: %d)." -#: src/document.c:1583 +#: src/document.c:1772 #, c-format msgid "File %s printed." msgstr "Файл %s надрукаваны." -#: src/encodings.c:52 +#: src/encodings.c:55 msgid "Celtic" msgstr "Celtic" -#: src/encodings.c:53 src/encodings.c:54 +#: src/encodings.c:56 src/encodings.c:57 msgid "Greek" msgstr "Greek" -#: src/encodings.c:55 +#: src/encodings.c:58 msgid "Nordic" msgstr "Nordic" -#: src/encodings.c:56 +#: src/encodings.c:59 msgid "South European" msgstr "South European" -#: src/encodings.c:57 src/encodings.c:58 src/encodings.c:59 src/encodings.c:60 +#: src/encodings.c:60 src/encodings.c:61 src/encodings.c:62 src/encodings.c:63 msgid "Western" msgstr "Western" -#: src/encodings.c:62 src/encodings.c:63 src/encodings.c:64 +#: src/encodings.c:65 src/encodings.c:66 src/encodings.c:67 msgid "Baltic" msgstr "Baltic" -#: src/encodings.c:65 src/encodings.c:66 src/encodings.c:67 +#: src/encodings.c:68 src/encodings.c:69 src/encodings.c:70 msgid "Central European" msgstr "Central European" -#: src/encodings.c:68 src/encodings.c:69 src/encodings.c:70 src/encodings.c:71 -#: src/encodings.c:72 +#: src/encodings.c:71 src/encodings.c:72 src/encodings.c:73 src/encodings.c:74 +#: src/encodings.c:75 msgid "Cyrillic" msgstr "Cyrillic" -#: src/encodings.c:73 +#: src/encodings.c:76 msgid "Cyrillic/Russian" msgstr "Cyrillic/Russian" -#: src/encodings.c:74 +#: src/encodings.c:77 msgid "Cyrillic/Ukrainian" msgstr "Cyrillic/Ukrainian" -#: src/encodings.c:75 +#: src/encodings.c:78 msgid "Romanian" msgstr "Romanian" -#: src/encodings.c:77 src/encodings.c:78 src/encodings.c:79 +#: src/encodings.c:80 src/encodings.c:81 src/encodings.c:82 msgid "Arabic" msgstr "Arabic" -#: src/encodings.c:80 src/encodings.c:81 src/encodings.c:82 +#: src/encodings.c:83 src/encodings.c:84 src/encodings.c:85 msgid "Hebrew" msgstr "Hebrew" -#: src/encodings.c:83 +#: src/encodings.c:86 msgid "Hebrew Visual" msgstr "Hebrew Visual" -#: src/encodings.c:85 +#: src/encodings.c:88 msgid "Armenian" msgstr "Armenian" -#: src/encodings.c:86 +#: src/encodings.c:89 msgid "Georgian" msgstr "Georgian" -#: src/encodings.c:87 +#: src/encodings.c:90 msgid "Thai" msgstr "Thai" -#: src/encodings.c:88 src/encodings.c:89 src/encodings.c:90 +#: src/encodings.c:91 src/encodings.c:92 src/encodings.c:93 msgid "Turkish" msgstr "Turkish" -#: src/encodings.c:91 src/encodings.c:92 src/encodings.c:93 +#: src/encodings.c:94 src/encodings.c:95 src/encodings.c:96 msgid "Vietnamese" msgstr "Vietnamese" -#: src/encodings.c:95 src/encodings.c:96 src/encodings.c:97 src/encodings.c:98 -#: src/encodings.c:99 src/encodings.c:100 src/encodings.c:101 -#: src/encodings.c:102 +#: src/encodings.c:98 src/encodings.c:99 src/encodings.c:100 +#: src/encodings.c:101 src/encodings.c:102 src/encodings.c:103 +#: src/encodings.c:104 src/encodings.c:105 msgid "Unicode" msgstr "Юнікод" -#: src/encodings.c:104 src/encodings.c:105 src/encodings.c:106 -#: src/encodings.c:107 +#: src/encodings.c:107 src/encodings.c:108 src/encodings.c:109 +#: src/encodings.c:110 msgid "Chinese Simplified" msgstr "Кітайскі спрошчаны" -#: src/encodings.c:108 src/encodings.c:109 src/encodings.c:110 +#: src/encodings.c:111 src/encodings.c:112 src/encodings.c:113 msgid "Chinese Traditional" msgstr "Кітайскі традыцыйны" -#: src/encodings.c:111 src/encodings.c:112 src/encodings.c:113 +#: src/encodings.c:114 src/encodings.c:115 src/encodings.c:116 msgid "Japanese" msgstr "Японскі" -#: src/encodings.c:114 src/encodings.c:115 src/encodings.c:116 -#: src/encodings.c:117 +#: src/encodings.c:117 src/encodings.c:118 src/encodings.c:119 +#: src/encodings.c:120 msgid "Korean" msgstr "Карэйскі" -#: src/encodings.c:119 +#: src/encodings.c:122 msgid "Without encoding" msgstr "Без знаканабору" -#: src/encodings.c:212 +#: src/encodings.c:215 msgid "_West European" msgstr "Заходне Еўрапейскі" -#: src/encodings.c:218 +#: src/encodings.c:221 msgid "_East European" msgstr "Усходне Еўрапейскі" -#: src/encodings.c:224 +#: src/encodings.c:227 msgid "East _Asian" msgstr "Усходне Азіяцкі" -#: src/encodings.c:230 +#: src/encodings.c:233 msgid "_SE & SW Asian" msgstr "SE & SW Asian" -#: src/encodings.c:236 +#: src/encodings.c:239 msgid "_Middle Eastern" msgstr "Middle Eastern" -#: src/encodings.c:242 +#: src/encodings.c:245 msgid "_Unicode" msgstr "Юнікод" -#: src/filetypes.c:136 +#: src/filetypes.c:141 msgid "C source file" msgstr "C" -#: src/filetypes.c:156 +#: src/filetypes.c:154 msgid "C++ source file" msgstr "C++" -#: src/filetypes.c:184 +#: src/filetypes.c:168 msgid "D source file" msgstr "D" -#: src/filetypes.c:204 +#: src/filetypes.c:181 msgid "Java source file" msgstr "Java" -#: src/filetypes.c:224 +#: src/filetypes.c:194 msgid "Pascal source file" msgstr "Pascal" -#: src/filetypes.c:247 +#: src/filetypes.c:208 msgid "Assembler source file" msgstr "Асэмблер" -#: src/filetypes.c:266 +#: src/filetypes.c:221 msgid "Fortran source file (F77)" msgstr "Fortran (F77)" -#: src/filetypes.c:290 +#: src/filetypes.c:235 msgid "(O)Caml source file" msgstr "(O)Caml" -#: src/filetypes.c:310 +#: src/filetypes.c:248 msgid "Perl source file" msgstr "Perl" -#: src/filetypes.c:332 +#: src/filetypes.c:262 msgid "PHP source file" msgstr "PHP" -#: src/filetypes.c:355 +#: src/filetypes.c:276 #, fuzzy msgid "Javascript source file" msgstr "Java" -#: src/filetypes.c:374 +#: src/filetypes.c:289 msgid "Python source file" msgstr "Python" -#: src/filetypes.c:394 +#: src/filetypes.c:302 msgid "Ruby source file" msgstr "Ruby" -#: src/filetypes.c:414 +#: src/filetypes.c:315 msgid "Tcl source file" msgstr "Tcl" -#: src/filetypes.c:435 +#: src/filetypes.c:328 #, fuzzy msgid "Lua source file" msgstr "LaTeX" -#: src/filetypes.c:454 +#: src/filetypes.c:341 msgid "Ferite source file" msgstr "Ferite" -#: src/filetypes.c:473 +#: src/filetypes.c:354 +#, fuzzy +msgid "Haskell source file" +msgstr "Pascal" + +#: src/filetypes.c:367 msgid "Shell script file" msgstr "файл абалонкі" -#: src/filetypes.c:498 +#: src/filetypes.c:381 msgid "Makefile" msgstr "Makefile" -#: src/filetypes.c:516 +#: src/filetypes.c:395 msgid "XML source file" msgstr "XML" -#: src/filetypes.c:534 +#: src/filetypes.c:409 msgid "Docbook source file" msgstr "Docbook" -#: src/filetypes.c:553 +#: src/filetypes.c:422 msgid "HTML source file" msgstr "HTML" -#: src/filetypes.c:571 +#: src/filetypes.c:436 msgid "Cascading StyleSheet" msgstr "CSS" -#: src/filetypes.c:590 +#: src/filetypes.c:449 msgid "SQL Dump file" msgstr "SQL" -#: src/filetypes.c:609 +#: src/filetypes.c:462 msgid "LaTeX source file" msgstr "LaTeX" -#: src/filetypes.c:630 +#: src/filetypes.c:475 msgid "O-Matrix source file" msgstr "O-Matrix" -#: src/filetypes.c:649 +#: src/filetypes.c:488 msgid "VHDL source file" msgstr "VHDL" -#: src/filetypes.c:669 +#: src/filetypes.c:501 msgid "Diff file" msgstr "Файл змяненняў" -#: src/filetypes.c:686 +#: src/filetypes.c:514 msgid "Config file" msgstr "наладкі" -#: src/filetypes.c:709 src/project.c:109 +#: src/filetypes.c:528 src/project.c:267 msgid "All files" msgstr "Усе файлы" -#: src/filetypes.c:718 +#: src/filetypes.c:549 src/interface.c:3504 msgid "None" msgstr "Нічога" +#: src/filetypes.c:857 src/win32.c:78 +msgid "All Source" +msgstr "" + #: src/geany.h:50 msgid "untitled" msgstr "без назвы" -#: src/interface.c:260 src/interface.c:1508 +#: src/interface.c:269 src/interface.c:1563 msgid "Geany" msgstr "Geany" -#: src/interface.c:270 +#: src/interface.c:279 msgid "_File" msgstr "_Файл" -#: src/interface.c:281 +#: src/interface.c:290 msgid "New (with _Template)" msgstr "Новы (з шаблёнам)" -#: src/interface.c:292 src/interface.c:353 src/interface.c:527 -#: src/interface.c:578 src/interface.c:766 src/interface.c:776 -#: src/interface.c:2022 src/interface.c:2073 +#: src/interface.c:301 src/interface.c:362 src/interface.c:542 +#: src/interface.c:561 src/interface.c:616 src/interface.c:808 +#: src/interface.c:818 src/interface.c:2088 src/interface.c:2107 +#: src/interface.c:2162 msgid "invisible" msgstr "нябачна" -#: src/interface.c:304 src/interface.c:1940 +#: src/interface.c:313 src/interface.c:2010 #, fuzzy msgid "Open Selected F_ile" msgstr "Адчыніць файл" -#: src/interface.c:308 +#: src/interface.c:317 msgid "Recent _Files" msgstr "Нядаўнія файлы" -#: src/interface.c:325 +#: src/interface.c:334 msgid "Save A_ll" msgstr "Захаваць усе" -#: src/interface.c:328 +#: src/interface.c:337 msgid "Saves all open files" msgstr "Захаваць усе адчыненыя файлы" -#: src/interface.c:342 +#: src/interface.c:351 msgid "R_eload As" msgstr "Загрузіць зноў як" +#: src/interface.c:370 +msgid "Load Ta_gs" +msgstr "" + #: src/interface.c:373 +msgid "Load global tags file" +msgstr "" + +#: src/interface.c:392 msgid "Prints the current file" msgstr "Друкаваць цякучы файл" -#: src/interface.c:384 +#: src/interface.c:403 msgid "C_lose All" msgstr "Зачыніць усе" -#: src/interface.c:387 +#: src/interface.c:406 msgid "Closes all open files" msgstr "Зачыніць усе адкрытыя файлы" -#: src/interface.c:401 src/interface.c:1080 +#: src/interface.c:420 src/interface.c:1126 msgid "Quit Geany" msgstr "Выхад" -#: src/interface.c:403 +#: src/interface.c:422 msgid "_Edit" msgstr "Змена" -#: src/interface.c:444 src/interface.c:1931 +#: src/interface.c:463 src/interface.c:2001 msgid "Select _All" msgstr "Вылучыць усё" -#: src/interface.c:453 src/interface.c:1949 +#: src/interface.c:472 src/interface.c:2019 msgid "_Format" msgstr "Фармат" -#: src/interface.c:456 +#: src/interface.c:475 msgid "Convert the case of the current selection" msgstr "Ператварыць рэгістар цякучага вылучэньня" -#: src/interface.c:461 src/interface.c:1956 +#: src/interface.c:480 src/interface.c:2026 msgid "Convert Selection to _Lower-case" msgstr "Ператварыць вылучэньне ў ніжні рэгістар" -#: src/interface.c:465 src/interface.c:1960 +#: src/interface.c:484 src/interface.c:2030 msgid "Convert Selection to _Upper-case" msgstr "Ператварыць вылучэньне ў верхні рэгістар" -#: src/interface.c:474 src/interface.c:1969 +#: src/interface.c:493 src/interface.c:2039 msgid "_Comment Line(s)" msgstr "Камэнтаваць радок" -#: src/interface.c:478 src/interface.c:1973 +#: src/interface.c:497 src/interface.c:2043 msgid "U_ncomment Line(s)" msgstr "Рас камэнтаваць радок" -#: src/interface.c:482 src/interface.c:1977 +#: src/interface.c:501 src/interface.c:2047 msgid "_Toggle Line Commentation" msgstr "Камэнтаваць/Рас камэнтаваць радок" -#: src/interface.c:486 src/interface.c:1981 +#: src/interface.c:505 src/interface.c:2051 msgid "Du_plicate Line or Selection" msgstr "Дубліраваць радок ці вылучэньне" -#: src/interface.c:495 src/interface.c:1990 +#: src/interface.c:514 src/interface.c:2060 msgid "_Increase Indent" msgstr "Павялічыць адступ" -#: src/interface.c:503 src/interface.c:1998 +#: src/interface.c:522 src/interface.c:2068 msgid "_Decrease Indent" msgstr "Зьменшыць адступ" -#: src/interface.c:516 +#: src/interface.c:535 src/interface.c:2081 +#, fuzzy +msgid "_Send Selection to" +msgstr "У вылучэньні" + +#: src/interface.c:550 msgid "_Insert \"include <...>\"" msgstr "Уставіць \"include <...>\"" -#: src/interface.c:530 +#: src/interface.c:564 msgid "I_nsert Comments" msgstr "Уставіць камэнтарый" -#: src/interface.c:541 src/interface.c:2036 +#: src/interface.c:575 src/interface.c:2121 msgid "Insert ChangeLog Entry" msgstr "Уставіць ChangeLog запіс" -#: src/interface.c:544 src/interface.c:2039 +#: src/interface.c:578 src/interface.c:2124 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Уставіць тыпічны радок ChangeLog у цякучы файл" -#: src/interface.c:546 src/interface.c:2041 +#: src/interface.c:580 src/interface.c:2126 msgid "Insert File Header" msgstr "Уставіць загаловак файла" -#: src/interface.c:549 src/interface.c:2044 +#: src/interface.c:583 src/interface.c:2129 msgid "Inserts a file header at the beginning of the file" msgstr "Уставіць загаловак ў пачатку файла" -#: src/interface.c:551 src/interface.c:2046 +#: src/interface.c:585 src/interface.c:2131 msgid "Insert Function Description" msgstr "Уставіць апісаньне функцыі" -#: src/interface.c:554 src/interface.c:2049 +#: src/interface.c:588 src/interface.c:2134 msgid "Inserts a description before the current function" msgstr "Уставіць апісаньне перад цякучай функцыяй" -#: src/interface.c:556 src/interface.c:2051 +#: src/interface.c:590 src/interface.c:2136 msgid "Insert Multiline Comment" msgstr "Уставіць шматрадковы камэнтарый" -#: src/interface.c:559 src/interface.c:2054 +#: src/interface.c:593 src/interface.c:2139 msgid "Inserts a multiline comment" msgstr "Уставіць шматрадковы камэнтарый" -#: src/interface.c:561 src/interface.c:2056 +#: src/interface.c:595 src/interface.c:2141 msgid "Insert GPL Notice" msgstr "Уставіць GPL паведамленьне" -#: src/interface.c:564 src/interface.c:2059 +#: src/interface.c:598 src/interface.c:2144 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "Уставіць GPL паведамленьне (павінна быць зроблена ў пачатку файла)" -#: src/interface.c:566 +#: src/interface.c:600 #, fuzzy msgid "Insert BSD License Notice" msgstr "Уставіць GPL паведамленьне" -#: src/interface.c:569 src/interface.c:2064 +#: src/interface.c:603 src/interface.c:2149 #, fuzzy msgid "" "Inserts a BSD licence notice (should be done at the beginning of the file)" msgstr "Уставіць GPL паведамленьне (павінна быць зроблена ў пачатку файла)" -#: src/interface.c:571 src/interface.c:2066 +#: src/interface.c:605 src/interface.c:2151 msgid "Insert Dat_e" msgstr "Уставіць дату" -#: src/interface.c:590 +#: src/interface.c:628 msgid "_Search" msgstr "Шукаць" -#: src/interface.c:601 +#: src/interface.c:639 msgid "Find _Next" msgstr "Шукаць наступны" -#: src/interface.c:605 +#: src/interface.c:643 msgid "Find _Previous" msgstr "Шукаць былы" -#: src/interface.c:609 +#: src/interface.c:647 msgid "Find in F_iles" msgstr "Шукаць у файлах" -#: src/interface.c:613 src/search.c:429 +#: src/interface.c:651 src/search.c:422 msgid "_Replace" msgstr "_Замяніць" -#: src/interface.c:626 +#: src/interface.c:664 #, fuzzy msgid "Find _Selected" msgstr "Шукаць наступны" -#: src/interface.c:630 +#: src/interface.c:668 msgid "Find Pre_v Selected" msgstr "" -#: src/interface.c:639 +#: src/interface.c:677 msgid "Next _Message" msgstr "Наступнае паведамленьне" -#: src/interface.c:648 +#: src/interface.c:686 msgid "_Go to Line" msgstr "_Ісьці да радка" -#: src/interface.c:663 +#: src/interface.c:701 msgid "Change _Font" msgstr "Зьмяніць шрыфт" -#: src/interface.c:666 +#: src/interface.c:704 msgid "Change the default font" msgstr "Зьмяніць прадвызначаны шрыфт" -#: src/interface.c:677 +#: src/interface.c:715 src/keybindings.c:173 +msgid "Toggle all additional widgets" +msgstr "" + +#: src/interface.c:719 msgid "Full_screen" msgstr "Увесь экран" -#: src/interface.c:681 +#: src/interface.c:723 msgid "Show Message _Window" msgstr "Паказваць вакно паведамленьняў" -#: src/interface.c:684 +#: src/interface.c:726 msgid "Toggle the window with status and compiler messages on and off" msgstr "Паказаць/Схаваць акно з паведамленьнямі і статусам кампілятара" -#: src/interface.c:687 +#: src/interface.c:729 msgid "Show _Toolbar" msgstr "Паказваць панэль прыладаў" -#: src/interface.c:690 +#: src/interface.c:732 msgid "Toggle the toolbar on and off" msgstr "Паказаць/Схаваць акно прыладаў" -#: src/interface.c:693 +#: src/interface.c:735 msgid "Show Side_bar" msgstr "Паказваць панэль прыладаў" -#: src/interface.c:698 +#: src/interface.c:740 msgid "Show _Markers Margin" msgstr "Паказваць _Markers Margin" -#: src/interface.c:701 +#: src/interface.c:743 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines." @@ -1249,337 +1270,346 @@ "Паказаць/Схаваць маленькі margin, які выкарыстоўваецца для вылучэньня " "радкоў, справа ад нумару радка." -#: src/interface.c:704 +#: src/interface.c:746 msgid "Show _Line Numbers" msgstr "Паказваць нумар радка" -#: src/interface.c:707 +#: src/interface.c:749 msgid "Shows or hides the Line Number margin." msgstr "Паказаць/Схаваць нумар радка." -#: src/interface.c:727 +#: src/interface.c:769 msgid "_Document" msgstr "_Дакумэнт" -#: src/interface.c:734 +#: src/interface.c:776 msgid "_Line Wrapping" msgstr "Разлучыцель радкоў" -#: src/interface.c:737 src/interface.c:3273 +#: src/interface.c:779 src/interface.c:3511 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " "disabled on slow machines." msgstr "" -#: src/interface.c:740 +#: src/interface.c:782 msgid "_Use Auto-indentation" msgstr "Выкарыстоўваць аўтаматычнае фарматаваньне" -#: src/interface.c:745 +#: src/interface.c:787 msgid "Read _Only" msgstr "Талькі _чытаць" -#: src/interface.c:748 +#: src/interface.c:790 msgid "Treat this file as read-only. No changes can be made." msgstr "Лічыць файл толькі для чытаньня. Зьмяненьні немагчыма зрабіць." -#: src/interface.c:750 +#: src/interface.c:792 msgid "_Write Unicode BOM" msgstr "Пісаць юнікодны BOM" -#: src/interface.c:759 +#: src/interface.c:801 msgid "Set File_type" msgstr "Усталяваць тып файла" -#: src/interface.c:769 +#: src/interface.c:811 msgid "Set _Encoding" msgstr "Усталяваць знаканабор" -#: src/interface.c:779 +#: src/interface.c:821 msgid "Set Line E_ndings" msgstr "Усталяваць завяршэньне радка" -#: src/interface.c:786 +#: src/interface.c:828 msgid "Convert and Set to _CR/LF (Win)" msgstr "Зьмяніць на CR/LF (Win)" -#: src/interface.c:792 +#: src/interface.c:834 msgid "Convert and Set to _LF (Unix)" msgstr "Зьмяніць на LF (Unix)" -#: src/interface.c:798 +#: src/interface.c:840 msgid "Convert and Set to CR (_Mac)" msgstr "Зьмяніць на CR (Mac)" -#: src/interface.c:809 +#: src/interface.c:851 msgid "_Replace Tabs by Spaces" msgstr "Зьмяняць табуляцыю на прабелы" -#: src/interface.c:812 src/interface.c:3041 +#: src/interface.c:854 src/interface.c:3264 msgid "Replaces all tabs in document by spaces." msgstr "Зьмяніць усе табуляцыі ў дакумэнце на прабелы." -#: src/interface.c:819 +#: src/interface.c:861 msgid "_Fold All" msgstr "Зьвярнуць усе" -#: src/interface.c:822 +#: src/interface.c:864 msgid "Folds all contractible code blocks" msgstr "Зьвярнуць усе блёкі кода" -#: src/interface.c:824 +#: src/interface.c:866 msgid "_Unfold All" msgstr "Разьвярнуць усе" -#: src/interface.c:827 +#: src/interface.c:869 msgid "Unfolds all contracted code blocks" msgstr "Разьвярнуць усе блёкі кода" -#: src/interface.c:834 +#: src/interface.c:876 +msgid "Remove _Markers" +msgstr "" + +#: src/interface.c:880 msgid "Remove Error _Indicators" msgstr "Выдаліць індыкатары памылак" -#: src/interface.c:837 +#: src/interface.c:883 msgid "Removes all error indicators in the current document." msgstr "Выдаліць усе індыкатары памылак у цякучым дакумэнце" -#: src/interface.c:839 +#: src/interface.c:885 msgid "_Project" msgstr "" -#: src/interface.c:846 +#: src/interface.c:892 #, fuzzy msgid "_New" msgstr "Новы" -#: src/interface.c:854 +#: src/interface.c:900 #, fuzzy msgid "_Open" msgstr "Адчыніць" -#: src/interface.c:862 +#: src/interface.c:908 #, fuzzy msgid "_Close" msgstr "Зачыніць" -#: src/interface.c:883 +#: src/interface.c:929 msgid "_Tools" msgstr "Прылады" -#: src/interface.c:890 +#: src/interface.c:936 msgid "_Colour Chooser" msgstr "Выбар колеру" -#: src/interface.c:893 src/interface.c:1018 +#: src/interface.c:939 src/interface.c:1064 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette." msgstr "Адчыніць дыялёг, для вылучэньня колеру з палітры." -#: src/interface.c:899 +#: src/interface.c:945 msgid "_Word Count" msgstr "Лічыць словы" -#: src/interface.c:902 +#: src/interface.c:948 msgid "" "Counts the words and characters in the current selection or the whole " "document" msgstr "Лічыць слава і літары ў вылучаным тэксту альбо ва ўсім дакумэнце" -#: src/interface.c:904 +#: src/interface.c:950 msgid "_Insert Special HTML Characters" msgstr "Уставіць спэцыяльныя HTML літары" -#: src/interface.c:908 +#: src/interface.c:954 msgid "_Help" msgstr "Дапамога" -#: src/interface.c:919 +#: src/interface.c:965 msgid "_Keyboard Shortcuts" msgstr "_Клявішы" -#: src/interface.c:922 +#: src/interface.c:968 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Паказаць сьпіс усіх выкарыстоўваемых клявіш." -#: src/interface.c:924 +#: src/interface.c:970 msgid "_Website" msgstr "Інтэрнэт _старонка" -#: src/interface.c:947 +#: src/interface.c:993 msgid "Create a new file" msgstr "Зрабiць новы файл" -#: src/interface.c:953 +#: src/interface.c:999 msgid "Open an existing file" msgstr "Адчыніць існуючы файл" -#: src/interface.c:958 +#: src/interface.c:1004 msgid "Save the current file" msgstr "Захаваць цякучы файл" -#: src/interface.c:960 src/keybindings.c:123 +#: src/interface.c:1006 src/keybindings.c:132 msgid "Save all" msgstr "Захаваць усе" -#: src/interface.c:963 +#: src/interface.c:1009 msgid "Save all open files" msgstr "Захаваць усе адчыненыя файлы" -#: src/interface.c:972 +#: src/interface.c:1018 msgid "Reload the current file from disk" msgstr "Загрузіць цякучы файл з дыска" -#: src/interface.c:977 +#: src/interface.c:1023 msgid "Close the current file" msgstr "Зачыніць цякучы файл" -#: src/interface.c:986 +#: src/interface.c:1032 msgid "Undo the last modification" msgstr "Адмяніць апошнюю мадыфікацыю" -#: src/interface.c:991 +#: src/interface.c:1037 msgid "Redo the last modification" msgstr "Адмяніць адмену апошняй мадыфікацыі" -#: src/interface.c:999 src/keybindings.c:179 +#: src/interface.c:1045 src/keybindings.c:200 msgid "Compile" msgstr "Кампіляваць" -#: src/interface.c:1002 +#: src/interface.c:1048 msgid "Compile the current file" msgstr "Кампіляваць цякучы файл" -#: src/interface.c:1015 +#: src/interface.c:1061 msgid "Color" msgstr "Колер" -#: src/interface.c:1027 +#: src/interface.c:1073 msgid "Zoom in the text" msgstr "Павялічыць тэкст" -#: src/interface.c:1032 +#: src/interface.c:1078 msgid "Zoom out the text" msgstr "Зьменшыць тэкст" -#: src/interface.c:1045 src/interface.c:1050 +#: src/interface.c:1091 src/interface.c:1096 msgid "Find the entered text in the current file" msgstr "Знайсьці уведзены тэкст у цякучым файле" -#: src/interface.c:1063 +#: src/interface.c:1109 msgid "Enter a line number and jump to it." msgstr "Увядзі нумар радка да перахода." -#: src/interface.c:1070 +#: src/interface.c:1116 msgid "Jump to the entered line number." msgstr "Перайсьці да ўведзенага радка." -#: src/interface.c:1108 src/treeviews.c:73 +#: src/interface.c:1154 src/treeviews.c:77 msgid "Symbols" msgstr "Сімвалы" -#: src/interface.c:1121 src/treeviews.c:182 +#: src/interface.c:1167 src/treeviews.c:189 msgid "Open files" msgstr "Адчыніць файлы" -#: src/interface.c:1156 +#: src/interface.c:1202 msgid "Status" msgstr "Стан" -#: src/interface.c:1170 +#: src/interface.c:1216 msgid "Compiler" msgstr "Кампілятар" -#: src/interface.c:1184 +#: src/interface.c:1230 msgid "Messages" msgstr "Паведамленьні" -#: src/interface.c:1197 +#: src/interface.c:1243 msgid "Scribble" msgstr "Для заметак" -#: src/interface.c:1753 src/interface.c:2896 +#: src/interface.c:1817 src/interface.c:3119 msgid "Images and text" msgstr "Малюнкі і тэкст" -#: src/interface.c:1759 src/interface.c:2928 +#: src/interface.c:1823 src/interface.c:3151 msgid "Images only" msgstr "Толькі малюнкі" -#: src/interface.c:1765 src/interface.c:2920 +#: src/interface.c:1829 src/interface.c:3143 msgid "Text only" msgstr "Толькі тэкст" -#: src/interface.c:1776 src/interface.c:2912 +#: src/interface.c:1840 src/interface.c:3135 msgid "Large icons" msgstr "Павялічаныя значкі" -#: src/interface.c:1781 src/interface.c:2904 +#: src/interface.c:1845 src/interface.c:3127 msgid "Small icons" msgstr "Паменшаныя значкі" -#: src/interface.c:1791 +#: src/interface.c:1855 msgid "Hide toolbar" msgstr "Схаваць панэль прыладаў" -#: src/interface.c:2011 +#: src/interface.c:2096 msgid "Insert \"include <...>\"" msgstr "Уставіць \"include <...>\"" -#: src/interface.c:2025 +#: src/interface.c:2110 msgid "Insert Comments" msgstr "Уставіць камэнтарый" -#: src/interface.c:2061 +#: src/interface.c:2146 #, fuzzy msgid "Insert BSD license Notice" msgstr "Уставіць GPL паведамленьне" -#: src/interface.c:2081 src/keybindings.c:245 +#: src/interface.c:2170 src/keybindings.c:287 msgid "Find Usage" msgstr "Знайсьці выкарыстоўваньне" -#: src/interface.c:2089 +#: src/interface.c:2178 msgid "Go to Tag Definition" msgstr "Перайсьці да рэалізацыі" -#: src/interface.c:2093 +#: src/interface.c:2182 msgid "Go to Tag Declaration" msgstr "Перайсьці да аб'явы" -#: src/interface.c:2102 +#: src/interface.c:2186 src/keybindings.c:293 +#, fuzzy +msgid "Context Action" +msgstr "У вылучэньні" + +#: src/interface.c:2195 msgid "Go to Line" msgstr "Перайсьці да радка" -#: src/interface.c:2105 +#: src/interface.c:2198 msgid "Goto to the entered line" msgstr "Перайсьці да ўведзенага радка" -#: src/interface.c:2477 src/keybindings.c:141 +#: src/interface.c:2601 src/keybindings.c:153 msgid "Preferences" msgstr "Уласьцівасьці" -#: src/interface.c:2510 +#: src/interface.c:2634 msgid "Load files from the last session" msgstr "Загрузіць файлы з апошняга сэансу" -#: src/interface.c:2514 +#: src/interface.c:2638 msgid "Opens at startup the files from the last session" msgstr "Адчыняць файлы з апошняга сэансу пры старце" -#: src/interface.c:2517 +#: src/interface.c:2641 msgid "Save window position and geometry" msgstr "Захаваць пазыцыю вокан і геамэтрыю" -#: src/interface.c:2521 +#: src/interface.c:2645 msgid "Saves the window position and geometry and restores it at the start" msgstr "Захаваць пазыцыю вокан і геамэтрыю, і аднаўляць яе пры старце" -#: src/interface.c:2524 +#: src/interface.c:2648 msgid "Load virtual terminal emulation at startup" msgstr "Загружаць эмулятар тэрмінала пры старце" -#: src/interface.c:2526 +#: src/interface.c:2650 msgid "" "Whether the virtual terminal emulation(VTE) should be loaded at startup. " "Disable it if you do not need it." @@ -1587,43 +1617,43 @@ "Ці трэба Загружаць эмулятар тэрмінала пры старце. Забараніце, калі ён не " "патрэбен. " -#: src/interface.c:2529 +#: src/interface.c:2653 msgid "Confirm exit" msgstr "Пацьвярджаць выхад" -#: src/interface.c:2533 +#: src/interface.c:2657 msgid "Shows a confirmation dialog on exit." msgstr "Паказваць пацьвярджаючы дыялёг пры выхадзе." -#: src/interface.c:2536 +#: src/interface.c:2660 msgid "Startup and shutdown" msgstr "Запуск і завяршэньне" -#: src/interface.c:2555 +#: src/interface.c:2679 msgid "Beep on errors or when compilation has finished" msgstr "Гудок пры памылках, ці на завяршэньне кампіляцыі" -#: src/interface.c:2558 +#: src/interface.c:2682 msgid "" "Whether to beep if an error occured or when the compilation process has " "finished." msgstr "Ці трэба гудзець пры памылкі, ці на завяршэньне кампіляцыі." -#: src/interface.c:2561 +#: src/interface.c:2685 msgid "Switch to status message list at new message" msgstr "Пераключацца ў вакно паведамленьняў, пры з'з'яўленні новага" -#: src/interface.c:2564 +#: src/interface.c:2688 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives." msgstr "Пераключацца ў вакно паведамленьняў, пры з'выпадкі новага." -#: src/interface.c:2567 +#: src/interface.c:2691 msgid "Always wrap search and hide the Find dialog" msgstr "Заўсёды пракручваць пошук і хаваць дыялёг пошуку" -#: src/interface.c:2571 +#: src/interface.c:2695 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1631,307 +1661,356 @@ "Заўсёды пракручваць пошук і хаваць дыялёг пошуку пасля націсканьня Шукаць " "Наспупны/Былы" -#: src/interface.c:2574 +#: src/interface.c:2698 msgid "Behaviour" msgstr "Паводзіны" -#: src/interface.c:2579 +#: src/interface.c:2717 +msgid "Context Action command:" +msgstr "" + +#: src/interface.c:2724 +#, c-format +msgid "" +"Context action command. The current selected word can be used with %s. It " +"can be everywhere in the given command and will be replaced before execution." +msgstr "" + +#: src/interface.c:2727 +#, fuzzy +msgid "Context Action" +msgstr "Месца:" + +#: src/interface.c:2747 +#, fuzzy +msgid "Project files:" +msgstr "Уласьцівасьці" + +#: src/interface.c:2760 +msgid "Path to start in when opening project files" +msgstr "" + +#: src/interface.c:2773 +#, fuzzy +msgid "Paths" +msgstr "Шлях да прыладаў" + +#: src/interface.c:2778 msgid "General" msgstr "Агульны" -#: src/interface.c:2601 +#: src/interface.c:2800 msgid "Show symbol list" msgstr "Паказваць сьпіс сімвалаў" -#: src/interface.c:2604 src/interface.c:2610 +#: src/interface.c:2803 msgid "Toggle the symbol list on and off" msgstr "Паказаць/Схаваць сьпіс сімвалаў" -#: src/interface.c:2607 +#: src/interface.c:2806 msgid "Show open files list" msgstr "Паказаць сьпіс адчыненых файлаў" -#: src/interface.c:2613 +#: src/interface.c:2809 +#, fuzzy +msgid "Toggle the open files list on and off" +msgstr "Паказаць/Схаваць сьпіс сімвалаў" + +#: src/interface.c:2812 msgid "Sidebar" msgstr "Sidebar" -#: src/interface.c:2634 +#: src/interface.c:2833 msgid "Symbol list:" msgstr "Сьпіс сімвалаў:" -#: src/interface.c:2641 src/interface.c:2706 +#: src/interface.c:2840 src/interface.c:2905 msgid "Message window:" msgstr "Акно паведамленьняў:" -#: src/interface.c:2648 src/interface.c:2713 +#: src/interface.c:2847 src/interface.c:2912 msgid "Editor:" msgstr "Рэдактар:" -#: src/interface.c:2660 +#: src/interface.c:2859 msgid "Sets the font for the message window" msgstr "Усталяваць шрыфт для вакна паведамленьняў" -#: src/interface.c:2668 +#: src/interface.c:2867 msgid "Sets the font for the symbol list" msgstr "Усталяваць шрыфт для сьпісу сімвалаў" -#: src/interface.c:2676 +#: src/interface.c:2875 msgid "Sets the editor font" msgstr "Шрыфт рэдактара" -#: src/interface.c:2678 +#: src/interface.c:2877 msgid "Fonts" msgstr "Шрыфты" -#: src/interface.c:2699 +#: src/interface.c:2898 msgid "Sidebar:" msgstr "Sidebar:" -#: src/interface.c:2720 +#: src/interface.c:2919 msgid "Show editor tabs" msgstr "Паказваць закладкі рэдактара" -#: src/interface.c:2731 src/interface.c:2741 src/interface.c:2751 -#: src/interface.c:3088 +#: src/interface.c:2930 src/interface.c:2940 src/interface.c:2950 +#: src/interface.c:3311 msgid "Left" msgstr "Улева" -#: src/interface.c:2732 src/interface.c:2742 src/interface.c:2752 -#: src/interface.c:3096 +#: src/interface.c:2931 src/interface.c:2941 src/interface.c:2951 +#: src/interface.c:3319 msgid "Right" msgstr "Справа" -#: src/interface.c:2733 src/interface.c:2743 src/interface.c:2753 +#: src/interface.c:2932 src/interface.c:2942 src/interface.c:2952 msgid "Top" msgstr "Верх" -#: src/interface.c:2734 src/interface.c:2744 src/interface.c:2754 +#: src/interface.c:2933 src/interface.c:2943 src/interface.c:2953 msgid "Bottom" msgstr "Ніз" -#: src/interface.c:2756 +#: src/interface.c:2955 msgid "Tab placement" msgstr "Распалажэньне закладак:" -#: src/interface.c:2761 +#: src/interface.c:2974 +#, fuzzy +msgid "Show statusbar" +msgstr "Паказваць панэль прыладаў" + +#: src/interface.c:2977 +msgid "Whether to show the status bar at the bottom of the main window." +msgstr "" + +#: src/interface.c:2979 +#, fuzzy +msgid "Miscellaneous" +msgstr "Іншае." + +#: src/interface.c:2984 msgid "Interface" msgstr "Інтэрфэйс" -#: src/interface.c:2780 +#: src/interface.c:3003 msgid "Show Toolbar" msgstr "Паказваць панэль прыладаў" -#: src/interface.c:2805 +#: src/interface.c:3028 msgid "Show file operation buttons" msgstr "Паказваць кнопкі дзеяньняў" -#: src/interface.c:2809 +#: src/interface.c:3032 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" msgstr "" "Паказваць Новы, Адкрыць, Закрыць, Захаваць, Пераадкрыць на панэлі прылад" -#: src/interface.c:2812 +#: src/interface.c:3035 msgid "Show Compile and Run" msgstr "Паказваць Кампіляваць і Запусьціць" -#: src/interface.c:2816 +#: src/interface.c:3039 msgid "Display the Compile and Run buttons in the toolbar" msgstr "Паказваць кнопкі Кампіляваць і Запусьціць на панэлі прылад" -#: src/interface.c:2819 +#: src/interface.c:3042 msgid "Show Colour Chooser button" msgstr "Паказваць Вылучыць колер" -#: src/interface.c:2823 +#: src/interface.c:3046 msgid "Display the Colour Chooser button in the toolbar" msgstr "Паказваць Вылучыць колер на панэлі прылад" -#: src/interface.c:2826 +#: src/interface.c:3049 msgid "Show Zoom In and Zoom Out" msgstr "Паказваць Павялічыць і Зьменшыць" -#: src/interface.c:2830 +#: src/interface.c:3053 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Паказваць Павялічыць і Зьменшыць на панэлі прылад" -#: src/interface.c:2833 +#: src/interface.c:3056 msgid "Show Redo and Undo buttons" msgstr "Паказваць Адмяніць адмену і Адмяніць" -#: src/interface.c:2837 +#: src/interface.c:3060 msgid "Display the Redo and Undo buttons in the toolbar" msgstr "Паказваць Адмяніць адмену і Адмяніць на панэлі прылад" -#: src/interface.c:2840 +#: src/interface.c:3063 msgid "Show Search field" msgstr "Паказваць поле шукаць" -#: src/interface.c:2844 +#: src/interface.c:3067 msgid "Display the search field and button in the toolbar" msgstr "Паказваць поле шукаць і кнопку на панэлі прылад" -#: src/interface.c:2847 +#: src/interface.c:3070 msgid "Show Goto line field" msgstr "Паказваць Перайсьці да радка" -#: src/interface.c:2851 +#: src/interface.c:3074 msgid "Display the line number field and button in the toolbar" msgstr "Паказваць поле перайсьці да радка і кнопку на панэлі прылад" -#: src/interface.c:2854 +#: src/interface.c:3077 msgid "Show Quit button" msgstr "Паказваць кнопку Выйсьці" -#: src/interface.c:2858 +#: src/interface.c:3081 msgid "Display the quit button in the toolbar" msgstr "Паказваць кнопку Выйсьці на панэлі прылад" -#: src/interface.c:2861 +#: src/interface.c:3084 msgid "Items" msgstr "Рэчы" -#: src/interface.c:2882 +#: src/interface.c:3105 msgid "Icon style:" msgstr "Стыль значкоў:" -#: src/interface.c:2889 +#: src/interface.c:3112 msgid "Icon size:" msgstr "Памер значкоў:" -#: src/interface.c:2936 +#: src/interface.c:3159 msgid "Appearance" msgstr "Выгляд" -#: src/interface.c:2941 +#: src/interface.c:3164 msgid "Toolbar" msgstr "Прылады" -#: src/interface.c:2969 +#: src/interface.c:3192 msgid "Tab Width:" msgstr "Шырыня закладкі" -#: src/interface.c:2981 +#: src/interface.c:3204 msgid "Sets the default encoding for newly created files." msgstr "Вызначыць прадвызначаны знаканабор для новых файлаў" -#: src/interface.c:2993 +#: src/interface.c:3216 msgid "The width in chars, which one tab character will take" msgstr "Шырыня адной закладкі ў кропках" -#: src/interface.c:2998 +#: src/interface.c:3221 msgid "Default encoding:" msgstr "Прадвызначаны знаканабор:" -#: src/interface.c:3004 +#: src/interface.c:3227 msgid "New files" msgstr "Новыя файлы" -#: src/interface.c:3023 +#: src/interface.c:3246 msgid "Strip trailing spaces" msgstr "Выдаляць завяршаючыя прабелы" -#: src/interface.c:3027 +#: src/interface.c:3250 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Выдаляць завяршаючыя прабелы на канцах радкоў" -#: src/interface.c:3030 +#: src/interface.c:3253 msgid "Ensure new line at file end" msgstr "Забясьпечыць пусты радок у канцы файла" -#: src/interface.c:3034 +#: src/interface.c:3257 msgid "Ensures that at the end of the file is a new line" msgstr "Забясьпечыць пусты радок у канцы файла" -#: src/interface.c:3037 src/keybindings.c:171 +#: src/interface.c:3260 src/keybindings.c:191 msgid "Replace tabs by space" msgstr "Зьмяніць табуляцыі на прабелы" -#: src/interface.c:3044 +#: src/interface.c:3267 msgid "Saving files" msgstr "Захаваць файлы" -#: src/interface.c:3065 +#: src/interface.c:3288 msgid "Placement of new file tabs:" msgstr "Пазыцыя новых файлаў ў закладцы файлаў" -#: src/interface.c:3078 +#: src/interface.c:3301 msgid "" "Specifies the number of files which are stored in the Recent files list." msgstr "Указаць колькі файлаў трэба паказваць у сьпісе нядаўніх файлаў." -#: src/interface.c:3091 +#: src/interface.c:3314 msgid "File tabs will be placed on the left of the notebook" msgstr "Новыя файлы будуць зьмешчаны зьлева у закладцы файлаў" -#: src/interface.c:3099 +#: src/interface.c:3322 msgid "File tabs will be placed on the right of the notebook" msgstr "Новыя файлы будуць зьмешчаны справа у закладцы файлаў" -#: src/interface.c:3103 +#: src/interface.c:3326 msgid "Recent files list length:" msgstr "Даўжыня сьпіса апошніх файлаў:" -#: src/interface.c:3111 +#: src/interface.c:3334 msgid "Misc." msgstr "Іншае." -#: src/interface.c:3116 src/symbols.c:405 +#: src/interface.c:3339 src/symbols.c:422 msgid "Files" msgstr "Файлы" -#: src/interface.c:3138 +#: src/interface.c:3361 msgid "Invert syntax highlighting colours" msgstr "Інвэртаваць колер падсьветкі сынтаксіса" -#: src/interface.c:3140 +#: src/interface.c:3363 msgid "Use white text on a black background." msgstr "Выкарыстоўваць белы колек на чорным фоне" -#: src/interface.c:3142 +#: src/interface.c:3365 msgid "Show indentation guides" msgstr "Паказваць рукаводства фарматыравання" -#: src/interface.c:3145 +#: src/interface.c:3368 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "Паказваць маленькія рысы з кропкамі дапамагаючыя фарматыраванню." -#: src/interface.c:3148 +#: src/interface.c:3371 msgid "Show white space" msgstr "Паказваць прабелы" -#: src/interface.c:3151 +#: src/interface.c:3374 msgid "Marks spaces with dots and tabs with arrows." msgstr "Паказваць прабелы кропкамі, табуляцыі стрэлкамі." -#: src/interface.c:3154 +#: src/interface.c:3377 msgid "Show line endings" msgstr "Паказваць завяршэньне радка" -#: src/interface.c:3157 +#: src/interface.c:3380 msgid "Show the line ending character" msgstr "Паказваць літару завяршэньне радка (EOL)" -#: src/interface.c:3160 +#: src/interface.c:3383 msgid "Display" msgstr "Паказваць" -#: src/interface.c:3181 +#: src/interface.c:3404 msgid "Long line marker:" msgstr "Маркёр доўгага радка:" -#: src/interface.c:3188 +#: src/interface.c:3411 msgid "Long line marker color:" msgstr "Колер маркёра доўгага радка:" -#: src/interface.c:3195 +#: src/interface.c:3418 msgid "Type:" msgstr "Тып:" -#: src/interface.c:3207 +#: src/interface.c:3430 msgid "Sets the color of the long line marker" msgstr "Усталяваць колер маркёра доўгага радка" -#: src/interface.c:3216 +#: src/interface.c:3439 msgid "" "The long line marker is a thin vertical line in the editor. It helps to mark " "long lines, or as a hint to break the line. Set this value to a value " @@ -1941,11 +2020,11 @@ "вылучыць доўгія радкі. Каб забараніць пастаўце 0, ці ўкажыце праз колькі " "літар яна павінна паявіцца" -#: src/interface.c:3226 +#: src/interface.c:3449 msgid "Line" msgstr "Рыса" -#: src/interface.c:3229 +#: src/interface.c:3452 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)." @@ -1953,58 +2032,71 @@ "Паказваць вэртыкальную рысу ў вакне рэдактара ў указанай пазыцыі.(глядзі " "ніжэй)." -#: src/interface.c:3233 +#: src/interface.c:3456 msgid "Background" msgstr "Фон" -#: src/interface.c:3236 +#: src/interface.c:3459 msgid "" "The background colour of characters after the given cursor position (see " "below) changed to the colour set below. (This is recommended if you use " "proportional fonts)" msgstr "" -#: src/interface.c:3240 +#: src/interface.c:3463 msgid "Disabled" msgstr "Забаронены" -#: src/interface.c:3246 +#: src/interface.c:3469 msgid "Long line marker" msgstr "Маркёр доўгага радка" -#: src/interface.c:3265 -msgid "Auto indentation" +#: src/interface.c:3492 +#, fuzzy +msgid "Auto indentation mode:" msgstr "Аўтаматычнае фарматаванне" -#: src/interface.c:3268 -msgid "Add the same indentation as the previous line after pressing enter" -msgstr "Дадаваць да новага радка фарматаванне як у папярэдняга." +#: src/interface.c:3499 +msgid "" +"Selects the indentation mode. Use None to disable auto indentation " +"completely. Basic indents new lines with the same indentation as the " +"previous line. Advanced does the same and indents also curly brackets." +msgstr "" -#: src/interface.c:3270 +#: src/interface.c:3505 +#, fuzzy +msgid "Basic" +msgstr "Baltic" + +#: src/interface.c:3506 +msgid "Advanced" +msgstr "" + +#: src/interface.c:3508 msgid "Line wrapping" msgstr "Разлучаць радкі" -#: src/interface.c:3275 +#: src/interface.c:3513 msgid "Enable folding" msgstr "Дазволіць фолдінг" -#: src/interface.c:3278 +#: src/interface.c:3516 msgid "Whether to enable folding the code" msgstr "Ці дазваляць фолдінг кода" -#: src/interface.c:3281 +#: src/interface.c:3519 msgid "Unfold all children of a fold point" msgstr "" -#: src/interface.c:3284 +#: src/interface.c:3522 msgid "Unfold all children of a fold point when unfolding it." msgstr "" -#: src/interface.c:3287 +#: src/interface.c:3525 msgid "Use indicators to show compile errors" msgstr "Выкарыстоўваць індыкатары для памылак кампіляцыі" -#: src/interface.c:3290 +#: src/interface.c:3528 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error." @@ -2012,97 +2104,97 @@ "Ці выкарыстоўваць індыкатары(падсьветку) для падсьветкі радкоў, калі " "кампілятар знойдзе папярэджаньне ці памылку." -#: src/interface.c:3293 +#: src/interface.c:3531 msgid "Disable Drag and Drop" msgstr "" -#: src/interface.c:3296 +#: src/interface.c:3534 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window." msgstr "" -#: src/interface.c:3299 -msgid "Use tabulators when inserting whitespace" +#: src/interface.c:3537 +msgid "Use tabs when inserting whitespace" msgstr "" -#: src/interface.c:3302 +#: src/interface.c:3540 msgid "" -"Whenever some whitespace is inserted by Geany it will use tabulators when " -"enabled otherwise Geany will use just spaces." +"Whenever some whitespace is inserted by Geany it will use tabs when enabled " +"otherwise Geany will use just spaces." msgstr "" -#: src/interface.c:3305 +#: src/interface.c:3543 msgid "Features" msgstr "Свойства" -#: src/interface.c:3324 +#: src/interface.c:3562 msgid "Construct autocompletion" msgstr "Стварыць аўта дапаўненьне" -#: src/interface.c:3327 +#: src/interface.c:3565 msgid "Automatic completion of often used constructs like if and for" msgstr "" "Аўтаматычнае дапаўненьне часта выкарыстоўваемых канструкцый 'if' альбо 'for'" -#: src/interface.c:3330 +#: src/interface.c:3568 msgid "XML tag autocompletion" msgstr "XML таг аўта дадатку" -#: src/interface.c:3333 +#: src/interface.c:3571 msgid "Automatic completion of open XML tags (includes HTML tags)" msgstr "Аўтаматычна закрываць адчыненыя XML тагі (таксама для HTML)" -#: src/interface.c:3336 +#: src/interface.c:3574 #, fuzzy msgid "Symbol autocompletion" msgstr "Стварыць аўта дапаўненьне" -#: src/interface.c:3339 +#: src/interface.c:3577 msgid "" -"Automatic completion of known symbols in open source file(s) (function, " -"global variables, ...)" +"Automatic completion of known symbols in open files (function names, global " +"variables, ...)" msgstr "" -#: src/interface.c:3350 +#: src/interface.c:3588 msgid "Rows of autocompletion list:" msgstr "Радкі аўта дадатку:" -#: src/interface.c:3359 +#: src/interface.c:3597 msgid "Number of rows to display in the autocompletion list." msgstr "Колькасьць радкоў для паказу ў сьпісе аўта дадатку." -#: src/interface.c:3362 +#: src/interface.c:3600 msgid "Autocompletion" msgstr "Аўтададатак" -#: src/interface.c:3367 +#: src/interface.c:3605 msgid "Editor" msgstr "Рэдактар" -#: src/interface.c:3385 +#: src/interface.c:3623 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Ніжэй увядзіце пуць да прылады. Прылады якія вам не патрэбны можаце пакінуць " "пустымі." -#: src/interface.c:3397 +#: src/interface.c:3635 msgid "Make:" msgstr "Зрабіць:" -#: src/interface.c:3404 +#: src/interface.c:3642 msgid "Terminal:" msgstr "Тэрмінал:" -#: src/interface.c:3411 +#: src/interface.c:3649 msgid "Browser:" msgstr "Браўзэр:" -#: src/interface.c:3423 +#: src/interface.c:3661 msgid "Path and options for the make tool" msgstr "Пуць і наладкі для прылады make" -#: src/interface.c:3430 +#: src/interface.c:3668 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2110,32 +2202,32 @@ "Тэрмінал эмулятар як xterm, gnome-terminal o konsole (павінен прымаць -е " "аргумэнт)" -#: src/interface.c:3437 +#: src/interface.c:3675 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Пуць і (магчыма) дадатковыя аргумэнты да браўзэра" -#: src/interface.c:3469 +#: src/interface.c:3707 msgid "Print command:" msgstr "Каманда для друку:" -#: src/interface.c:3481 +#: src/interface.c:3719 #, c-format msgid "Path to the command for printing files (use %f for the filename)." msgstr "Шлях да каманды для друку (выкарыстоўвай %f у якасьці імя файла)." -#: src/interface.c:3493 +#: src/interface.c:3731 msgid "Grep:" msgstr "Grep:" -#: src/interface.c:3516 +#: src/interface.c:3754 msgid "Tool paths" msgstr "Шлях да прыладаў" -#: src/interface.c:3521 +#: src/interface.c:3759 msgid "Tools" msgstr "Прылады" -#: src/interface.c:3539 +#: src/interface.c:3777 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -2143,47 +2235,47 @@ "Укажы інфармацыю якую жадаеш выкарыстоўваць у шаблёнах.\n" "Глядзі дакумэнтацыю калі не ведаеш як працуюць шаблёны." -#: src/interface.c:3557 +#: src/interface.c:3795 msgid "email address of the developer" msgstr "e-mail адрас распрацоўшчыка" -#: src/interface.c:3564 +#: src/interface.c:3802 msgid "Initials of the developer name" msgstr "Ініцыялы распрацоўшчыка" -#: src/interface.c:3566 +#: src/interface.c:3804 msgid "Initial Version:" msgstr "Пачатковая вэрсія:" -#: src/interface.c:3578 +#: src/interface.c:3816 msgid "Version number, which a new file initially has" msgstr "Нумар вэрсіі, які файл мае пачаткова." -#: src/interface.c:3585 +#: src/interface.c:3823 msgid "Company name" msgstr "Імя кампаніі" -#: src/interface.c:3587 +#: src/interface.c:3825 msgid "Developer:" msgstr "Распрацоўшчык:" -#: src/interface.c:3594 +#: src/interface.c:3832 msgid "Company:" msgstr "Кампанія:" -#: src/interface.c:3601 +#: src/interface.c:3839 msgid "Mail address:" msgstr "Паштовы адрас:" -#: src/interface.c:3608 +#: src/interface.c:3846 msgid "Initials:" msgstr "Ініцыялы:" -#: src/interface.c:3620 +#: src/interface.c:3858 msgid "The name of the developer" msgstr "імя распрацоўшчыка" -#: src/interface.c:3622 +#: src/interface.c:3860 msgid "" "Notice: For all changes you make here to take effect, you need to restart " "Geany." @@ -2191,15 +2283,15 @@ "Заўвага: Усе зьмяненьні якія вы робіце тут патрабуюць перапуск Geany, каб " "уступіць у сілу." -#: src/interface.c:3629 +#: src/interface.c:3867 msgid "Template data" msgstr "Дадзеныя шабленаў" -#: src/interface.c:3634 +#: src/interface.c:3872 msgid "Templates" msgstr "Шаблёны" -#: src/interface.c:3652 +#: src/interface.c:3890 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 " @@ -2208,324 +2300,464 @@ "Тут можна зьмяніць клявішы для розных спраў. Выберы справу і націсьні кнопку " "Зьмяніць. Вы можаце таксама зьмяніць пісьмовае адлюстраванае." -#: src/interface.c:3675 +#: src/interface.c:3913 msgid "Change" msgstr "Зьмяніць" -#: src/interface.c:3679 +#: src/interface.c:3917 msgid "Keyboard shortcuts" msgstr "Наладка клявіш" -#: src/interface.c:3684 +#: src/interface.c:3922 msgid "Keybindings" msgstr "Прывязкі клявіш" -#: src/keybindings.c:113 +#: src/keybindings.c:122 msgid "New" msgstr "Новы" -#: src/keybindings.c:115 +#: src/keybindings.c:124 msgid "Open" msgstr "Адчыніць" -#: src/keybindings.c:117 +#: src/keybindings.c:126 #, fuzzy msgid "Open selected file" msgstr "Адчыніць файлы" -#: src/keybindings.c:119 +#: src/keybindings.c:128 msgid "Save" msgstr "Захаваць" -#: src/keybindings.c:121 +#: src/keybindings.c:130 #, fuzzy msgid "Save as" msgstr "Захаваць усе" -#: src/keybindings.c:125 +#: src/keybindings.c:134 msgid "Print" msgstr "Друкаваць" -#: src/keybindings.c:127 +#: src/keybindings.c:136 msgid "Close" msgstr "Зачыніць" -#: src/keybindings.c:129 +#: src/keybindings.c:138 msgid "Close all" msgstr "Зачыніць усе" -#: src/keybindings.c:131 +#: src/keybindings.c:140 msgid "Reload file" msgstr "Загрузіць зноў" -#: src/keybindings.c:133 +#: src/keybindings.c:142 +#, fuzzy +msgid "Project properties" +msgstr "Уласьцівасьці" + +#: src/keybindings.c:145 msgid "Undo" msgstr "Вярнуць" -#: src/keybindings.c:135 +#: src/keybindings.c:147 msgid "Redo" msgstr "Паўтарыць" -#: src/keybindings.c:137 +#: src/keybindings.c:149 msgid "Select All" msgstr "Вылучыць усё" -#: src/keybindings.c:139 +#: src/keybindings.c:151 msgid "Insert date" msgstr "Уставіць дату" -#: src/keybindings.c:143 +#: src/keybindings.c:156 msgid "Find Next" msgstr "Шукаць наступны" -#: src/keybindings.c:145 +#: src/keybindings.c:158 msgid "Find Previous" msgstr "Шукаць былы" -#: src/keybindings.c:147 +#: src/keybindings.c:160 #, fuzzy msgid "Find Next Selection" msgstr "У вылучэньні" -#: src/keybindings.c:149 +#: src/keybindings.c:162 #, fuzzy msgid "Find Previous Selection" msgstr "Шукаць былы" -#: src/keybindings.c:151 src/search.c:420 +#: src/keybindings.c:164 src/search.c:413 msgid "Replace" msgstr "Замяніць" -#: src/keybindings.c:153 src/search.c:558 +#: src/keybindings.c:166 src/search.c:559 msgid "Find in files" msgstr "Знайсьці ў файлах" -#: src/keybindings.c:155 +#: src/keybindings.c:168 msgid "Next Message" msgstr "Наступнае паведамленьне" -#: src/keybindings.c:159 -msgid "Show Colour Chooser" -msgstr "Вылучыць колер" - -#: src/keybindings.c:161 +#: src/keybindings.c:175 msgid "Fullscreen" msgstr "Увесь экран" -#: src/keybindings.c:163 +#: src/keybindings.c:177 msgid "Toggle Messages Window" msgstr "Паказаць/Схаваць акно паведамленьняў" -#: src/keybindings.c:165 +#: src/keybindings.c:179 msgid "Toggle Sidebar" msgstr "Паказаць/Схаваць сайд-бар" -#: src/keybindings.c:167 +#: src/keybindings.c:181 msgid "Zoom In" msgstr "Павялічыць" -#: src/keybindings.c:169 +#: src/keybindings.c:183 msgid "Zoom Out" msgstr "Зьменшыць" -#: src/keybindings.c:173 +#: src/keybindings.c:186 +msgid "Show Colour Chooser" +msgstr "Вылучыць колер" + +#: src/keybindings.c:188 +msgid "Insert Special HTML Characters" +msgstr "Уставіць спэцыяльныя HTML літары" + +#: src/keybindings.c:193 msgid "Fold all" msgstr "Зьвярнуць усе" -#: src/keybindings.c:175 +#: src/keybindings.c:195 msgid "Unfold all" msgstr "Разьвярнуць усе" -#: src/keybindings.c:177 -msgid "Insert Special HTML Characters" -msgstr "Уставіць спэцыяльныя HTML літары" +#: src/keybindings.c:197 +msgid "Reload symbol list" +msgstr "Загрузіць сьпіс сімвалаў зноў" -#: src/keybindings.c:181 +#: src/keybindings.c:202 msgid "Build" msgstr "Пабудаваць" -#: src/keybindings.c:183 +#: src/keybindings.c:204 msgid "Make all" msgstr "Збудаваць усё" -#: src/keybindings.c:186 +#: src/keybindings.c:207 msgid "Make custom target" msgstr "Будаваць з make (свая цэль)" -#: src/keybindings.c:188 +#: src/keybindings.c:209 msgid "Make object" msgstr "Будаваць аб'ект" -#: src/keybindings.c:190 +#: src/keybindings.c:211 msgid "Next error" msgstr "Наступная памылка" -#: src/keybindings.c:192 +#: src/keybindings.c:213 msgid "Run" msgstr "Запусьціць" -#: src/keybindings.c:194 +#: src/keybindings.c:215 msgid "Run (alternative command)" msgstr "Запусьціць (іншы загад)" -#: src/keybindings.c:196 +#: src/keybindings.c:217 msgid "Build options" msgstr "Наладкі будоўлі" -#: src/keybindings.c:198 -msgid "Reload symbol list" -msgstr "Загрузіць сьпіс сімвалаў зноў" - -#: src/keybindings.c:200 +#: src/keybindings.c:220 msgid "Switch to Editor" msgstr "Пераключыцца ў рэдактар" -#: src/keybindings.c:202 +#: src/keybindings.c:222 msgid "Switch to Scribble" msgstr "Пераключыцца ў заметкі" -#: src/keybindings.c:204 +#: src/keybindings.c:224 msgid "Switch to VTE" msgstr "Пераключыцца ў тэрмінал" -#: src/keybindings.c:206 +#: src/keybindings.c:226 +#, fuzzy +msgid "Switch to Search Bar" +msgstr "Пераключыцца ў заметкі" + +#: src/keybindings.c:228 msgid "Switch to left document" msgstr "Пераключыцца на левы дакумэнт" -#: src/keybindings.c:208 +#: src/keybindings.c:230 msgid "Switch to right document" msgstr "Пераключыцца на правы дакумэнт" -#: src/keybindings.c:211 +#: src/keybindings.c:232 +#, fuzzy +msgid "Switch to last used document" +msgstr "Пераключыцца на левы дакумэнт" + +#: src/keybindings.c:235 msgid "Duplicate line or selection" msgstr "Дубліраваць радок ці вылучэньне" -#: src/keybindings.c:213 +#: src/keybindings.c:237 msgid "Convert Selection to lower-case" msgstr "Ператварыць вылучэньне ў ніжні рэгістар" -#: src/keybindings.c:215 +#: src/keybindings.c:239 msgid "Convert Selection to upper-case" msgstr "Ператварыць вылучэньне ў верхні рэгістар" -#: src/keybindings.c:217 +#: src/keybindings.c:241 msgid "Toggle line commentation" msgstr "Камэнтаваць/Рас камэнтаваць радок" -#: src/keybindings.c:219 +#: src/keybindings.c:243 msgid "Comment line(s)" msgstr "Камэнтаваць радок(і)" -#: src/keybindings.c:221 +#: src/keybindings.c:245 msgid "Uncomment line(s)" msgstr "Рас камэнтаваць радок(і)" -#: src/keybindings.c:223 +#: src/keybindings.c:247 msgid "Increase indent" msgstr "Павялічыць адступ" -#: src/keybindings.c:225 +#: src/keybindings.c:249 msgid "Decrease indent" msgstr "Зьменшыць адступ" -#: src/keybindings.c:228 +#: src/keybindings.c:251 +#, fuzzy +msgid "Send to Custom Command 1" +msgstr "Усталяваць свой фармат даты" + +#: src/keybindings.c:253 +#, fuzzy +msgid "Send to Custom Command 2" +msgstr "Усталяваць свой фармат даты" + +#: src/keybindings.c:255 +#, fuzzy +msgid "Send to Custom Command 3" +msgstr "Усталяваць свой фармат даты" + +#: src/keybindings.c:258 msgid "Goto matching brace" msgstr "Перайсьці да парнай скобкі" -#: src/keybindings.c:230 +#: src/keybindings.c:261 +#, fuzzy +msgid "Toggle marker" +msgstr "Маркёр доўгага радка:" + +#: src/keybindings.c:264 +#, fuzzy +msgid "Goto next marker" +msgstr "Маркёр доўгага радка:" + +#: src/keybindings.c:267 +msgid "Goto previous marker" +msgstr "" + +#: src/keybindings.c:270 msgid "Complete word" msgstr "Скончыць слова" -#: src/keybindings.c:234 src/keybindings.c:237 +#: src/keybindings.c:272 msgid "Show calltip" msgstr "Паказваць calltip" -#: src/keybindings.c:240 +#: src/keybindings.c:274 msgid "Show macro list" msgstr "Паказваць macro list" -#: src/keybindings.c:242 -msgid "Suppress auto completion" +#. has special callback +#: src/keybindings.c:276 +#, fuzzy +msgid "Complete construct" +msgstr "Скончыць слова" + +#: src/keybindings.c:278 +#, fuzzy +msgid "Suppress construct completion" msgstr "Стварыць аўта дапаўненьне" -#: src/keybindings.c:247 +#: src/keybindings.c:281 +#, fuzzy +msgid "Select current word" +msgstr "Захаваць цякучы файл" + +#: src/keybindings.c:284 +msgid "Insert alternative whitespace" +msgstr "" + +#: src/keybindings.c:289 msgid "Go to tag definition" msgstr "Перайсьці да рэалізацыі" -#: src/keybindings.c:249 +#: src/keybindings.c:291 msgid "Go to tag declaration" msgstr "Ісьці да аб'явы" -#: src/keyfile.c:71 +#: src/keybindings.c:460 +#, fuzzy +msgid "File menu\n" +msgstr "Распалажэньне закладак:" + +#: src/keybindings.c:464 +#, fuzzy +msgid "" +"\n" +"Edit menu\n" +msgstr "Знаканабор:" + +#: src/keybindings.c:468 +#, fuzzy +msgid "" +"\n" +"Search menu\n" +msgstr "Выгляд" + +#: src/keybindings.c:472 +#, fuzzy +msgid "" +"\n" +"View menu\n" +msgstr "Новыя файлы" + +#: src/keybindings.c:476 +#, fuzzy +msgid "" +"\n" +"Document menu\n" +msgstr "Аўтададатак" + +#: src/keybindings.c:480 +#, fuzzy +msgid "" +"\n" +"Build menu\n" +msgstr "Sidebar" + +#: src/keybindings.c:484 +#, fuzzy +msgid "" +"\n" +"Tools menu\n" +msgstr "Шлях да прыладаў" + +#: src/keybindings.c:488 +#, fuzzy +msgid "" +"\n" +"Focus commands\n" +msgstr "Шрыфты" + +#: src/keybindings.c:492 +msgid "" +"\n" +"Editing commands\n" +msgstr "" + +#: src/keybindings.c:496 +#, fuzzy +msgid "" +"\n" +"Tag commands\n" +msgstr "Распалажэньне закладак:" + +#: src/keybindings.c:518 +msgid "Keyboard shortcuts" +msgstr "Наладка клявіш" + +#: src/keybindings.c:529 +msgid "The following keyboard shortcuts are defined:" +msgstr "Вызначаны наступныя клявішы." + +#: src/keyfile.c:152 #, c-format msgid "%s configuration file, edit as you need" msgstr "Файл наладкі %s, зьмяняй як табе трэба" -#: src/keyfile.c:338 +#: src/keyfile.c:412 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Пішы тут што жадаеш, выкарыстоўвай для заметак." -#: src/keyfile.c:567 +#: src/keyfile.c:625 msgid "Failed to load one or more session files." msgstr "Немагчыма загрузіць адзін або больш файлаў з прошлай сесіі" -#: src/main.c:89 +#: src/main.c:94 #, fuzzy msgid "" "set initial column number for the first opened file (useful in conjunction " "with --line)" msgstr "усталяваць пачатковы радок для адчыняемых файлаў" -#: src/main.c:90 +#: src/main.c:95 msgid "use an alternate configuration directory" msgstr "выкарыстоўваць іншую дырэкторыю налядак" -#: src/main.c:91 +#: src/main.c:96 msgid "runs in debug mode (means being verbose)" msgstr "працаваць у рэжыму адладкі (больш паведамленьняў)" -#: src/main.c:94 +#: src/main.c:97 +#, fuzzy +msgid "generate global tags file (see documentation)" +msgstr "не загружаць файлы аўта дапаўненьня (глядзі дакумэнтацыю)" + +#: src/main.c:100 msgid "don't open files in a running instance, force opening a new instance" msgstr "не адчыняць файлы ў працуючай праграме, запускаць новую" -#: src/main.c:96 +#: src/main.c:102 msgid "set initial line number for the first opened file" msgstr "усталяваць пачатковы радок для адчыняемых файлаў" -#: src/main.c:97 +#: src/main.c:103 msgid "don't show message window at startup" msgstr "Не паказаць акно паведамленьняў пры запуску" -#: src/main.c:98 +#: src/main.c:104 msgid "don't load auto completion data (see documentation)" msgstr "не загружаць файлы аўта дапаўненьня (глядзі дакумэнтацыю)" -#: src/main.c:99 +#: src/main.c:105 msgid "don't load the previous session's files" msgstr "не загружаць файлы з прошлай сесіі" -#: src/main.c:101 +#: src/main.c:107 msgid "don't load terminal support" msgstr "не загружаць падтрымку тэрмінала" -#: src/main.c:102 +#: src/main.c:108 msgid "filename of libvte.so" msgstr "імя файла libvte.so" -#: src/main.c:104 +#: src/main.c:110 msgid "show version and exit" msgstr "паказаць вэрсію і выйсьці" -#: src/main.c:411 +#: src/main.c:432 msgid " - A fast and lightweight IDE" msgstr " - Хуткае лёгкае IDE" -#: src/main.c:421 +#: src/main.c:442 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(збудаваны на %s з GTK %d.%d.%d, GLib %d.%d.%d)" -#: src/main.c:466 +#: src/main.c:506 #, fuzzy, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -2536,175 +2768,211 @@ "Магчымы праблемы пры карыстаньні Geany без дырэкторыю наладкі.\n" "Запусьціць %s усё роўна?" -#: src/main.c:509 src/socket.c:136 +#: src/main.c:559 src/socket.c:143 #, fuzzy, c-format msgid "Could not find file '%s'." msgstr "Нельга знайсьці pixmap файл: %s" -#: src/main.c:627 +#: src/main.c:688 #, c-format msgid "This is Geany %s." msgstr "Гэта Geany %s." -#: src/main.c:629 +#: src/main.c:690 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Немагчыма зрабіць наладкавую дырэкторыю (%s)." -#: src/msgwindow.c:108 +#: src/msgwindow.c:112 msgid "Status messages" msgstr "Статус паведамленьні" -#: src/msgwindow.c:418 +#: src/msgwindow.c:435 msgid "_Hide Message Window" msgstr "Схаваць акно паведамленьняў" -#: src/prefs.c:322 +#: src/prefs.c:336 msgid "Action" msgstr "Справа" -#: src/prefs.c:327 +#: src/prefs.c:341 msgid "Shortcut" msgstr "Ярлык" -#: src/prefs.c:802 +#: src/prefs.c:830 msgid "Grab key" msgstr "Захапіць клявішу" -#: src/prefs.c:806 +#: src/prefs.c:834 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "Цісьні камбінацыю клявіш, якія ты жадаеш выкарыстоўваць для \"%s\"" -#: src/prefs.c:930 +#: src/prefs.c:958 #, c-format msgid "" "The combination '%s' is already used for \"%s\". Please choose another one." msgstr "Камбінацыя '%s' ужо выкарыстана для \"%s\". Калі ласка выбяры іншую." -#. "projects" is part of the default project base path so be carefully when translating +#. "projects" is part of the default project base path so be careful when translating #. please avoid special characters and spaces, look at the source for details or ask Frank -#: src/project.c:70 +#: src/project.c:85 msgid "projects" msgstr "" -#: src/project.c:94 +#: src/project.c:105 #, fuzzy -msgid "Open project" +msgid "New Project" msgstr "Будаваць аб'ект" -#: src/project.c:113 +#: src/project.c:112 #, fuzzy +msgid "C_reate" +msgstr "Літара" + +#: src/project.c:126 src/project.c:336 +#, fuzzy +msgid "Name:" +msgstr "Зрабіць:" + +#: src/project.c:138 src/project.c:348 +#, fuzzy +msgid "Filename:" +msgstr "Vietnamese" + +#: src/project.c:158 src/project.c:377 +msgid "Base path:" +msgstr "" + +#: src/project.c:166 +msgid "" +"Base directory of all files that make up the project. This can be a new " +"path, or an existing directory tree." +msgstr "" + +#: src/project.c:220 src/project.c:809 +#, fuzzy, c-format +msgid "Project file \"%s\" could not be loaded." +msgstr "Немагчыма зрабіць наладкавую дырэкторыю (%s)." + +#: src/project.c:244 src/project.c:252 +#, fuzzy +msgid "Open Project" +msgstr "Будаваць аб'ект" + +#: src/project.c:271 +#, fuzzy msgid "Project files" msgstr "Уласьцівасьці" -#: src/project.c:136 +#: src/project.c:292 #, fuzzy, c-format msgid "Project \"%s\" closed." msgstr "Файл %s зачынены." -#: src/project.c:160 +#: src/project.c:323 #, fuzzy -msgid "Project properties" +msgid "Project Properties" msgstr "Уласьцівасьці" -#: src/project.c:169 +#: src/project.c:360 #, fuzzy -msgid "C_reate" -msgstr "Літара" - -#: src/project.c:188 -#, fuzzy -msgid "Name:" -msgstr "Зрабіць:" - -#: src/project.c:200 -#, fuzzy msgid "Description:" msgstr "Стварэньне DVI" -#: src/project.c:217 +#: src/project.c:385 +msgid "Directory to run Make All from. Leave blank to use the default command." +msgstr "" + +#: src/project.c:399 #, fuzzy -msgid "Filename:" -msgstr "Vietnamese" +msgid "Run command:" +msgstr "Каманда для друку:" -#: src/project.c:236 -msgid "Base path:" +#: src/project.c:407 +msgid "" +"Command-line to run in the project base directory. Options can be appended " +"to the command. Leave blank to use the default run command." msgstr "" -#: src/project.c:255 +#: src/project.c:423 #, fuzzy msgid "File patterns:" msgstr "Middle Eastern" -#: src/project.c:337 -#, fuzzy, c-format -msgid "" -"There is already an open project \"%s\". Do you want to close it before " -"proceed?" -msgstr "Файл '%s' ужо існуе. Замяніць яго?" +#: src/project.c:503 +#, fuzzy +msgid "Do you want to close it before proceeding?" +msgstr "Жадаеш захаваць яго перад зачыненьнем?" -#: src/project.c:366 +#: src/project.c:504 +#, c-format +msgid "The '%s' project is already open. " +msgstr "" + +#: src/project.c:532 msgid "The specified project name is too short." msgstr "" -#: src/project.c:372 +#: src/project.c:538 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "" -#: src/project.c:380 +#: src/project.c:546 msgid "You have specified an invalid project filename." msgstr "" -#: src/project.c:388 -msgid "You have specified an invalid project base path." +#: src/project.c:558 +msgid "Create the project's base path directory?" msgstr "" -#: src/project.c:398 -msgid "The specified project base path does not exist. Should it be created?" -msgstr "" +#: src/project.c:559 +#, fuzzy, c-format +msgid "The path \"%s\" does not exist." +msgstr "Файл \"%s\" не з'яўляецца сапраўдным %s." -#: src/project.c:415 +#: src/project.c:577 #, fuzzy msgid "Project file could not be written." msgstr "Немагчыма зрабіць наладкавую дырэкторыю (%s)." -#: src/project.c:455 +#: src/project.c:627 #, c-format msgid "Project \"%s\" created." msgstr "" -#: src/project.c:457 +#: src/project.c:629 #, fuzzy, c-format msgid "Project \"%s\" saved." msgstr "Файл %s захаваны." #. initialise the dialog -#: src/project.c:500 -msgid "Choose project filename" +#: src/project.c:673 src/project.c:684 +#, fuzzy +msgid "Choose Project Filename" +msgstr "Уласьцівасьці" + +#. initialise the dialog +#: src/project.c:701 src/project.c:712 +msgid "Choose Project Base Path" msgstr "" #. initialise the dialog -#: src/project.c:523 -msgid "Choose project base path" +#: src/project.c:729 src/project.c:740 +msgid "Choose Project Run Command" msgstr "" -#: src/project.c:592 +#: src/project.c:802 #, c-format msgid "Project \"%s\" opened." msgstr "" -#: src/project.c:596 -#, fuzzy -msgid "Project file could not be loaded." -msgstr "Немагчыма зрабіць наладкавую дырэкторыю (%s)." - -#: src/search.c:150 +#: src/search.c:139 msgid "_Use regular expressions" msgstr "_Сталы выраз" -#: src/search.c:154 +#: src/search.c:143 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -2712,254 +2980,278 @@ "Выкарыстоўваць POSIX сталыя выразы. Для дэталёвай інфармацыі па сталым " "выразам глядзі дакумэнтацыю." -#: src/search.c:161 +#: src/search.c:150 msgid "_Search backwards" msgstr "Пошук у адваротным кірунку" -#: src/search.c:175 +#: src/search.c:164 msgid "Use _escape sequences" msgstr "Выкарыстоўваць пасьлядоўнасьці зьмены" -#: src/search.c:180 +#: src/search.c:169 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters." msgstr "" "Замяняць \\\\, \\t, \\n, \\r і \\uXXXX (Літары юнікоду) на адпаведныя літары" -#: src/search.c:189 src/search.c:631 +#: src/search.c:178 src/search.c:629 msgid "_Case sensitive" msgstr "З улікам рэгістру" -#: src/search.c:194 src/search.c:637 +#: src/search.c:183 src/search.c:635 msgid "Match only a _whole word" msgstr "Падыходзіць толькі поўнае слова" -#: src/search.c:199 +#: src/search.c:188 msgid "Match from s_tart of word" msgstr "Падыходзіць з пачатку слова" -#: src/search.c:302 +#: src/search.c:295 msgid "Find" msgstr "Знайсьці" -#: src/search.c:308 +#: src/search.c:301 msgid "_Previous" msgstr "Былы" -#: src/search.c:314 +#: src/search.c:307 msgid "_Next" msgstr "Наступны" -#: src/search.c:318 src/search.c:436 src/search.c:588 +#: src/search.c:311 src/search.c:429 src/search.c:581 msgid "Search for:" msgstr "Шукаць:" #. Now add the multiple match options -#: src/search.c:344 +#: src/search.c:337 msgid "Find All" msgstr "Знайсьці ўсё" -#: src/search.c:348 +#: src/search.c:340 msgid "_Mark" msgstr "Абазначыць" -#: src/search.c:354 src/search.c:494 +#: src/search.c:342 +#, fuzzy +msgid "Mark all matches in the current document." +msgstr "Выдаліць усе індыкатары памылак у цякучым дакумэнце" + +#: src/search.c:347 src/search.c:487 msgid "In Sessi_on" msgstr "У сесіі" -#: src/search.c:359 src/search.c:499 +#: src/search.c:352 src/search.c:492 msgid "_In Document" msgstr "У дакумэнце" #. close window checkbox -#: src/search.c:365 src/search.c:505 +#: src/search.c:358 src/search.c:498 msgid "Close _dialog" msgstr "Зачыніць дыялёг" -#: src/search.c:370 src/search.c:510 +#: src/search.c:363 src/search.c:503 msgid "Disable this option to keep the dialog open." msgstr "Забарані гэту наладку каб трымаць дыялёг адчыненым." -#: src/search.c:432 +#: src/search.c:425 msgid "Re_place & Find" msgstr "Замяніць і шукаць" -#: src/search.c:439 +#: src/search.c:432 msgid "Replace with:" msgstr "Замяніць на:" #. Now add the multiple replace options -#: src/search.c:484 +#: src/search.c:477 msgid "Replace All" msgstr "Замяніць усё" -#: src/search.c:487 +#: src/search.c:480 msgid "In Se_lection" msgstr "У вылучэньні" -#: src/search.c:489 +#: src/search.c:482 msgid "Replace all matches found in the currently selected text" msgstr "Замяніць ўсе знойдзеныя выпадкі ў вылучаным тэксьце" -#: src/search.c:567 +#: src/search.c:568 msgid "Directory:" msgstr "Дырэкторыя:" -#: src/search.c:607 +#: src/search.c:600 msgid "_Fixed strings" msgstr "Сталыя радкі" -#: src/search.c:616 +#: src/search.c:609 msgid "_Grep regular expressions" msgstr "_Шукаць сталы выраз" -#: src/search.c:620 src/search.c:627 +#: src/search.c:613 src/search.c:620 msgid "See grep's manual page for more information." msgstr "Глядзі старонку дакумэнтацыі grep для дакладнай інфармацыі" -#: src/search.c:625 +#: src/search.c:618 msgid "_Extended regular expressions" msgstr "Расшыраны сталы выраз" -#: src/search.c:642 +#: src/search.c:624 +msgid "_Recurse in subfolders" +msgstr "" + +#: src/search.c:640 msgid "_Invert search results" msgstr "Шукаць не падыходзячыя" -#: src/search.c:647 +#: src/search.c:645 msgid "Invert the sense of matching, to select non-matching lines." msgstr "Шукаць не падыходзячыя пад шаблён радкі" -#: src/search.c:703 -msgid "Select folder" -msgstr "Вылучыць дырэкторыю" +#: src/search.c:661 +msgid "E_xtra options:" +msgstr "" -#: src/search.c:961 +#: src/search.c:673 +msgid "Other options to pass to Grep" +msgstr "" + +#: src/search.c:864 src/search.c:1388 src/search.c:1389 #, c-format +msgid "No matches found for '%s'." +msgstr "Супадзеньні не знойдзены для '%s'." + +#: src/search.c:866 src/search.c:1395 src/search.c:1396 +#, fuzzy, c-format +msgid "Found %d matches for '%s'." +msgstr "Супадзеньні не знойдзены для '%s'." + +#: src/search.c:984 +#, c-format msgid "Replaced text in %u files." msgstr "Замяніць тэкст у %u файлах." -#: src/search.c:1007 +#: src/search.c:1085 msgid "Invalid directory for find in files." msgstr "Дрэнная дырэкторыя для пошуку файлаў" -#: src/search.c:1037 +#: src/search.c:1103 msgid "No text to find." msgstr "Тэкст не знойдзены" -#: src/search.c:1065 +#: src/search.c:1124 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "Нельга знайсьці прыладу grep '%s' (правер пуць ў Уласьцівасьцях)" -#: src/search.c:1180 +#: src/search.c:1189 +#, fuzzy, c-format +msgid "%s %s -- %s (in directory: %s)" +msgstr "%s (у дырэкторыі: %s)" + +#: src/search.c:1250 #, c-format msgid "Could not open directory (%s)" msgstr "Немагчыма адчыніць дырэкторыю (%s)" -#: src/search.c:1225 +#: src/search.c:1295 msgid "Search failed." msgstr "Пошук скончыўся непасьпяхова." -#: src/search.c:1231 -msgid "Search completed." +#: src/search.c:1306 src/search.c:1307 +#, fuzzy, c-format +msgid "Search completed with %d matches." msgstr "Пошук завершаны." -#: src/search.c:1307 -#, c-format -msgid "No matches found for '%s'." -msgstr "Супадзеньні не знойдзены для '%s'." - #: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Нельга знайсьці pixmap файл: %s" -#: src/symbols.c:411 src/symbols.c:443 +#: src/symbols.c:428 src/symbols.c:460 msgid "Chapter" msgstr "Глава" -#: src/symbols.c:413 src/symbols.c:435 +#: src/symbols.c:430 src/symbols.c:452 msgid "Section" msgstr "Сэкцыя" -#: src/symbols.c:415 +#: src/symbols.c:432 msgid "Sect1" msgstr "Sect1" -#: src/symbols.c:417 +#: src/symbols.c:434 msgid "Sect2" msgstr "Sect2" -#: src/symbols.c:419 +#: src/symbols.c:436 msgid "Sect3" msgstr "Sect3" -#: src/symbols.c:421 +#: src/symbols.c:438 msgid "Appendix" msgstr "Апэндыкс" -#: src/symbols.c:423 src/symbols.c:445 src/symbols.c:549 src/symbols.c:585 +#: src/symbols.c:440 src/symbols.c:462 src/symbols.c:566 src/symbols.c:602 msgid "Other" msgstr "Іншы" -#: src/symbols.c:431 +#: src/symbols.c:448 msgid "Command" msgstr "Каманда" -#: src/symbols.c:433 +#: src/symbols.c:450 msgid "Environment" msgstr "Акружэньне" -#: src/symbols.c:437 +#: src/symbols.c:454 msgid "Subsection" msgstr "Падсэкцыя" -#: src/symbols.c:439 +#: src/symbols.c:456 msgid "Subsubsection" msgstr "Пад-падсэкцыя" -#: src/symbols.c:441 +#: src/symbols.c:458 msgid "Label" msgstr "Метка" -#: src/symbols.c:451 src/symbols.c:535 +#: src/symbols.c:468 src/symbols.c:552 msgid "Package" msgstr "Пакет" -#: src/symbols.c:453 +#: src/symbols.c:470 msgid "Function" msgstr "Функцыя" -#: src/symbols.c:455 +#: src/symbols.c:472 msgid "My" msgstr "Мой" -#: src/symbols.c:457 +#: src/symbols.c:474 msgid "Local" msgstr "Месны" -#: src/symbols.c:459 +#: src/symbols.c:476 msgid "Our" msgstr "Наш" -#: src/symbols.c:472 src/symbols.c:493 src/symbols.c:539 src/symbols.c:569 +#: src/symbols.c:489 src/symbols.c:510 src/symbols.c:556 src/symbols.c:586 msgid "Classes" msgstr "Клясы" -#: src/symbols.c:474 +#: src/symbols.c:491 msgid "Singletons" msgstr "Сінглтоны" -#: src/symbols.c:476 +#: src/symbols.c:493 msgid "Mixins" msgstr "Mixins" -#: src/symbols.c:478 src/symbols.c:495 src/symbols.c:541 +#: src/symbols.c:495 src/symbols.c:512 src/symbols.c:558 msgid "Methods" msgstr "Мэтады" -#: src/symbols.c:480 src/symbols.c:543 src/symbols.c:573 +#: src/symbols.c:497 src/symbols.c:560 src/symbols.c:590 msgid "Members" msgstr "Membres" @@ -2970,43 +3262,86 @@ #. gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); #. gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Macros"), -1); #. -#: src/symbols.c:482 src/symbols.c:522 src/symbols.c:583 +#: src/symbols.c:499 src/symbols.c:539 src/symbols.c:600 msgid "Variables" msgstr "Variables" -#: src/symbols.c:497 src/symbols.c:514 src/symbols.c:571 +#: src/symbols.c:514 src/symbols.c:531 src/symbols.c:588 msgid "Functions" msgstr "Функцыі" -#: src/symbols.c:537 +#: src/symbols.c:554 msgid "Interfaces" msgstr "Інтэрфэйс" -#: src/symbols.c:560 +#: src/symbols.c:577 msgid "Module" msgstr "Модуль" -#: src/symbols.c:564 +#: src/symbols.c:581 msgid "Namespaces" msgstr "Namespaces" -#: src/symbols.c:575 +#: src/symbols.c:592 msgid "Structs / Typedefs" msgstr "Struct / Typedef" -#: src/symbols.c:580 +#: src/symbols.c:597 msgid "Macros" msgstr "Макрасы" -#: src/tools.c:62 +#: src/symbols.c:755 +#, c-format +msgid "Unknown filetype extension for \"%s\".\n" +msgstr "" + +#: src/symbols.c:770 +#, c-format +msgid "Failed to create tags file.\n" +msgstr "" + +#: src/symbols.c:776 +#, c-format +msgid "" +"Usage: %s -g <Tag File> <File list>\n" +"\n" +msgstr "" + +#: src/symbols.c:777 +#, c-format +msgid "" +"Example:\n" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" +msgstr "" + +#: src/symbols.c:791 +msgid "Load Tags" +msgstr "" + +#: src/symbols.c:797 +msgid "Geany tag files (*.tags)" +msgstr "" + +#: src/symbols.c:816 +#, fuzzy, c-format +msgid "Loaded %s tags file '%s'." +msgstr "Нельга знайсьці pixmap файл: %s" + +#: src/symbols.c:818 +#, fuzzy, c-format +msgid "Could not load tags file '%s'." +msgstr "Нельга знайсьці pixmap файл: %s" + +#: src/tools.c:81 msgid "Special characters" msgstr "Спэцыяльныя літары" -#: src/tools.c:64 +#: src/tools.c:83 msgid "_Insert" msgstr "Уставіць дату" -#: src/tools.c:72 +#: src/tools.c:91 msgid "" "Choose a special character from the list below and double click on it or use " "the button to insert it at the current cursor position." @@ -3014,113 +3349,153 @@ "Выберы спэцыяльныя літары са сьпіса ўнізе, і зрабі даблклік на ім,альбо " "выкарыстай кнопку для устаўкі літары ў пазыцыі курсора." -#: src/tools.c:85 +#: src/tools.c:104 msgid "Character" msgstr "Літара" -#: src/tools.c:91 +#: src/tools.c:110 msgid "HTML (name)" msgstr "HTML (імя)" -#: src/tools.c:128 +#: src/tools.c:147 msgid "HTML characters" msgstr "HTML літары" -#: src/tools.c:134 +#: src/tools.c:153 msgid "ISO 8859-1 characters" msgstr "" -#: src/tools.c:232 +#: src/tools.c:251 msgid "Greek characters" msgstr "Грэцкія літары" -#: src/tools.c:287 +#: src/tools.c:306 msgid "Mathematical characters" msgstr "Матэматычныя літары" -#: src/tools.c:328 +#: src/tools.c:347 msgid "Technical characters" msgstr "Тэхнічныя літары" -#: src/tools.c:336 +#: src/tools.c:355 msgid "Arrow characters" msgstr "Указальныя літары" -#: src/tools.c:349 +#: src/tools.c:368 msgid "Punctuation characters" msgstr "Знакі прыпынку" -#: src/tools.c:365 +#: src/tools.c:384 msgid "Miscellaneous characters" msgstr "Іншыя літары" -#: src/treeviews.c:121 +#: src/tools.c:608 +#, c-format +msgid "Passing data and executing custom command: %s" +msgstr "" + +#: src/tools.c:660 src/tools.c:888 +#, fuzzy +msgid "Set Custom Commands" +msgstr "Усталяваць свой фармат даты" + +#: src/tools.c:666 +msgid "" +"You can send the current selection to any of these commands and the output " +"of the command replaces the current selection." +msgstr "" + +#: src/tools.c:857 src/tools.c:861 +msgid "No custom commands defined." +msgstr "" + +#: src/treeviews.c:126 msgid "No tags found" msgstr "tags ня знойдзены" -#: src/treeviews.c:271 src/treeviews.c:323 +#: src/treeviews.c:280 src/treeviews.c:332 msgid "Hide" msgstr "Схаваць" -#: src/treeviews.c:279 src/treeviews.c:331 +#: src/treeviews.c:288 src/treeviews.c:340 msgid "Hide sidebar" msgstr "Схаваць сайд-бар" -#: src/treeviews.c:311 +#: src/treeviews.c:320 msgid "Reload" msgstr "Загрузіць зноў" -#: src/ui_utils.c:113 -#, c-format +#. Status bar statistics: col = column, sel = selection, RO = read-only, +#. * OVR = overwrite/overtype, INS = insert, MOD = modified +#: src/ui_utils.c:124 +#, fuzzy, c-format msgid "" -"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " -"function: %s encoding: %s %s filetype: %s" +"line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s %" +"s filetype: %s scope: %s" msgstr "" @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1514] trunk
by eht16＠users.sourceforge.net 08 May '07

08 May '07

Revision: 1514 http://svn.sourceforge.net/geany/?rev=1514&view=rev Author: eht16 Date: 2007-05-08 09:03:07 -0700 (Tue, 08 May 2007) Log Message: ----------- Added sci_get_line_indentation() and sci_set_line_indentation(). Fixed broken increase/decrease indentation when using only spaces for indentation. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-07 15:36:43 UTC (rev 1513) +++ trunk/ChangeLog 2007-05-08 16:03:07 UTC (rev 1514) @@ -1,3 +1,11 @@ +2007-05-08 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/sciwrappers.c, src/sciwrappers.h: + Added sci_get_line_indentation() and sci_set_line_indentation(). + * src/callbacks.c: Fixed broken increase/decrease indentation when + using only spaces for indentation. + + 2007-05-07 Enrico Tröger <enrico.troeger(a)uvena.de> * data/filetypes.haskell: Added build instructions. Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-05-07 15:36:43 UTC (rev 1513) +++ trunk/src/callbacks.c 2007-05-08 16:03:07 UTC (rev 1514) @@ -1863,7 +1863,7 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; + if (! DOC_IDX_VALID(idx)) return; if (sci_get_lines_selected(doc_list[idx].sci) > 1) { @@ -1871,16 +1871,18 @@ } else { - gint line, ind_pos, old_pos; + gint line, ind_pos, old_pos, new_pos, step; old_pos = sci_get_current_position(doc_list[idx].sci); line = sci_get_current_line(doc_list[idx].sci, old_pos); ind_pos = sci_get_line_indent_position(doc_list[idx].sci, line); + // when using tabs increase cur pos by 1, when using space increase it by tab_width + step = (app->pref_editor_use_tabs) ? 1 : app->pref_editor_tab_width; + new_pos = (old_pos > ind_pos) ? old_pos + step : old_pos; sci_set_current_position(doc_list[idx].sci, ind_pos, TRUE); sci_cmd(doc_list[idx].sci, SCI_TAB); - sci_set_current_position(doc_list[idx].sci, - (old_pos > ind_pos) ? old_pos + 1 : old_pos, TRUE); + sci_set_current_position(doc_list[idx].sci, new_pos, TRUE); } } @@ -1890,7 +1892,7 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; + if (! DOC_IDX_VALID(idx)) return; if (sci_get_lines_selected(doc_list[idx].sci) > 1) { @@ -1898,18 +1900,25 @@ } else { - gint line, ind_pos, old_pos; + gint line, ind_pos, old_pos, new_pos, step, indent; old_pos = sci_get_current_position(doc_list[idx].sci); line = sci_get_current_line(doc_list[idx].sci, old_pos); ind_pos = sci_get_line_indent_position(doc_list[idx].sci, line); + step = (app->pref_editor_use_tabs) ? 1 : app->pref_editor_tab_width; + new_pos = (old_pos >= ind_pos) ? old_pos - step : old_pos; if (ind_pos == sci_get_position_from_line(doc_list[idx].sci, line)) return; + sci_set_current_position(doc_list[idx].sci, ind_pos, TRUE); - sci_cmd(doc_list[idx].sci, SCI_BACKTAB); - sci_set_current_position(doc_list[idx].sci, - (old_pos >= ind_pos) ? old_pos - 1 : old_pos, TRUE); + indent = sci_get_line_indentation(doc_list[idx].sci, line); + indent -= app->pref_editor_tab_width; + if (indent < 0) + indent = 0; + sci_set_line_indentation(doc_list[idx].sci, line, indent); + + sci_set_current_position(doc_list[idx].sci, new_pos, TRUE); } } Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2007-05-07 15:36:43 UTC (rev 1513) +++ trunk/src/sciwrappers.c 2007-05-08 16:03:07 UTC (rev 1514) @@ -941,3 +941,13 @@ SSM(sci, SCI_SETVSCROLLBAR, visible, 0); } +void sci_set_line_indentation(ScintillaObject *sci, gint line, gint indent) +{ + SSM(sci, SCI_SETLINEINDENTATION, line, indent); +} + +int sci_get_line_indentation(ScintillaObject *sci, gint line) +{ + return SSM(sci, SCI_GETLINEINDENTATION, line, 0); +} + Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2007-05-07 15:36:43 UTC (rev 1513) +++ trunk/src/sciwrappers.h 2007-05-08 16:03:07 UTC (rev 1514) @@ -167,6 +167,8 @@ void sci_start_styling (ScintillaObject * sci, gint pos, gint mask); void sci_select_all (ScintillaObject * sci); gint sci_get_line_indent_position(ScintillaObject * sci, gint line); +void sci_set_line_indentation (ScintillaObject * sci, gint line, gint indent); +int sci_get_line_indentation (ScintillaObject * sci, gint line); void sci_set_autoc_max_height (ScintillaObject * sci, gint val); gint sci_find_bracematch (ScintillaObject * sci, gint pos); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1513] trunk
by eht16＠users.sourceforge.net 07 May '07

07 May '07

Revision: 1513 http://svn.sourceforge.net/geany/?rev=1513&view=rev Author: eht16 Date: 2007-05-07 08:36:43 -0700 (Mon, 07 May 2007) Log Message: ----------- Prevent installation in a directory without proper write permissions under Windows. Display an error message instead. Modified Paths: -------------- trunk/ChangeLog trunk/geany.nsi Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-07 13:57:03 UTC (rev 1512) +++ trunk/ChangeLog 2007-05-07 15:36:43 UTC (rev 1513) @@ -1,6 +1,9 @@ 2007-05-07 Enrico Tröger <enrico.troeger(a)uvena.de> * data/filetypes.haskell: Added build instructions. + * geany.nsi: Prevent installation in a directory without proper + write permissions under Windows. + Display an error message instead. 2007-05-06 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/geany.nsi =================================================================== --- trunk/geany.nsi 2007-05-07 13:57:03 UTC (rev 1512) +++ trunk/geany.nsi 2007-05-07 15:36:43 UTC (rev 1513) @@ -20,7 +20,7 @@ !define RESOURCEDIR "geany-${PRODUCT_VERSION}" ; only used when embedding GTK+ installer -!define GTK_INSTALLER "gtk+-2.8.18-setup-1.exe" +!define GTK_INSTALLER "gtk+-2.10.6-1-setup.exe" SetCompressor /SOLID lzma XPStyle on @@ -89,6 +89,7 @@ ; Components page !insertmacro MUI_PAGE_COMPONENTS ; Directory page +!define MUI_PAGE_CUSTOMFUNCTION_LEAVE OnDirLeave !insertmacro MUI_PAGE_DIRECTORY ; Start menu page var ICONS_GROUP @@ -145,7 +146,7 @@ Section "Documentation" SEC03 SectionIn 1 - SetOverwrite try + SetOverwrite ifnewer SetOutPath "$INSTDIR" File /r "${RESOURCEDIR}\doc" @@ -169,7 +170,7 @@ ; Include GTK runtime library but only if desired from command line !ifdef INCLUDE_GTK -Section "GTK 2.8 Runtime Environment" SEC05 +Section "GTK 2.10 Runtime Environment" SEC05 SectionIn 1 SetOutPath "$INSTDIR" SetOverwrite ifnewer @@ -243,6 +244,23 @@ Abort FunctionEnd +Function OnDirLeave + ClearErrors + SetOutPath "$INSTDIR" ; what about IfError creating $INSTDIR? + GetTempFileName $1 "$INSTDIR" ; creates tmp file (or fails) + FileOpen $0 "$1" "w" ; error to open? + FileWriteByte $0 "0" + IfErrors notPossible possible + +notPossible: + RMDir "$INSTDIR" ; removes folder if empty + MessageBox MB_OK "The given directory is not writeable. Please choose another one!" + Abort +possible: + FileClose $0 + Delete "$1" +FunctionEnd + Section Uninstall !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP Delete "$INSTDIR\${PRODUCT_NAME}.url" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1512] trunk
by eht16＠users.sourceforge.net 07 May '07

07 May '07

Revision: 1512 http://svn.sourceforge.net/geany/?rev=1512&view=rev Author: eht16 Date: 2007-05-07 06:57:03 -0700 (Mon, 07 May 2007) Log Message: ----------- Added build instructions. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.haskell Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-06 14:49:51 UTC (rev 1511) +++ trunk/ChangeLog 2007-05-07 13:57:03 UTC (rev 1512) @@ -1,3 +1,8 @@ +2007-05-07 Enrico Tröger <enrico.troeger(a)uvena.de> + + * data/filetypes.haskell: Added build instructions. + + 2007-05-06 Enrico Tröger <enrico.troeger(a)uvena.de> * data/filetypes.haskell, scintilla/KeyWords.cxx, @@ -5,6 +10,10 @@ scintilla/makefile.win32, src/filetypes.c, src/filetypes.h, src/highlighting.c, src/highlighting.h, src/sci_cb.c, THANKS: Added new filetype Haskell (patch by Guillaume Hoffmann, thanks). + * geany.glade, doc/geany.docbook, src/callbacks.c, src/callbacks.h, + src/interface.c, src/keybindings.c, src/keybindings.h: + Added menu item to hide or show all additional widgets and renamed + keybinding to menu_toggleall. 2007-05-05 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/data/filetypes.haskell =================================================================== --- trunk/data/filetypes.haskell 2007-05-06 14:49:51 UTC (rev 1511) +++ trunk/data/filetypes.haskell 2007-05-07 13:57:03 UTC (rev 1512) @@ -47,6 +47,5 @@ # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler= -linker= -run_cmd= +compiler=ghc --make "%f" +run_cmd="./%e" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1511] trunk
by eht16＠users.sourceforge.net 06 May '07

06 May '07

Revision: 1511 http://svn.sourceforge.net/geany/?rev=1511&view=rev Author: eht16 Date: 2007-05-06 07:49:51 -0700 (Sun, 06 May 2007) Log Message: ----------- Added menu item to hide or show all additional widgets and renamed keybinding to menu_toggleall. Modified Paths: -------------- trunk/doc/geany.docbook trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keybindings.c trunk/src/keybindings.h Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-05-06 14:05:43 UTC (rev 1510) +++ trunk/doc/geany.docbook 2007-05-06 14:49:51 UTC (rev 1511) @@ -1760,7 +1760,7 @@ <entry>Shows or hides the sidebar.</entry> </row> <row> - <entry>Hide and show all additional widgets</entry> + <entry>Toggle all additional widgets</entry> <entry>Hide and show all additional widgets like the sidebar, the toolbar, the messages window and the statusbar.</entry> </row> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-05-06 14:05:43 UTC (rev 1510) +++ trunk/geany.glade 2007-05-06 14:49:51 UTC (rev 1511) @@ -57,7 +57,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1724"> + <widget class="GtkImage" id="image1758"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -147,7 +147,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1725"> + <widget class="GtkImage" id="image1759"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -168,7 +168,7 @@ <signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1726"> + <widget class="GtkImage" id="image1760"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -188,7 +188,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1727"> + <widget class="GtkImage" id="image1761"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -284,7 +284,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1728"> + <widget class="GtkImage" id="image1762"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -492,7 +492,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1729"> + <widget class="GtkImage" id="image1763"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -513,7 +513,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1730"> + <widget class="GtkImage" id="image1764"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -569,7 +569,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1731"> + <widget class="GtkImage" id="image1765"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -601,7 +601,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1732"> + <widget class="GtkImage" id="image1766"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -686,7 +686,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1733"> + <widget class="GtkImage" id="image1767"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -783,7 +783,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1734"> + <widget class="GtkImage" id="image1768"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -849,7 +849,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1735"> + <widget class="GtkImage" id="image1769"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -884,7 +884,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1736"> + <widget class="GtkImage" id="image1770"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -904,6 +904,15 @@ </child> <child> + <widget class="GtkMenuItem" id="menu_toggle_all_additional_widgets1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle all additional widgets</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_menu_toggle_all_additional_widgets1_activate" last_modification_time="Sun, 06 May 2007 14:13:10 GMT"/> + </widget> + </child> + + <child> <widget class="GtkCheckMenuItem" id="menu_fullscreen1"> <property name="visible">True</property> <property name="label" translatable="yes">Full_screen</property> @@ -1115,7 +1124,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Convert and Set to _CR/LF (Win)</property> <property name="use_underline">True</property> - <property name="active">False</property> + <property name="active">True</property> <signal name="activate" handler="on_crlf_activate" last_modification_time="Thu, 28 Apr 2005 16:27:24 GMT"/> </widget> </child> @@ -1125,7 +1134,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Convert and Set to _LF (Unix)</property> <property name="use_underline">True</property> - <property name="active">False</property> + <property name="active">True</property> <property name="group">crlf</property> <signal name="activate" handler="on_lf_activate" last_modification_time="Thu, 28 Apr 2005 16:27:24 GMT"/> </widget> @@ -1235,7 +1244,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1737"> + <widget class="GtkImage" id="image1771"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1256,7 +1265,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1738"> + <widget class="GtkImage" id="image1772"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1277,7 +1286,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1739"> + <widget class="GtkImage" id="image1773"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1335,7 +1344,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1740"> + <widget class="GtkImage" id="image1774"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-05-06 14:05:43 UTC (rev 1510) +++ trunk/src/callbacks.c 2007-05-06 14:49:51 UTC (rev 1511) @@ -1766,15 +1766,27 @@ on_menu_show_sidebar1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) { + static gint active_page = -1; + if (app->ignore_callback) return; + if (app->sidebar_visible) + { + // to remember the active page because GTK (e.g. 2.8.18) doesn't do it and shows always + // the last page (for unknown reason, with GTK 2.6.4 it works) + active_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(app->treeview_notebook)); + } + app->sidebar_visible = ! app->sidebar_visible; - if (! app->sidebar_openfiles_visible && ! app->sidebar_symbol_visible) + + if ((! app->sidebar_openfiles_visible && ! app->sidebar_symbol_visible)) { + app->sidebar_openfiles_visible = TRUE; app->sidebar_symbol_visible = TRUE; - app->sidebar_openfiles_visible = TRUE; } + ui_treeviews_show_hide(TRUE); + gtk_notebook_set_current_page(GTK_NOTEBOOK(app->treeview_notebook), active_page); } @@ -2141,3 +2153,57 @@ g_free(command); } + +void +on_menu_toggle_all_additional_widgets1_activate + (GtkMenuItem *menuitem, + gpointer user_data) +{ + static gint hide_all = -1; + GtkCheckMenuItem *msgw = GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_show_messages_window1")); + GtkCheckMenuItem *toolbari = GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_show_toolbar1")); + + // get the initial state (necessary if Geany was closed with hide_all = TRUE) + if (hide_all == -1) + { + if (! gtk_check_menu_item_get_active(msgw) && + ! app->sidebar_visible && + ! gtk_check_menu_item_get_active(toolbari)) + { + hide_all = TRUE; + } + else + hide_all = FALSE; + } + + hide_all = ! hide_all; // toggle + + if (hide_all) + { + if (gtk_check_menu_item_get_active(msgw)) + gtk_check_menu_item_set_active(msgw, ! gtk_check_menu_item_get_active(msgw)); + + if (app->sidebar_visible) + on_menu_show_sidebar1_toggled(NULL, NULL); + + ui_statusbar_showhide(FALSE); + + if (gtk_check_menu_item_get_active(toolbari)) + gtk_check_menu_item_set_active(toolbari, ! gtk_check_menu_item_get_active(toolbari)); + } + else + { + + if (! gtk_check_menu_item_get_active(msgw)) + gtk_check_menu_item_set_active(msgw, ! gtk_check_menu_item_get_active(msgw)); + + if (! app->sidebar_visible) + on_menu_show_sidebar1_toggled(NULL, NULL); + + ui_statusbar_showhide(TRUE); + + if (! gtk_check_menu_item_get_active(toolbari)) + gtk_check_menu_item_set_active(toolbari, ! gtk_check_menu_item_get_active(toolbari)); + } +} + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2007-05-06 14:05:43 UTC (rev 1510) +++ trunk/src/callbacks.h 2007-05-06 14:49:51 UTC (rev 1511) @@ -603,3 +603,8 @@ void on_context_action1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_menu_toggle_all_additional_widgets1_activate + (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-05-06 14:05:43 UTC (rev 1510) +++ trunk/src/interface.c 2007-05-06 14:49:51 UTC (rev 1511) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image1724; + GtkWidget *image1758; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -48,11 +48,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image1725; + GtkWidget *image1759; GtkWidget *menu_reload1; - GtkWidget *image1726; + GtkWidget *image1760; GtkWidget *menu_reload_as1; - GtkWidget *image1727; + GtkWidget *image1761; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -64,7 +64,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image1728; + GtkWidget *image1762; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -90,20 +90,20 @@ GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image1729; + GtkWidget *image1763; GtkWidget *menu_decrease_indent1; - GtkWidget *image1730; + GtkWidget *image1764; GtkWidget *separator37; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; GtkWidget *separator18; GtkWidget *insert_include2; - GtkWidget *image1731; + GtkWidget *image1765; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image1732; + GtkWidget *image1766; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -112,7 +112,7 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image1733; + GtkWidget *image1767; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *separator9; @@ -124,7 +124,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image1734; + GtkWidget *image1768; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -132,12 +132,13 @@ GtkWidget *next_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image1735; + GtkWidget *image1769; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image1736; + GtkWidget *image1770; GtkWidget *menu_separator4; + GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; GtkWidget *menu_show_toolbar1; @@ -178,18 +179,18 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image1737; + GtkWidget *image1771; GtkWidget *project_open1; - GtkWidget *image1738; + GtkWidget *image1772; GtkWidget *project_close1; - GtkWidget *image1739; + GtkWidget *image1773; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image1740; + GtkWidget *image1774; GtkWidget *menu_count_words1; GtkWidget *menu_insert_special_chars1; GtkWidget *menu_item5; @@ -290,9 +291,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image1724 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1724); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1724); + image1758 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1758); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1758); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -335,25 +336,25 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image1725 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1725); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1725); + image1759 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1759); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1759); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload1); - image1726 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1726); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1726); + image1760 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1760); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1760); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload_as1); - image1727 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1727); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1727); + image1761 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1761); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1761); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -404,9 +405,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image1728 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1728); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1728); + image1762 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1762); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1762); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -514,17 +515,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image1729 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1729); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1729); + image1763 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1763); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1763); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image1730 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1730); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1730); + image1764 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1764); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1764); separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); @@ -550,9 +551,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image1731 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1731); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1731); + image1765 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1765); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1765); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -564,9 +565,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image1732 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1732); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1732); + image1766 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1766); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1766); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -605,9 +606,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image1733 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1733); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image1733); + image1767 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1767); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image1767); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -651,9 +652,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image1734 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1734); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1734); + image1768 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1768); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1768); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -686,9 +687,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image1735 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1735); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1735); + image1769 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1769); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1769); menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); @@ -702,15 +703,19 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image1736 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1736); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1736); + image1770 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1770); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1770); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_separator4); gtk_widget_set_sensitive (menu_separator4, FALSE); + menu_toggle_all_additional_widgets1 = gtk_menu_item_new_with_mnemonic (_("Toggle all additional widgets")); + gtk_widget_show (menu_toggle_all_additional_widgets1); + gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_toggle_all_additional_widgets1); + menu_fullscreen1 = gtk_check_menu_item_new_with_mnemonic (_("Full_screen")); gtk_widget_show (menu_fullscreen1); gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_fullscreen1); @@ -824,11 +829,13 @@ crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (crlf)); gtk_widget_show (crlf); gtk_container_add (GTK_CONTAINER (menu_line_endings1_menu), crlf); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (crlf), TRUE); lf = gtk_radio_menu_item_new_with_mnemonic (crlf_group, _("Convert and Set to _LF (Unix)")); crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (lf)); gtk_widget_show (lf); gtk_container_add (GTK_CONTAINER (menu_line_endings1_menu), lf); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lf), TRUE); cr = gtk_radio_menu_item_new_with_mnemonic (crlf_group, _("Convert and Set to CR (_Mac)")); crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (cr)); @@ -886,25 +893,25 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image1737 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1737); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image1737); + image1771 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1771); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image1771); project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1); - image1738 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1738); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image1738); + image1772 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1772); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image1772); project_close1 = gtk_image_menu_item_new_with_mnemonic (_("_Close")); gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1); - image1739 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1739); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image1739); + image1773 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1773); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image1773); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -931,9 +938,9 @@ gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); - image1740 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1740); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1740); + image1774 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1774); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1774); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1383,6 +1390,9 @@ g_signal_connect ((gpointer) menu_change_font1, "activate", G_CALLBACK (on_change_font1_activate), NULL); + g_signal_connect ((gpointer) menu_toggle_all_additional_widgets1, "activate", + G_CALLBACK (on_menu_toggle_all_additional_widgets1_activate), + NULL); g_signal_connect ((gpointer) menu_fullscreen1, "toggled", G_CALLBACK (on_fullscreen1_toggled), NULL); @@ -1561,7 +1571,7 @@ GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image1724, "image1724"); + GLADE_HOOKUP_OBJECT (window1, image1758, "image1758"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1572,11 +1582,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image1725, "image1725"); + GLADE_HOOKUP_OBJECT (window1, image1759, "image1759"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image1726, "image1726"); + GLADE_HOOKUP_OBJECT (window1, image1760, "image1760"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image1727, "image1727"); + GLADE_HOOKUP_OBJECT (window1, image1761, "image1761"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1588,7 +1598,7 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image1728, "image1728"); + GLADE_HOOKUP_OBJECT (window1, image1762, "image1762"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1614,20 +1624,20 @@ GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1729, "image1729"); + GLADE_HOOKUP_OBJECT (window1, image1763, "image1763"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1730, "image1730"); + GLADE_HOOKUP_OBJECT (window1, image1764, "image1764"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2_menu, "send_selection_to2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image1731, "image1731"); + GLADE_HOOKUP_OBJECT (window1, image1765, "image1765"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image1732, "image1732"); + GLADE_HOOKUP_OBJECT (window1, image1766, "image1766"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1636,7 +1646,7 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image1733, "image1733"); + GLADE_HOOKUP_OBJECT (window1, image1767, "image1767"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); @@ -1648,7 +1658,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image1734, "image1734"); + GLADE_HOOKUP_OBJECT (window1, image1768, "image1768"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1656,12 +1666,13 @@ GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image1735, "image1735"); + GLADE_HOOKUP_OBJECT (window1, image1769, "image1769"); GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3"); GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image1736, "image1736"); + GLADE_HOOKUP_OBJECT (window1, image1770, "image1770"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); + GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1"); GLADE_HOOKUP_OBJECT (window1, menu_show_toolbar1, "menu_show_toolbar1"); @@ -1701,18 +1712,18 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image1737, "image1737"); + GLADE_HOOKUP_OBJECT (window1, image1771, "image1771"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image1738, "image1738"); + GLADE_HOOKUP_OBJECT (window1, image1772, "image1772"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image1739, "image1739"); + GLADE_HOOKUP_OBJECT (window1, image1773, "image1773"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image1740, "image1740"); + GLADE_HOOKUP_OBJECT (window1, image1774, "image1774"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, menu_insert_special_chars1, "menu_insert_special_chars1"); GLADE_HOOKUP_OBJECT (window1, menu_item5, "menu_item5"); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-05-06 14:05:43 UTC (rev 1510) +++ trunk/src/keybindings.c 2007-05-06 14:49:51 UTC (rev 1511) @@ -71,6 +71,7 @@ static void cb_func_menu_nextmessage(guint key_id); static void cb_func_menu_gotoline(guint key_id); +static void cb_func_menu_toggle_all(guint key_id); static void cb_func_menu_fullscreen(guint key_id); static void cb_func_menu_messagewindow(guint key_id); static void cb_func_menu_zoomin(guint key_id); @@ -94,7 +95,6 @@ static void cb_func_switch_tabright(guint key_id); static void cb_func_switch_tablastused(guint key_id); static void cb_func_toggle_sidebar(guint key_id); -static void cb_func_hide_show_all(guint key_id); // common function for editing keybindings, only valid when scintilla has focus. static void cb_func_edit(guint key_id); @@ -169,14 +169,14 @@ keys[GEANY_KEYS_MENU_GOTOLINE] = fill(cb_func_menu_gotoline, GDK_j, GDK_CONTROL_MASK, "menu_gotoline", _("Go to line")); + keys[GEANY_KEYS_MENU_TOGGLEALL] = fill(cb_func_menu_toggle_all, + 0, 0, "menu_toggleall", _("Toggle all additional widgets")); keys[GEANY_KEYS_MENU_FULLSCREEN] = fill(cb_func_menu_fullscreen, GDK_F11, 0, "menu_fullscreen", _("Fullscreen")); keys[GEANY_KEYS_MENU_MESSAGEWINDOW] = fill(cb_func_menu_messagewindow, 0, 0, "menu_messagewindow", _("Toggle Messages Window")); keys[GEANY_KEYS_MENU_SIDEBAR] = fill(cb_func_toggle_sidebar, 0, 0, "toggle_sidebar", _("Toggle Sidebar")); - keys[GEANY_KEYS_MENU_HIDESHOWALL] = fill(cb_func_hide_show_all, - 0, 0, "hide_show_all", _("Hide and show all additional widgets")); keys[GEANY_KEYS_MENU_ZOOMIN] = fill(cb_func_menu_zoomin, GDK_plus, GDK_CONTROL_MASK, "menu_zoomin", _("Zoom In")); keys[GEANY_KEYS_MENU_ZOOMOUT] = fill(cb_func_menu_zoomout, @@ -354,8 +354,10 @@ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDINFILES, find_in_files1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_NEXTMESSAGE, next_message1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_GOTOLINE, go_to_line1); + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_TOGGLEALL, menu_toggle_all_additional_widgets1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FULLSCREEN, menu_fullscreen1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_MESSAGEWINDOW, menu_show_messages_window1); + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SIDEBAR, menu_show_sidebar1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_OPENCOLORCHOOSER, menu_choose_color1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_ZOOMIN, menu_zoom_in1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_ZOOMOUT, menu_zoom_out1); @@ -466,7 +468,7 @@ g_string_append(text_names, _("\nSearch menu\n")); g_string_append(text_keys, "\n\n"); break; - case GEANY_KEYS_MENU_FULLSCREEN: + case GEANY_KEYS_MENU_TOGGLEALL: g_string_append(text_names, _("\nView menu\n")); g_string_append(text_keys, "\n\n"); break; @@ -977,63 +979,13 @@ static void cb_func_toggle_sidebar(G_GNUC_UNUSED guint key_id) { - static gint active_page = -1; - - if (app->sidebar_visible) - { - // to remember the active page because GTK (e.g. 2.8.18) doesn't do it and shows always - // the last page (for unknown reason, with GTK 2.6.4 it works) - active_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(app->treeview_notebook)); - } - - app->sidebar_visible = ! app->sidebar_visible; - - if ((! app->sidebar_openfiles_visible && ! app->sidebar_symbol_visible)) - { - app->sidebar_openfiles_visible = TRUE; - app->sidebar_symbol_visible = TRUE; - } - - ui_treeviews_show_hide(TRUE); - gtk_notebook_set_current_page(GTK_NOTEBOOK(app->treeview_notebook), active_page); + on_menu_show_sidebar1_toggled(NULL, NULL); } -static void cb_func_hide_show_all(G_GNUC_UNUSED guint key_id) +static void cb_func_menu_toggle_all(G_GNUC_UNUSED guint key_id) { - static gint hide_all = FALSE; - GtkCheckMenuItem *msgw = GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_show_messages_window1")); - GtkCheckMenuItem *toolbari = GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_show_toolbar1")); - - hide_all = ! hide_all; - - if (hide_all) - { - if (gtk_check_menu_item_get_active(msgw)) - gtk_check_menu_item_set_active(msgw, ! gtk_check_menu_item_get_active(msgw)); - - if (app->sidebar_visible) - cb_func_toggle_sidebar(key_id); - - ui_statusbar_showhide(FALSE); - - if (gtk_check_menu_item_get_active(toolbari)) - gtk_check_menu_item_set_active(toolbari, ! gtk_check_menu_item_get_active(toolbari)); - } - else - { - - if (! gtk_check_menu_item_get_active(msgw)) - gtk_check_menu_item_set_active(msgw, ! gtk_check_menu_item_get_active(msgw)); - - if (! app->sidebar_visible) - cb_func_toggle_sidebar(key_id); - - ui_statusbar_showhide(TRUE); - - if (! gtk_check_menu_item_get_active(toolbari)) - gtk_check_menu_item_set_active(toolbari, ! gtk_check_menu_item_get_active(toolbari)); - } + on_menu_toggle_all_additional_widgets1_activate(NULL, NULL); } Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2007-05-06 14:05:43 UTC (rev 1510) +++ trunk/src/keybindings.h 2007-05-06 14:49:51 UTC (rev 1511) @@ -75,12 +75,12 @@ GEANY_KEYS_POPUP_GOTOTAGDECLARATION, GEANY_KEYS_POPUP_CONTEXTACTION, + GEANY_KEYS_MENU_TOGGLEALL, GEANY_KEYS_MENU_FULLSCREEN, GEANY_KEYS_MENU_MESSAGEWINDOW, GEANY_KEYS_MENU_SIDEBAR, GEANY_KEYS_MENU_ZOOMIN, GEANY_KEYS_MENU_ZOOMOUT, - GEANY_KEYS_MENU_HIDESHOWALL, GEANY_KEYS_MENU_REPLACETABS, GEANY_KEYS_MENU_FOLDALL, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1510] trunk
by eht16＠users.sourceforge.net 06 May '07

06 May '07

Revision: 1510 http://svn.sourceforge.net/geany/?rev=1510&view=rev Author: eht16 Date: 2007-05-06 07:05:43 -0700 (Sun, 06 May 2007) Log Message: ----------- Added new filetype Haskell (patch by Guillaume Hoffmann, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/scintilla/KeyWords.cxx trunk/scintilla/Makefile.am trunk/scintilla/makefile.win32 trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/sci_cb.c Added Paths: ----------- trunk/data/filetypes.haskell trunk/scintilla/LexHaskell.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/ChangeLog 2007-05-06 14:05:43 UTC (rev 1510) @@ -1,3 +1,12 @@ +2007-05-06 Enrico Tröger <enrico.troeger(a)uvena.de> + + * data/filetypes.haskell, scintilla/KeyWords.cxx, + scintilla/LexHaskell.cxx, scintilla/Makefile.am, + scintilla/makefile.win32, src/filetypes.c, src/filetypes.h, + src/highlighting.c, src/highlighting.h, src/sci_cb.c, THANKS: + Added new filetype Haskell (patch by Guillaume Hoffmann, thanks). + + 2007-05-05 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/keybindings.c: Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/THANKS 2007-05-06 14:05:43 UTC (rev 1510) @@ -24,9 +24,10 @@ Jeff Pohlmeyer <yetanothergeek(at)gmail(dot)com> - "Allow DnD", "Use tabs" and other great patches Tomás Vírseda <kaskaras(at)gmail(dot)com> - sort open files patch Dirk Weber <dietrich-weber(at)web(dot)de> -Slava Semushin <slava(dot)semushin(at)gmail(dot)com> - patch to improve SVN checks in cofigure script +Slava Semushin <slava(dot)semushin(at)gmail(dot)com> - patch to improve SVN checks in configure script John Gabriele <jmg3000(at)gmail(dot)com> - documentation patches Anh Phạm <cs(dot)phamtuananh(at)gmail(dot)com> - various patches +Guillaume Hoffmann <guillaumh(at)gmail(dot)com> - Haskell filetype patch Translators: ---------------------------------- Added: trunk/data/filetypes.haskell =================================================================== --- trunk/data/filetypes.haskell (rev 0) +++ trunk/data/filetypes.haskell 2007-05-06 14:05:43 UTC (rev 1510) @@ -0,0 +1,52 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +commentline=0x808080;0xffffff;false;false +commentblock=0x808080;0xffffff;false;false +commentblock2=0x808080;0xffffff;false;false +commentblock3=0x808080;0xffffff;false;false +number=0x007f00;0xffffff;false;false +keyword=0x00007f;0xffffff;true;false +import=0x991111;0xffffff;false;false +string=0xff901e;0xffffff;false;false +character=0x7f007f;0xffffff;false;false +class=0x0000d0;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +instance=0x000000;0xffffff;false;false +capital=0x635b00;0xffffff;false;false +module=0x007f7f;0xffffff;false;false +data=0x000000;0xffffff;false;false + +[keywords] +# all items must be in one line +keywords=as case class data deriving do else if import in infixl infixr instance let module of primitive qualified then type where + + +[settings] +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=-- +comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler= +linker= +run_cmd= Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/scintilla/KeyWords.cxx 2007-05-06 14:05:43 UTC (rev 1510) @@ -168,6 +168,7 @@ LINK_LEXER(lmVHDL); LINK_LEXER(lmD); LINK_LEXER(lmLua); + LINK_LEXER(lmHaskell); //--Autogenerated -- end of automatically generated section Added: trunk/scintilla/LexHaskell.cxx =================================================================== --- trunk/scintilla/LexHaskell.cxx (rev 0) +++ trunk/scintilla/LexHaskell.cxx 2007-05-06 14:05:43 UTC (rev 1510) @@ -0,0 +1,263 @@ +/****************************************************************** + * LexHaskell.cxx + * + * A haskell lexer for the scintilla code control. + * Some stuff "lended" from LexPython.cxx and LexCPP.cxx. + * External lexer stuff inspired from the caml external lexer. + * + * Written by Tobias Engvall - tumm at dtek dot chalmers dot se + * + * + * TODO: + * * Implement a folder :) + * * Nice Character-lexing (stuff inside '\''), LexPython has + * this. + * + * + *****************************************************************/ + +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <stdio.h> +#include <stdarg.h> + +#include "Platform.h" + +#include "PropSet.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#ifdef BUILD_AS_EXTERNAL_LEXER + +#include "ExternalLexer.h" +#include "WindowAccessor.h" + +#define BUILD_EXTERNAL_LEXER 0 + +#endif + +// Max level of nested comments +#define SCE_HA_COMMENTMAX SCE_HA_COMMENTBLOCK3 + + +enum kwType { kwOther, kwClass, kwData, kwInstance, kwImport, kwModule, kwType}; + +static inline bool IsNewline(const int ch) { + return (ch == '\n' || ch == '\r'); +} + +static inline bool IsWhitespace(const int ch) { + return ( ch == ' ' + || ch == '\t' + || IsNewline(ch) ); +} + +static inline bool IsAWordStart(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '_'); +} + +static inline bool IsAWordChar(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\''); +} + +static void ColorizeHaskellDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + + WordList &keywords = *keywordlists[0]; + + int kwLast = kwOther; + + StyleContext sc(startPos, length, initStyle, styler); + + for (; sc.More(); sc.Forward()) { + + // Check for state end + // Operator + if (sc.state == SCE_HA_OPERATOR) { + kwLast = kwOther; + sc.SetState(SCE_HA_DEFAULT); + } + // String + else if (sc.state == SCE_HA_STRING) { + if (sc.ch == '\"') { + sc.ForwardSetState(SCE_HA_DEFAULT); + } + } + // Char + else if (sc.state == SCE_HA_CHARACTER) { + if (sc.ch == '\'') { + sc.ForwardSetState(SCE_HA_DEFAULT); + } + } + // Number + else if (sc.state == SCE_HA_NUMBER) { + if (!IsADigit(sc.ch)) { + sc.SetState(SCE_HA_DEFAULT); + } + } + // Types, constructors, etc. + else if (sc.state == SCE_HA_CAPITAL) { + if (!IsAWordChar(sc.ch) || sc.ch == '.') { + sc.SetState(SCE_HA_DEFAULT); + } + } + // Identifier + else if (sc.state == SCE_HA_IDENTIFIER) { + if (!IsAWordChar(sc.ch)) { + char s[100]; + sc.GetCurrent(s, sizeof(s)); + int style = SCE_HA_IDENTIFIER; + if ((kwLast == kwImport) || (strcmp(s,"qualified") == 0) || (strcmp(s,"as") == 0)) { + style = SCE_HA_IMPORT; + } else if (keywords.InList(s)) { + style = SCE_HA_KEYWORD; + } else if (kwLast == kwData) { + style = SCE_HA_DATA; + } else if (kwLast == kwClass) { + style = SCE_HA_CLASS; + } else if (kwLast == kwModule) { + style = SCE_HA_MODULE; + } else if (isupper(s[0])) { + style = SCE_HA_CAPITAL; + } + sc.ChangeState(style); + sc.SetState(SCE_HA_DEFAULT); + if (style == SCE_HA_KEYWORD) { + if (0 == strcmp(s, "class")) + kwLast = kwClass; + else if (0 == strcmp(s, "data")) + kwLast = kwData; + else if (0 == strcmp(s, "instance")) + kwLast = kwInstance; + else if (0 == strcmp(s, "import")) + kwLast = kwImport; + else if (0 == strcmp(s, "module")) + kwLast = kwModule; + else + kwLast = kwOther; + } else if (style == SCE_HA_CLASS || style == SCE_HA_IMPORT || + style == SCE_HA_MODULE || style == SCE_HA_CAPITAL || + style == SCE_HA_DATA || style == SCE_HA_INSTANCE) { + kwLast = kwOther; + } + } + } + // Comments + // Oneliner + else if (sc.state == SCE_HA_COMMENTLINE) { + if (IsNewline(sc.ch)) + sc.SetState(SCE_HA_DEFAULT); + } + // Nested + else if (sc.state >= SCE_HA_COMMENTBLOCK) { + if (sc.Match("{-")) { + if (sc.state < SCE_HA_COMMENTMAX) + sc.SetState(sc.state + 1); + } + else if (sc.Match("-}")) { + sc.Forward(); + if (sc.state == SCE_HA_COMMENTBLOCK) + sc.ForwardSetState(SCE_HA_DEFAULT); + else + sc.ForwardSetState(sc.state - 1); + } + } + // New state? + if (sc.state == SCE_HA_DEFAULT) { + // Digit + if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + sc.SetState(SCE_HA_NUMBER); + } + // Comment line + else if (sc.Match("--")) { + sc.SetState(SCE_HA_COMMENTLINE); + // Comment block + } + else if (sc.Match("{-")) { + sc.SetState(SCE_HA_COMMENTBLOCK); + } + // String + else if (sc.Match('\"')) { + sc.SetState(SCE_HA_STRING); + } + // Character + else if (sc.Match('\'') && IsWhitespace(sc.GetRelative(-1)) ) { + sc.SetState(SCE_HA_CHARACTER); + } + // Stringstart + else if (sc.Match('\"')) { + sc.SetState(SCE_HA_STRING); + } + // Operator + else if (isascii(sc.ch) && isoperator(static_cast<char>(sc.ch))) { + sc.SetState(SCE_HA_OPERATOR); + } + // Keyword + else if (IsAWordStart(sc.ch)) { + sc.SetState(SCE_HA_IDENTIFIER); + } + + } + } + sc.Complete(); +} + +// External stuff - used for dynamic-loading, not implemented in wxStyledTextCtrl yet. +// Inspired by the caml external lexer - Credits to Robert Roessler - http://www.rftp.com +#ifdef BUILD_EXTERNAL_LEXER +static const char* LexerName = "haskell"; + +void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length, int initStyle, + char *words[], WindowID window, char *props) +{ + PropSet ps; + ps.SetMultiple(props); + WindowAccessor wa(window, ps); + + int nWL = 0; + for (; words[nWL]; nWL++) ; + WordList** wl = new WordList* [nWL + 1]; + int i = 0; + for (; i<nWL; i++) + { + wl[i] = new WordList(); + wl[i]->Set(words[i]); + } + wl[i] = 0; + + ColorizeHaskellDoc(startPos, length, initStyle, wl, wa); + wa.Flush(); + for (i=nWL-1;i>=0;i--) + delete wl[i]; + delete [] wl; +} + +void EXT_LEXER_DECL Fold (unsigned int lexer, unsigned int startPos, int length, int initStyle, + char *words[], WindowID window, char *props) +{ + +} + +int EXT_LEXER_DECL GetLexerCount() +{ + return 1; +} + +void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength) +{ + if (buflength > 0) { + buflength--; + int n = strlen(LexerName); + if (n > buflength) + n = buflength; + memcpy(name, LexerName, n), name[n] = '\0'; + } +} +#endif + +LexerModule lmHaskell(SCLEX_HASKELL, ColorizeHaskellDoc, "haskell"); + Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/scintilla/Makefile.am 2007-05-06 14:05:43 UTC (rev 1510) @@ -27,7 +27,8 @@ LexRuby.cxx \ LexSQL.cxx \ LexTCL.cxx \ -LexVHDL.cxx +LexVHDL.cxx \ +LexHaskell.cxx SRCS= \ CallTip.cxx \ Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/scintilla/makefile.win32 2007-05-06 14:05:43 UTC (rev 1510) @@ -62,7 +62,7 @@ LEXOBJS=\ LexBash.o LexAsm.o LexCSS.o LexConf.o LexCPP.o LexCrontab.o LexHTML.o LexOthers.o LexPascal.o \ LexPerl.o LexPython.o LexSQL.o LexCaml.o LexOMS.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o \ -LexD.o LexLua.o +LexD.o LexLua.o LexHaskell.o #--Autogenerated -- end of automatically generated section all: $(COMPLIB) Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/src/filetypes.c 2007-05-06 14:05:43 UTC (rev 1510) @@ -70,7 +70,8 @@ FILETYPE_UID_HTML, // 25 FILETYPE_UID_VHDL, // 26 FILETYPE_UID_JS, // 27 - FILETYPE_UID_LUA // 28 + FILETYPE_UID_LUA, // 28 + FILETYPE_UID_HASKELL // 29 }; @@ -113,6 +114,7 @@ case FILETYPE_UID_VHDL: return filetypes[GEANY_FILETYPES_VHDL]; case FILETYPE_UID_JS: return filetypes[GEANY_FILETYPES_JS]; case FILETYPE_UID_LUA: return filetypes[GEANY_FILETYPES_LUA]; + case FILETYPE_UID_HASKELL: return filetypes[GEANY_FILETYPES_HASKELL]; default: return NULL; } } @@ -343,6 +345,19 @@ filetypes[GEANY_FILETYPES_FERITE]->comment_open = g_strdup("/*"); filetypes[GEANY_FILETYPES_FERITE]->comment_close = g_strdup("*/"); +#define HASKELL + filetypes[GEANY_FILETYPES_HASKELL]->id = GEANY_FILETYPES_HASKELL; + filetypes[GEANY_FILETYPES_HASKELL]->uid = FILETYPE_UID_HASKELL; + filetypes[GEANY_FILETYPES_HASKELL]->lang = -2; + filetypes[GEANY_FILETYPES_HASKELL]->name = g_strdup("Haskell"); + filetypes[GEANY_FILETYPES_HASKELL]->has_tags = FALSE; + filetypes[GEANY_FILETYPES_HASKELL]->title = g_strdup(_("Haskell source file")); + filetypes[GEANY_FILETYPES_HASKELL]->extension = g_strdup("hs"); + filetypes[GEANY_FILETYPES_HASKELL]->pattern = utils_strv_new("*.hs", "*.lhs", NULL); + filetypes[GEANY_FILETYPES_HASKELL]->style_func_ptr = styleset_haskell; + filetypes[GEANY_FILETYPES_HASKELL]->comment_open = g_strdup("--"); + filetypes[GEANY_FILETYPES_HASKELL]->comment_close = NULL; + #define SH filetypes[GEANY_FILETYPES_SH]->id = GEANY_FILETYPES_SH; filetypes[GEANY_FILETYPES_SH]->uid = FILETYPE_UID_SH; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/src/filetypes.h 2007-05-06 14:05:43 UTC (rev 1510) @@ -51,6 +51,7 @@ GEANY_FILETYPES_TCL, GEANY_FILETYPES_LUA, GEANY_FILETYPES_FERITE, + GEANY_FILETYPES_HASKELL, GEANY_FILETYPES_SH, GEANY_FILETYPES_MAKE, GEANY_FILETYPES_XML, Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/src/highlighting.c 2007-05-06 14:05:43 UTC (rev 1510) @@ -2379,6 +2379,79 @@ } +static void styleset_haskell_init(void) +{ + GKeyFile *config = g_key_file_new(); + GKeyFile *config_home = g_key_file_new(); + + load_keyfiles(config, config_home, GEANY_FILETYPES_HASKELL); + + new_style_array(GEANY_FILETYPES_HASKELL, 17); + + get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[0]); + get_keyfile_hex(config, config_home, "styling", "commentline", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[1]); + get_keyfile_hex(config, config_home, "styling", "commentblock", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[2]); + get_keyfile_hex(config, config_home, "styling", "commentblock2", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[3]); + get_keyfile_hex(config, config_home, "styling", "commentblock3", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[4]); + get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[5]); + get_keyfile_hex(config, config_home, "styling", "keyword", "0x00007f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_HASKELL].styling[6]); + get_keyfile_hex(config, config_home, "styling", "import", "0x991111", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[7]); + get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[8]); + get_keyfile_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[9]); + get_keyfile_hex(config, config_home, "styling", "class", "0x0000d0", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[10]); + get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[11]); + get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[12]); + get_keyfile_hex(config, config_home, "styling", "instance", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[13]); + get_keyfile_hex(config, config_home, "styling", "capital", "0x635b00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[14]); + get_keyfile_hex(config, config_home, "styling", "module", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[15]); + get_keyfile_hex(config, config_home, "styling", "data", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_HASKELL].styling[16]); + + style_sets[GEANY_FILETYPES_HASKELL].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_HASKELL, 0, + "as case class data deriving do else if import in infixl infixr instance let module of primitive qualified then type where"); + style_sets[GEANY_FILETYPES_HASKELL].keywords[1] = NULL; + + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_HASKELL].wordchars); + filetypes_get_config(config, config_home, GEANY_FILETYPES_HASKELL); + + g_key_file_free(config); + g_key_file_free(config_home); +} + + +void styleset_haskell(ScintillaObject *sci) +{ + styleset_common(sci, 5); + if (style_sets[GEANY_FILETYPES_HASKELL].styling == NULL) styleset_haskell_init(); + + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_HASKELL].wordchars); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); + + SSM(sci, SCI_SETLEXER, SCLEX_HASKELL, 0); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_HASKELL].keywords[0]); + + set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_HASKELL, 0); + set_sci_style(sci, SCE_HA_DEFAULT, GEANY_FILETYPES_HASKELL, 0); + set_sci_style(sci, SCE_HA_COMMENTLINE, GEANY_FILETYPES_HASKELL, 1); + set_sci_style(sci, SCE_HA_COMMENTBLOCK, GEANY_FILETYPES_HASKELL, 2); + set_sci_style(sci, SCE_HA_COMMENTBLOCK2, GEANY_FILETYPES_HASKELL, 3); + set_sci_style(sci, SCE_HA_COMMENTBLOCK3, GEANY_FILETYPES_HASKELL, 4); + set_sci_style(sci, SCE_HA_NUMBER, GEANY_FILETYPES_HASKELL, 5); + set_sci_style(sci, SCE_HA_KEYWORD, GEANY_FILETYPES_HASKELL, 6); + set_sci_style(sci, SCE_HA_IMPORT, GEANY_FILETYPES_HASKELL, 7); + set_sci_style(sci, SCE_HA_STRING, GEANY_FILETYPES_HASKELL, 8); + set_sci_style(sci, SCE_HA_CHARACTER, GEANY_FILETYPES_HASKELL, 9); + set_sci_style(sci, SCE_HA_CLASS, GEANY_FILETYPES_HASKELL, 10); + set_sci_style(sci, SCE_HA_OPERATOR, GEANY_FILETYPES_HASKELL, 11); + set_sci_style(sci, SCE_HA_IDENTIFIER, GEANY_FILETYPES_HASKELL, 12); + set_sci_style(sci, SCE_HA_INSTANCE, GEANY_FILETYPES_HASKELL, 13); + set_sci_style(sci, SCE_HA_CAPITAL, GEANY_FILETYPES_HASKELL, 14); + set_sci_style(sci, SCE_HA_MODULE, GEANY_FILETYPES_HASKELL, 15); + set_sci_style(sci, SCE_HA_DATA, GEANY_FILETYPES_HASKELL, 16); +} + + static void styleset_caml_init(void) { GKeyFile *config = g_key_file_new(); @@ -2452,6 +2525,8 @@ } + + static void styleset_oms_init(void) { GKeyFile *config = g_key_file_new(); Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/src/highlighting.h 2007-05-06 14:05:43 UTC (rev 1510) @@ -77,6 +77,8 @@ void styleset_caml(ScintillaObject *sci); +void styleset_haskell(ScintillaObject *sci); + void styleset_oms(ScintillaObject *sci); void styleset_tcl(ScintillaObject *sci); Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-05-05 17:01:59 UTC (rev 1509) +++ trunk/src/sci_cb.c 2007-05-06 14:05:43 UTC (rev 1510) @@ -2102,6 +2102,17 @@ result = TRUE; break; } + case SCLEX_HASKELL: + { + if (style == SCE_HA_COMMENTLINE || + style == SCE_HA_COMMENTBLOCK || + style == SCE_HA_COMMENTBLOCK2 || + style == SCE_HA_COMMENTBLOCK3 || + style == SCE_HA_CHARACTER || + style == SCE_HA_STRING) + result = TRUE; + break; + } case SCLEX_HTML: { if (style == SCE_HPHP_SIMPLESTRING || This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1509] trunk/src/filetypes.c
by ntrel＠users.sourceforge.net 05 May '07

05 May '07

Revision: 1509 http://svn.sourceforge.net/geany/?rev=1509&view=rev Author: ntrel Date: 2007-05-05 10:01:59 -0700 (Sat, 05 May 2007) Log Message: ----------- Use the more common .pl suffix for the default Perl extension. Modified Paths: -------------- trunk/src/filetypes.c Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-05-05 16:51:41 UTC (rev 1508) +++ trunk/src/filetypes.c 2007-05-05 17:01:59 UTC (rev 1509) @@ -244,7 +244,7 @@ filetypes[GEANY_FILETYPES_PERL]->name = g_strdup("Perl"); filetypes[GEANY_FILETYPES_PERL]->has_tags = TRUE; filetypes[GEANY_FILETYPES_PERL]->title = g_strdup(_("Perl source file")); - filetypes[GEANY_FILETYPES_PERL]->extension = g_strdup("perl"); + filetypes[GEANY_FILETYPES_PERL]->extension = g_strdup("pl"); filetypes[GEANY_FILETYPES_PERL]->pattern = utils_strv_new("*.pl", "*.perl", "*.pm", "*.agi", "*.pod", NULL); filetypes[GEANY_FILETYPES_PERL]->comment_open = g_strdup("#"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2007