msgstr ""
"Project-Id-Version: gitk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-18 22:03+1100\n"
+"POT-Creation-Date: 2015-03-15 14:37+1100\n"
"PO-Revision-Date: 2008-03-25 11:20+0100\n"
"Last-Translator: Santiago Gala <santiago.gala@gmail.com>\n"
"Language-Team: Spanish\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: gitk:113
+#: gitk:140
msgid "Couldn't get list of unmerged files:"
msgstr "Imposible obtener la lista de archivos pendientes de fusión:"
-#: gitk:340
+#: gitk:212 gitk:2381
+msgid "Color words"
+msgstr ""
+
+#: gitk:217 gitk:2381 gitk:8201 gitk:8234
+msgid "Markup words"
+msgstr ""
+
+#: gitk:324
+#, fuzzy
+msgid "Error parsing revisions:"
+msgstr "Error al leer las diferencias de fusión:"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr ""
+
+#: gitk:393
msgid "No files selected: --merge specified but no files are unmerged."
msgstr ""
"No hay archivos seleccionados: se seleccionó la opción --merge pero no hay "
"archivos pendientes de fusión."
-#: gitk:343
+#: gitk:396
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
"No hay archivos seleccionados: se seleccionó la opción --merge pero los "
"archivos especificados no necesitan fusión."
-#: gitk:378
+#: gitk:418 gitk:566
+#, fuzzy
+msgid "Error executing git log:"
+msgstr "Error al crear la etiqueta:"
+
+#: gitk:436 gitk:582
msgid "Reading"
msgstr "Leyendo"
-#: gitk:438 gitk:3462
+#: gitk:496 gitk:4508
msgid "Reading commits..."
msgstr "Leyendo revisiones..."
-#: gitk:441 gitk:1528 gitk:3465
+#: gitk:499 gitk:1637 gitk:4511
msgid "No commits selected"
msgstr "No se seleccionaron revisiones"
-#: gitk:1399
+#: gitk:1511
msgid "Can't parse git log output:"
msgstr "Error analizando la salida de git log:"
-#: gitk:1605
+#: gitk:1740
msgid "No commit information available"
msgstr "Falta información sobre las revisiones"
-#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466
+#: gitk:1897
+msgid "mc"
+msgstr ""
+
+#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
msgid "OK"
msgstr "Aceptar"
-#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766
-#: gitk:9294 gitk:9467
+#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
+#: gitk:11221 gitk:11501
msgid "Cancel"
msgstr "Cancelar"
-#: gitk:1811
+#: gitk:2069
msgid "Update"
msgstr "Actualizar"
-#: gitk:1813
+#: gitk:2070
+msgid "Reload"
+msgstr ""
+
+#: gitk:2071
msgid "Reread references"
msgstr "Releer referencias"
-#: gitk:1814
+#: gitk:2072
msgid "List references"
msgstr "Lista de referencias"
-#: gitk:1815
+#: gitk:2074
+msgid "Start git gui"
+msgstr ""
+
+#: gitk:2076
msgid "Quit"
msgstr "Salir"
-#: gitk:1810
+#: gitk:2068
msgid "File"
msgstr "Archivo"
-#: gitk:1818
+#: gitk:2080
msgid "Preferences"
msgstr "Preferencias"
-#: gitk:1817
+#: gitk:2079
msgid "Edit"
msgstr "Editar"
-#: gitk:1821
+#: gitk:2084
msgid "New view..."
msgstr "Nueva vista..."
-#: gitk:1822
+#: gitk:2085
msgid "Edit view..."
msgstr "Modificar vista..."
-#: gitk:1823
+#: gitk:2086
msgid "Delete view"
msgstr "Eliminar vista"
-#: gitk:1825
+#: gitk:2088
msgid "All files"
msgstr "Todos los archivos"
-#: gitk:1820 gitk:3196
+#: gitk:2083 gitk:4050
msgid "View"
msgstr "Vista"
-#: gitk:1828 gitk:2487
+#: gitk:2093 gitk:2103 gitk:3009
msgid "About gitk"
msgstr "Acerca de gitk"
-#: gitk:1829
+#: gitk:2094 gitk:2108
msgid "Key bindings"
msgstr "Combinaciones de teclas"
-#: gitk:1827
+#: gitk:2092 gitk:2107
msgid "Help"
msgstr "Ayuda"
-#: gitk:1887
-msgid "SHA1 ID: "
-msgstr "SHA1 ID: "
+#: gitk:2185 gitk:8633
+msgid "SHA1 ID:"
+msgstr "SHA1 ID:"
-#: gitk:1918
+#: gitk:2229
msgid "Row"
msgstr ""
-#: gitk:1949
+#: gitk:2267
msgid "Find"
msgstr "Buscar"
-#: gitk:1950
-msgid "next"
-msgstr "<<"
-
-#: gitk:1951
-msgid "prev"
-msgstr ">>"
-
-#: gitk:1952
+#: gitk:2295
msgid "commit"
msgstr "revisión"
-#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621
+#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
+#: gitk:6893
msgid "containing:"
msgstr "que contiene:"
-#: gitk:1958 gitk:2954 gitk:2959 gitk:3692
+#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
msgid "touching paths:"
msgstr "que modifica la ruta:"
-#: gitk:1959 gitk:3697
+#: gitk:2303 gitk:4759
msgid "adding/removing string:"
msgstr "que añade/elimina cadena:"
-#: gitk:1968 gitk:1970
+#: gitk:2304 gitk:4761
+msgid "changing lines matching:"
+msgstr ""
+
+#: gitk:2313 gitk:2315 gitk:4748
msgid "Exact"
msgstr "Exacto"
-#: gitk:1970 gitk:3773 gitk:5518
+#: gitk:2315 gitk:4836 gitk:6704
msgid "IgnCase"
msgstr "NoMayús"
-#: gitk:1970 gitk:3666 gitk:3771 gitk:5514
+#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
msgid "Regexp"
msgstr "Regex"
-#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708
+#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
msgid "All fields"
msgstr "Todos los campos"
-#: gitk:1973 gitk:3790 gitk:3822 gitk:5580
+#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
msgid "Headline"
msgstr "Título"
-#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109
+#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
msgid "Comments"
msgstr "Comentarios"
-#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285
-#: gitk:7300
+#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
+#: gitk:8826
msgid "Author"
msgstr "Autor"
-#: gitk:1974 gitk:3790 gitk:5580 gitk:6047
+#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
msgid "Committer"
msgstr ""
-#: gitk:2003
+#: gitk:2350
msgid "Search"
msgstr "Buscar"
-#: gitk:2010
+#: gitk:2358
msgid "Diff"
msgstr "Diferencia"
-#: gitk:2012
+#: gitk:2360
msgid "Old version"
msgstr "Versión antigua"
-#: gitk:2014
+#: gitk:2362
msgid "New version"
msgstr "Versión nueva"
-#: gitk:2016
+#: gitk:2364
msgid "Lines of context"
msgstr "Líneas de contexto"
-#: gitk:2026
+#: gitk:2374
msgid "Ignore space change"
msgstr "Ignora cambios de espaciado"
-#: gitk:2084
+#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
+msgid "Line diff"
+msgstr ""
+
+#: gitk:2445
msgid "Patch"
msgstr "Parche"
-#: gitk:2086
+#: gitk:2447
msgid "Tree"
msgstr "Árbol"
-#: gitk:2213 gitk:2226
+#: gitk:2616 gitk:2636
msgid "Diff this -> selected"
msgstr "Diferencia de esta -> seleccionada"
-#: gitk:2214 gitk:2227
+#: gitk:2617 gitk:2637
msgid "Diff selected -> this"
msgstr "Diferencia de seleccionada -> esta"
-#: gitk:2215 gitk:2228
+#: gitk:2618 gitk:2638
msgid "Make patch"
msgstr "Crear patch"
-#: gitk:2216 gitk:7494
+#: gitk:2619 gitk:9235
msgid "Create tag"
msgstr "Crear etiqueta"
-#: gitk:2217 gitk:7593
+#: gitk:2620 gitk:9352
msgid "Write commit to file"
msgstr "Escribir revisiones a archivo"
-#: gitk:2218 gitk:7647
+#: gitk:2621 gitk:9409
msgid "Create new branch"
msgstr "Crear nueva rama"
-#: gitk:2219
+#: gitk:2622
msgid "Cherry-pick this commit"
msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
-#: gitk:2220
+#: gitk:2623
msgid "Reset HEAD branch to here"
msgstr "Traer la rama HEAD aquí"
-#: gitk:2234
+#: gitk:2624
+#, fuzzy
+msgid "Mark this commit"
+msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
+
+#: gitk:2625
+msgid "Return to mark"
+msgstr ""
+
+#: gitk:2626
+msgid "Find descendant of this and mark"
+msgstr ""
+
+#: gitk:2627
+msgid "Compare with marked commit"
+msgstr ""
+
+#: gitk:2628 gitk:2639
+#, fuzzy
+msgid "Diff this -> marked commit"
+msgstr "Diferencia de esta -> seleccionada"
+
+#: gitk:2629 gitk:2640
+#, fuzzy
+msgid "Diff marked commit -> this"
+msgstr "Diferencia de seleccionada -> esta"
+
+#: gitk:2630
+#, fuzzy
+msgid "Revert this commit"
+msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
+
+#: gitk:2646
msgid "Check out this branch"
msgstr "Cambiar a esta rama"
-#: gitk:2235
+#: gitk:2647
msgid "Remove this branch"
msgstr "Eliminar esta rama"
-#: gitk:2242
+#: gitk:2654
msgid "Highlight this too"
msgstr "Seleccionar también"
-#: gitk:2243
+#: gitk:2655
msgid "Highlight this only"
msgstr "Seleccionar sólo"
-#: gitk:2245
+#: gitk:2656
+msgid "External diff"
+msgstr ""
+
+#: gitk:2657
msgid "Blame parent commit"
msgstr ""
-#: gitk:2488
+#: gitk:2664
+msgid "Show origin of this line"
+msgstr ""
+
+#: gitk:2665
+msgid "Run git gui blame on this line"
+msgstr ""
+
+#: gitk:3011
+#, fuzzy
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
-"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"Uso y redistribución permitidos según los términos de la Licencia Pública "
"General de GNU (GNU GPL)"
-#: gitk:2496 gitk:2557 gitk:7943
+#: gitk:3019 gitk:3085 gitk:9836
msgid "Close"
msgstr "Cerrar"
-#: gitk:2515
+#: gitk:3040
msgid "Gitk key bindings"
msgstr "Combinaciones de tecla de Gitk"
-#: gitk:2517
+#: gitk:3043
msgid "Gitk key bindings:"
msgstr "Combinaciones de tecla de Gitk:"
-#: gitk:2519
+#: gitk:3045
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tSalir"
-#: gitk:2520
+#: gitk:3046
+#, fuzzy, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-F>\t\tBuscar"
+
+#: gitk:3047
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\tIr a la primera revisión"
-#: gitk:2521
+#: gitk:3048
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\tIr a la última revisión"
-#: gitk:2522
-msgid "<Up>, p, i\tMove up one commit"
+#: gitk:3049
+#, fuzzy
+msgid "<Up>, p, k\tMove up one commit"
msgstr "<Up>, p, i\tSubir una revisión"
-#: gitk:2523
-msgid "<Down>, n, k\tMove down one commit"
+#: gitk:3050
+#, fuzzy
+msgid "<Down>, n, j\tMove down one commit"
msgstr "<Down>, n, k\tBajar una revisión"
-#: gitk:2524
-msgid "<Left>, z, j\tGo back in history list"
+#: gitk:3051
+#, fuzzy
+msgid "<Left>, z, h\tGo back in history list"
msgstr "<Left>, z, j\tRetroceder en la historia"
-#: gitk:2525
+#: gitk:3052
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Right>, x, l\tAvanzar en la historia"
-#: gitk:2526
+#: gitk:3053
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr ""
+
+#: gitk:3054
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tSubir una página en la lista de revisiones"
-#: gitk:2527
+#: gitk:3055
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tBajar una página en la lista de revisiones"
-#: gitk:2528
+#: gitk:3056
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones"
-#: gitk:2529
+#: gitk:3057
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones"
-#: gitk:2530
+#: gitk:3058
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones"
-#: gitk:2531
+#: gitk:3059
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones"
-#: gitk:2532
+#: gitk:3060
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones"
-#: gitk:2533
+#: gitk:3061
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones"
-#: gitk:2534
+#: gitk:3062
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)"
-#: gitk:2535
+#: gitk:3063
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)"
-#: gitk:2536
+#: gitk:3064
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias"
-#: gitk:2537
+#: gitk:3065
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias"
-#: gitk:2538
+#: gitk:3066
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias"
-#: gitk:2539
+#: gitk:3067
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias"
-#: gitk:2540
+#: gitk:3068
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias"
-#: gitk:2541
+#: gitk:3069
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tBuscar"
-#: gitk:2542
+#: gitk:3070
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tBuscar el siguiente"
-#: gitk:2543
+#: gitk:3071
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\tBuscar el siguiente"
-#: gitk:2544
-msgid "/\t\tMove to next find hit, or redo find"
-msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda"
+#: gitk:3072
+msgid "/\t\tFocus the search box"
+msgstr ""
-#: gitk:2545
+#: gitk:3073
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tBuscar el anterior"
-#: gitk:2546
+#: gitk:3074
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
-#: gitk:2547
+#: gitk:3075
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias"
-#: gitk:2548
+#: gitk:3076
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias"
-#: gitk:2549
+#: gitk:3077
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\tAumentar tamaño del texto"
-#: gitk:2550
+#: gitk:3078
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tAumentar tamaño del texto"
-#: gitk:2551
+#: gitk:3079
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\tDisminuir tamaño del texto"
-#: gitk:2552
+#: gitk:3080
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tDisminuir tamaño del texto"
-#: gitk:2553
+#: gitk:3081
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tActualizar"
-#: gitk:3200
+#: gitk:3546 gitk:3555
+#, fuzzy, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Error en la creación del parche:"
+
+#: gitk:3568
+#, fuzzy, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Error al leer las diferencias de fusión:"
+
+#: gitk:3631
+#, fuzzy
+msgid "command failed:"
+msgstr "Línea de comandos"
+
+#: gitk:3780
+#, fuzzy
+msgid "No such commit"
+msgstr "No se han guardado cambios"
+
+#: gitk:3794
+msgid "git gui blame: command failed:"
+msgstr ""
+
+#: gitk:3825
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr ""
+
+#: gitk:3833
+#, fuzzy, tcl-format
+msgid "Error reading index: %s"
+msgstr "Error al crear la etiqueta:"
+
+#: gitk:3858
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr ""
+
+#: gitk:3861 gitk:6735
+msgid "Searching"
+msgstr "Buscando"
+
+#: gitk:3893
+#, fuzzy, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Error al crear la etiqueta:"
+
+#: gitk:3921
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr ""
+
+#: gitk:3935
+#, fuzzy
+msgid "External diff viewer failed:"
+msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
+
+#: gitk:4053
msgid "Gitk view definition"
msgstr "Definición de vistas de Gitk"
-#: gitk:3225
-msgid "Name"
-msgstr "Nombre"
-
-#: gitk:3228
+#: gitk:4057
msgid "Remember this view"
msgstr "Recordar esta vista"
-#: gitk:3232
-msgid "Commits to include (arguments to git log):"
+#: gitk:4058
+msgid "References (space separated list):"
+msgstr ""
+
+#: gitk:4059
+msgid "Branches & tags:"
+msgstr ""
+
+#: gitk:4060
+#, fuzzy
+msgid "All refs"
+msgstr "Todos los archivos"
+
+#: gitk:4061
+msgid "All (local) branches"
+msgstr ""
+
+#: gitk:4062
+msgid "All tags"
+msgstr ""
+
+#: gitk:4063
+msgid "All remote-tracking branches"
+msgstr ""
+
+#: gitk:4064
+msgid "Commit Info (regular expressions):"
+msgstr ""
+
+#: gitk:4065
+#, fuzzy
+msgid "Author:"
+msgstr "Autor"
+
+#: gitk:4066
+#, fuzzy
+msgid "Committer:"
+msgstr "revisión"
+
+#: gitk:4067
+msgid "Commit Message:"
+msgstr ""
+
+#: gitk:4068
+msgid "Matches all Commit Info criteria"
+msgstr ""
+
+#: gitk:4069
+msgid "Matches none Commit Info criteria"
+msgstr ""
+
+#: gitk:4070
+msgid "Changes to Files:"
+msgstr ""
+
+#: gitk:4071
+msgid "Fixed String"
+msgstr ""
+
+#: gitk:4072
+msgid "Regular Expression"
+msgstr ""
+
+#: gitk:4073
+#, fuzzy
+msgid "Search string:"
+msgstr "Buscando"
+
+#: gitk:4074
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+
+#: gitk:4075
+msgid "Since:"
+msgstr ""
+
+#: gitk:4076
+msgid "Until:"
+msgstr ""
+
+#: gitk:4077
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr ""
+
+#: gitk:4078
+msgid "Number to show:"
+msgstr ""
+
+#: gitk:4079
+msgid "Number to skip:"
+msgstr ""
+
+#: gitk:4080
+msgid "Miscellaneous options:"
+msgstr ""
+
+#: gitk:4081
+msgid "Strictly sort by date"
+msgstr ""
+
+#: gitk:4082
+msgid "Mark branch sides"
+msgstr ""
+
+#: gitk:4083
+#, fuzzy
+msgid "Limit to first parent"
+msgstr "Limitar las diferencias a las rutas seleccionadas"
+
+#: gitk:4084
+msgid "Simple history"
+msgstr ""
+
+#: gitk:4085
+#, fuzzy
+msgid "Additional arguments to git log:"
msgstr "Revisiones a incluir (argumentos a git log):"
-#: gitk:3239
+#: gitk:4086
+msgid "Enter files and directories to include, one per line:"
+msgstr "Introducir archivos y directorios a incluir, uno por línea:"
+
+#: gitk:4087
msgid "Command to generate more commits to include:"
msgstr "Comando que genera más revisiones a incluir:"
-#: gitk:3246
-msgid "Enter files and directories to include, one per line:"
-msgstr "Introducir archivos y directorios a incluir, uno por línea:"
+#: gitk:4211
+msgid "Gitk: edit view"
+msgstr ""
+
+#: gitk:4219
+msgid "-- criteria for selecting revisions"
+msgstr ""
+
+#: gitk:4224
+#, fuzzy
+msgid "View Name"
+msgstr "Vista"
+
+#: gitk:4299
+msgid "Apply (F5)"
+msgstr ""
-#: gitk:3293
+#: gitk:4337
msgid "Error in commit selection arguments:"
msgstr "Error en los argumentos de selección de las revisiones:"
-#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142
+#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
msgid "None"
msgstr "Ninguno"
-#: gitk:3790 gitk:5580 gitk:7287 gitk:7302
-msgid "Date"
-msgstr "Fecha"
-
-#: gitk:3790 gitk:5580
-msgid "CDate"
-msgstr "Fecha de creación"
-
-#: gitk:3939 gitk:3944
+#: gitk:5003 gitk:5008
msgid "Descendant"
msgstr "Descendiente"
-#: gitk:3940
+#: gitk:5004
msgid "Not descendant"
msgstr "No descendiente"
-#: gitk:3947 gitk:3952
+#: gitk:5011 gitk:5016
msgid "Ancestor"
msgstr "Antepasado"
-#: gitk:3948
+#: gitk:5012
msgid "Not ancestor"
msgstr "No antepasado"
-#: gitk:4187
+#: gitk:5306
msgid "Local changes checked in to index but not committed"
msgstr "Cambios locales añadidos al índice pero sin completar revisión"
-#: gitk:4220
+#: gitk:5342
msgid "Local uncommitted changes, not checked in to index"
msgstr "Cambios locales sin añadir al índice"
-#: gitk:5549
-msgid "Searching"
-msgstr "Buscando"
+#: gitk:7115
+msgid "and many more"
+msgstr ""
+
+#: gitk:7118
+msgid "many"
+msgstr ""
-#: gitk:6049
+#: gitk:7309
msgid "Tags:"
msgstr "Etiquetas:"
-#: gitk:6066 gitk:6072 gitk:7280
+#: gitk:7326 gitk:7332 gitk:8806
msgid "Parent"
msgstr "Padre"
-#: gitk:6077
+#: gitk:7337
msgid "Child"
msgstr "Hija"
-#: gitk:6086
+#: gitk:7346
msgid "Branch"
msgstr "Rama"
-#: gitk:6089
+#: gitk:7349
msgid "Follows"
msgstr "Sigue-a"
-#: gitk:6092
+#: gitk:7352
msgid "Precedes"
msgstr "Precede-a"
-#: gitk:6378
-msgid "Error getting merge diffs:"
+#: gitk:7947
+#, fuzzy, tcl-format
+msgid "Error getting diffs: %s"
msgstr "Error al leer las diferencias de fusión:"
-#: gitk:7113
+#: gitk:8631
msgid "Goto:"
msgstr "Ir a:"
-#: gitk:7115
-msgid "SHA1 ID:"
-msgstr "SHA1 ID:"
-
-#: gitk:7134
+#: gitk:8652
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "La id SHA1 abreviada %s es ambigua"
-#: gitk:7146
+#: gitk:8659
+#, fuzzy, tcl-format
+msgid "Revision %s is not known"
+msgstr "La id SHA1 %s es desconocida"
+
+#: gitk:8669
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "La id SHA1 %s es desconocida"
-#: gitk:7148
+#: gitk:8671
#, tcl-format
-msgid "Tag/Head %s is not known"
-msgstr "La etiqueta/rama %s es deconocida"
+msgid "Revision %s is not in the current view"
+msgstr ""
-#: gitk:7290
+#: gitk:8813 gitk:8828
+msgid "Date"
+msgstr "Fecha"
+
+#: gitk:8816
msgid "Children"
msgstr "Hijas"
-#: gitk:7347
+#: gitk:8879
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Poner la rama %s en esta revisión"
-#: gitk:7349
+#: gitk:8881
msgid "Detached head: can't reset"
msgstr ""
-#: gitk:7381
+#: gitk:8986 gitk:8992
+msgid "Skipping merge commit "
+msgstr ""
+
+#: gitk:9001 gitk:9006
+#, fuzzy
+msgid "Error getting patch ID for "
+msgstr "Error en la creación del parche:"
+
+#: gitk:9002 gitk:9007
+msgid " - stopping\n"
+msgstr ""
+
+#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
+#, fuzzy
+msgid "Commit "
+msgstr "revisión"
+
+#: gitk:9016
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+
+#: gitk:9024
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+
+#: gitk:9026
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+
+#: gitk:9038 gitk:9047
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr ""
+
+#: gitk:9066
+#, fuzzy, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Error al escribir revisión:"
+
+#: gitk:9072
+#, fuzzy, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Error al escribir revisión:"
+
+#: gitk:9118
msgid "Top"
msgstr "Origen"
-#: gitk:7382
+#: gitk:9119
msgid "From"
msgstr "De"
-#: gitk:7387
+#: gitk:9124
msgid "To"
msgstr "A"
-#: gitk:7410
+#: gitk:9148
msgid "Generate patch"
msgstr "Generar parche"
-#: gitk:7412
+#: gitk:9150
msgid "From:"
msgstr "De:"
-#: gitk:7421
+#: gitk:9159
msgid "To:"
msgstr "Para:"
-#: gitk:7430
+#: gitk:9168
msgid "Reverse"
msgstr "Invertir"
-#: gitk:7432 gitk:7607
+#: gitk:9170 gitk:9366
msgid "Output file:"
msgstr "Escribir a archivo:"
-#: gitk:7438
+#: gitk:9176
msgid "Generate"
msgstr "Generar"
-#: gitk:7474
+#: gitk:9214
msgid "Error creating patch:"
msgstr "Error en la creación del parche:"
-#: gitk:7496 gitk:7595 gitk:7649
+#: gitk:9237 gitk:9354 gitk:9411
msgid "ID:"
msgstr "ID:"
-#: gitk:7505
+#: gitk:9246
msgid "Tag name:"
msgstr "Nombre de etiqueta:"
-#: gitk:7509 gitk:7659
+#: gitk:9249
+msgid "Tag message is optional"
+msgstr ""
+
+#: gitk:9251
+#, fuzzy
+msgid "Tag message:"
+msgstr "Nombre de etiqueta:"
+
+#: gitk:9255 gitk:9420
msgid "Create"
msgstr "Crear"
-#: gitk:7524
+#: gitk:9273
msgid "No tag name specified"
msgstr "No se ha especificado etiqueta"
-#: gitk:7528
+#: gitk:9277
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "La etiqueta \"%s\" ya existe"
-#: gitk:7534
+#: gitk:9287
msgid "Error creating tag:"
msgstr "Error al crear la etiqueta:"
-#: gitk:7604
+#: gitk:9363
msgid "Command:"
msgstr "Comando:"
-#: gitk:7612
+#: gitk:9371
msgid "Write"
msgstr "Escribir"
-#: gitk:7628
+#: gitk:9389
msgid "Error writing commit:"
msgstr "Error al escribir revisión:"
-#: gitk:7654
+#: gitk:9416
msgid "Name:"
msgstr "Nombre:"
-#: gitk:7674
+#: gitk:9439
msgid "Please specify a name for the new branch"
msgstr "Especifique un nombre para la nueva rama"
-#: gitk:7703
+#: gitk:9444
+#, fuzzy, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "La etiqueta \"%s\" ya existe"
+
+#: gitk:9511
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
-#: gitk:7708
+#: gitk:9516
msgid "Cherry-picking"
msgstr "Eligiendo revisiones (cherry-picking)"
-#: gitk:7720
+#: gitk:9525
+#, tcl-format
+msgid ""
+"Cherry-pick failed because of local changes to file '%s'.\n"
+"Please commit, reset or stash your changes and try again."
+msgstr ""
+
+#: gitk:9531
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr ""
+
+#: gitk:9547 gitk:9605
msgid "No changes committed"
msgstr "No se han guardado cambios"
-#: gitk:7745
+#: gitk:9574
+#, fuzzy, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
+
+#: gitk:9579
+#, fuzzy
+msgid "Reverting"
+msgstr "Reponiendo"
+
+#: gitk:9587
+#, tcl-format
+msgid ""
+"Revert failed because of local changes to the following files:%s Please "
+"commit, reset or stash your changes and try again."
+msgstr ""
+
+#: gitk:9591
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr ""
+
+#: gitk:9634
msgid "Confirm reset"
msgstr "Confirmar git reset"
-#: gitk:7747
+#: gitk:9636
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "¿Reponer la rama %s a %s?"
-#: gitk:7751
+#: gitk:9638
msgid "Reset type:"
msgstr "Tipo de reposición:"
-#: gitk:7755
+#: gitk:9641
msgid "Soft: Leave working tree and index untouched"
msgstr "Suave: No altera la copia de trabajo ni el índice"
-#: gitk:7758
+#: gitk:9644
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo"
-#: gitk:7761
+#: gitk:9647
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
"Dura: Actualiza el índice y la copia de trabajo\n"
"(abandona TODAS las modificaciones locales)"
-#: gitk:7777
+#: gitk:9664
msgid "Resetting"
msgstr "Reponiendo"
-#: gitk:7834
+#: gitk:9724
msgid "Checking out"
msgstr "Creando copia de trabajo"
-#: gitk:7885
+#: gitk:9777
msgid "Cannot delete the currently checked-out branch"
msgstr "No se puede borrar la rama actual"
-#: gitk:7891
+#: gitk:9783
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
"Las revisiones de la rama %s no están presentes en otras ramas.\n"
"¿Borrar la rama %s?"
-#: gitk:7922
+#: gitk:9814
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Etiquetas y ramas: %s"
-#: gitk:7936
+#: gitk:9829
msgid "Filter"
msgstr "Filtro"
-#: gitk:8230
+#: gitk:10125
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
"Error al leer la topología de revisiones: la información sobre las ramas y "
"etiquetas precedentes y siguientes será incompleta."
-#: gitk:9216
+#: gitk:11102
msgid "Tag"
msgstr "Etiqueta"
-#: gitk:9216
+#: gitk:11106
msgid "Id"
msgstr "Id"
-#: gitk:9262
+#: gitk:11189
msgid "Gitk font chooser"
msgstr "Selector de tipografías gitk"
-#: gitk:9279
+#: gitk:11206
msgid "B"
msgstr "B"
-#: gitk:9282
+#: gitk:11209
msgid "I"
msgstr "I"
-#: gitk:9375
-msgid "Gitk preferences"
-msgstr "Preferencias de gitk"
-
-#: gitk:9376
+#: gitk:11327
msgid "Commit list display options"
msgstr "Opciones de visualización de la lista de revisiones"
-#: gitk:9379
+#: gitk:11330
msgid "Maximum graph width (lines)"
msgstr "Ancho máximo del gráfico (en líneas)"
-#: gitk:9383
-#, tcl-format
+#: gitk:11334
+#, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Ancho máximo del gráfico (en % del panel)"
-#: gitk:9388
+#: gitk:11337
msgid "Show local changes"
msgstr "Mostrar cambios locales"
-#: gitk:9393
-msgid "Auto-select SHA1"
+#: gitk:11340
+#, fuzzy
+msgid "Auto-select SHA1 (length)"
msgstr "Seleccionar automáticamente SHA1 hash"
-#: gitk:9398
+#: gitk:11344
+msgid "Hide remote refs"
+msgstr ""
+
+#: gitk:11348
msgid "Diff display options"
msgstr "Opciones de visualización de diferencias"
-#: gitk:9400
+#: gitk:11350
msgid "Tab spacing"
msgstr "Espaciado de tabulador"
-#: gitk:9404
-msgid "Display nearby tags"
+#: gitk:11353
+#, fuzzy
+msgid "Display nearby tags/heads"
msgstr "Mostrar etiquetas cercanas"
-#: gitk:9409
+#: gitk:11356
+msgid "Maximum # tags/heads to show"
+msgstr ""
+
+#: gitk:11359
msgid "Limit diffs to listed paths"
msgstr "Limitar las diferencias a las rutas seleccionadas"
-#: gitk:9414
+#: gitk:11362
msgid "Support per-file encodings"
msgstr ""
-#: gitk:9421
+#: gitk:11368 gitk:11515
msgid "External diff tool"
msgstr ""
-#: gitk:9423
+#: gitk:11369
msgid "Choose..."
msgstr ""
-#: gitk:9428
+#: gitk:11374
+#, fuzzy
+msgid "General options"
+msgstr "Generar parche"
+
+#: gitk:11377
+msgid "Use themed widgets"
+msgstr ""
+
+#: gitk:11379
+msgid "(change requires restart)"
+msgstr ""
+
+#: gitk:11381
+msgid "(currently unavailable)"
+msgstr ""
+
+#: gitk:11392
msgid "Colors: press to choose"
msgstr "Colores: pulse para seleccionar"
-#: gitk:9431
+#: gitk:11395
+msgid "Interface"
+msgstr ""
+
+#: gitk:11396
+#, fuzzy
+msgid "interface"
+msgstr "Tipografía para interfaz de usuario"
+
+#: gitk:11399
msgid "Background"
msgstr "Fondo"
-#: gitk:9435
+#: gitk:11400 gitk:11430
+#, fuzzy
+msgid "background"
+msgstr "Fondo"
+
+#: gitk:11403
msgid "Foreground"
msgstr "Primer plano"
-#: gitk:9439
+#: gitk:11404
+#, fuzzy
+msgid "foreground"
+msgstr "Primer plano"
+
+#: gitk:11407
msgid "Diff: old lines"
msgstr "Diff: líneas viejas"
-#: gitk:9444
+#: gitk:11408
+#, fuzzy
+msgid "diff old lines"
+msgstr "Diff: líneas viejas"
+
+#: gitk:11412
msgid "Diff: new lines"
msgstr "Diff: líneas nuevas"
-#: gitk:9449
+#: gitk:11413
+#, fuzzy
+msgid "diff new lines"
+msgstr "Diff: líneas nuevas"
+
+#: gitk:11417
msgid "Diff: hunk header"
msgstr "Diff: cabecera de fragmento"
-#: gitk:9455
+#: gitk:11419
+#, fuzzy
+msgid "diff hunk header"
+msgstr "Diff: cabecera de fragmento"
+
+#: gitk:11423
+msgid "Marked line bg"
+msgstr ""
+
+#: gitk:11425
+msgid "marked line background"
+msgstr ""
+
+#: gitk:11429
msgid "Select bg"
msgstr "Color de fondo de la selección"
-#: gitk:9459
+#: gitk:11438
msgid "Fonts: press to choose"
msgstr "Tipografías: pulse para elegir"
-#: gitk:9461
+#: gitk:11440
msgid "Main font"
msgstr "Tipografía principal"
-#: gitk:9462
+#: gitk:11441
msgid "Diff display font"
msgstr "Tipografía para diferencias"
-#: gitk:9463
+#: gitk:11442
msgid "User interface font"
msgstr "Tipografía para interfaz de usuario"
-#: gitk:9488
+#: gitk:11464
+msgid "Gitk preferences"
+msgstr "Preferencias de gitk"
+
+#: gitk:11473
+#, fuzzy
+msgid "General"
+msgstr "Generar"
+
+#: gitk:11474
+msgid "Colors"
+msgstr ""
+
+#: gitk:11475
+msgid "Fonts"
+msgstr ""
+
+#: gitk:11525
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: elegir color para %s"
-#: gitk:9934
-msgid ""
-"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
-" Gitk requires at least Tcl/Tk 8.4."
-msgstr ""
-"Esta versión de Tcl/Tk es demasiado antigua.\n"
-" Gitk requiere Tcl/Tk versión 8.4 o superior."
-
-#: gitk:10047
+#: gitk:12242
msgid "Cannot find a git repository here."
msgstr "No hay un repositorio git aquí."
-#: gitk:10051
-#, tcl-format
-msgid "Cannot find the git directory \"%s\"."
-msgstr "No hay directorio git \"%s\"."
-
-#: gitk:10098
+#: gitk:12289
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr ""
"Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo"
-#: gitk:10110
+#: gitk:12301
msgid "Bad arguments to gitk:"
msgstr "Argumentos incorrectos a Gitk:"
-#: gitk:10170
+#: gitk:12405
msgid "Command line"
msgstr "Línea de comandos"
+
+#~ msgid "SHA1 ID: "
+#~ msgstr "SHA1 ID: "
+
+#~ msgid "next"
+#~ msgstr "<<"
+
+#~ msgid "prev"
+#~ msgstr ">>"
+
+#~ msgid "/\t\tMove to next find hit, or redo find"
+#~ msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda"
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
+#~ msgid "CDate"
+#~ msgstr "Fecha de creación"
+
+#~ msgid "Tag/Head %s is not known"
+#~ msgstr "La etiqueta/rama %s es deconocida"
+
+#~ msgid ""
+#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
+#~ " Gitk requires at least Tcl/Tk 8.4."
+#~ msgstr ""
+#~ "Esta versión de Tcl/Tk es demasiado antigua.\n"
+#~ " Gitk requiere Tcl/Tk versión 8.4 o superior."
+
+#~ msgid "Cannot find the git directory \"%s\"."
+#~ msgstr "No hay directorio git \"%s\"."