[gitg] Updated Spanish translation

From: Jorge Gonzalez Gonzalez <jorgegonz src gnome org>
To: commits-list gnome org
Cc:
Subject: [gitg] Updated Spanish translation
Date: Sun, 7 Mar 2010 18:05:20 +0000 (UTC)
commit 22ba965c5d034e5f38e8fe82df68e39bbf11ec59
Author: Jorge GonzÃ¡lez <jorgegonz svn gnome org>
Date:   Sun Mar 7 19:05:15 2010 +0100

    Updated Spanish translation

 po/es.po |  509 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 338 insertions(+), 171 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index bb10e24..9b77da4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,29 +3,29 @@
 # Copyright (C) 2009 gitg's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gitg package.
 #
-# Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2009.
 # Chihau Chau <chihau gmail com>, 2009.
+# Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gitg.po.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gitg&component=gitg\n"
-"POT-Creation-Date: 2009-07-05 19:34+0000\n"
-"PO-Revision-Date: 2009-07-25 15:35-0400\n"
-"Last-Translator: Chihau Chau <chihau gmail com>\n"
+"POT-Creation-Date: 2010-03-01 08:03+0000\n"
+"PO-Revision-Date: 2010-03-07 19:03+0100\n"
+"Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/gitg.desktop.in.in.h:1
 msgid "Git repository browser"
 msgstr "Examinador de repositorios Git"
 
 #. Translators: this is the application name as in g_set_application_name
-#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:179
-#: ../gitg/gitg-window.c:1005 ../gitg/gitg-window.c:1018
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg.c:181
+#: ../gitg/gitg-window.c:1238 ../gitg/gitg-window.c:1251
 #: ../gitg/gitg-branch-actions.c:146 ../gitg/gitg-branch-actions.c:199
 #: ../gitg/gitg-window.ui.h:18
 msgid "gitg"
@@ -33,7 +33,7 @@ msgstr "gitg"
 
 #: ../data/gitg.schemas.in.h:1
 msgid "Column at Which Right Margin is Shown"
-msgstr ""
+msgstr "Columna en el que se muestra el margen derecho"
 
 #: ../data/gitg.schemas.in.h:2
 msgid "Filter Revisions When Searching"
@@ -46,26 +46,67 @@ msgid ""
 msgstr ""
 
 #: ../data/gitg.schemas.in.h:4
-msgid "Show Right Margin in Commit Message View"
+msgid ""
+"Setting that indicates whether to show the history in topological order."
 msgstr ""
 
 #: ../data/gitg.schemas.in.h:5
+msgid "Setting that sets the orientation layout of the main view."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:6
+msgid "Show History in Topological Order"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:7
+msgid "Show Main View in Vertical Layout"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:8
+msgid "Show Right Margin in Commit Message View"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:9
 msgid ""
 "Show a right margin indicator in the commit message view. This can be used "
 "to easily see where to break the commit message at a particular column."
 msgstr ""
 
-#: ../data/gitg.schemas.in.h:6
+#: ../data/gitg.schemas.in.h:10
 msgid ""
 "The column at which the right margin is shown if the right-margin preference "
 "is set to TRUE."
 msgstr ""
 
-#: ../data/gitg.schemas.in.h:7
+#: ../data/gitg.schemas.in.h:11
+msgid "The command to handle GITG scheme URLs"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:12
+msgid "The command to handle GITG scheme URLs."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:13
 msgid "When to Collapse Inactive Lanes"
 msgstr ""
 
-#: ../data/gitg.schemas.in.h:8
+#: ../data/gitg.schemas.in.h:14
+msgid "Whether command to handle GITG scheme URLs is enabled"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:15
+msgid "Whether command to handle GITG scheme URLs is enabled."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:16
+msgid "Whether command to handle GITG scheme URLs needs a terminal"
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:17
+msgid "Whether command to handle GITG scheme URLs needs a terminal."
+msgstr ""
+
+#: ../data/gitg.schemas.in.h:18
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -79,115 +120,129 @@ msgstr "Mostrar la versiÃ³n de la aplicaciÃ³n"
 msgid "Start gitg in commit mode"
 msgstr ""
 
-#: ../gitg/gitg.c:63
+#: ../gitg/gitg.c:54
+msgid "Select commit after loading the repository"
+msgstr ""
+
+#: ../gitg/gitg.c:64
 msgid "- git repository viewer"
 msgstr "- visor de repositorios git"
 
-#: ../gitg/gitg-commit-view.c:208 ../gitg/gitg-revision-tree-view.c:181
+#: ../gitg/gitg-commit-view.c:209 ../gitg/gitg-revision-tree-view.c:183
 msgid "Cannot display file content as text"
 msgstr "No se puede mostrar el contenido del archivo como texto"
 
-#: ../gitg/gitg-commit-view.c:1437
+#: ../gitg/gitg-commit-view.c:1482
 msgid "You must first stage some changes before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1445
+#: ../gitg/gitg-commit-view.c:1490
 msgid "Please enter a commit message before committing"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1457
+#: ../gitg/gitg-commit-view.c:1502
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1459
+#: ../gitg/gitg-commit-view.c:1504
 msgid "Something went wrong while trying to commit"
 msgstr ""
 
-#: ../gitg/gitg-commit-view.c:1618
+#: ../gitg/gitg-commit-view.c:1680
 msgid "Revert fail"
 msgstr "FallÃ³ al revertir"
 
-#: ../gitg/gitg-commit-view.c:1629
+#: ../gitg/gitg-commit-view.c:1691
 msgid "Are you sure you want to revert these changes?"
 msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
 
-#: ../gitg/gitg-commit-view.c:1632
+#: ../gitg/gitg-commit-view.c:1694
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr "Revertir los cambios es una acciÃ³n permanente y no se puede deshacer"
 
-#: ../gitg/gitg-repository.c:591
+#: ../gitg/gitg-repository.c:606
 msgid "Staged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:593
+#: ../gitg/gitg-repository.c:608
 msgid "Unstaged changes"
 msgstr ""
 
-#: ../gitg/gitg-repository.c:1148
+#: ../gitg/gitg-repository.c:1235
 msgid "Not a valid git repository"
 msgstr "No es un repositorio git vÃ¡lido"
 
-#: ../gitg/gitg-revision-tree-view.c:511
+#: ../gitg/gitg-revision-tree-view.c:513
 msgid "(Empty)"
 msgstr "(VacÃo)"
 
-#: ../gitg/gitg-window.c:420
+#: ../gitg/gitg-window.c:430
 msgid "Select branch"
 msgstr "Seleccionar rama"
 
-#: ../gitg/gitg-window.c:482
+#: ../gitg/gitg-window.c:493
 #, c-format
 msgid "Push local branch <%s> to remote branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-window.c:489
+#: ../gitg/gitg-window.c:500
 #, c-format
 msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-window.c:496
+#: ../gitg/gitg-window.c:507
 #, c-format
 msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-window.c:503
+#: ../gitg/gitg-window.c:514
 #, c-format
 msgid "Apply stash to local branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-window.c:771
-msgid "Begin loading repository"
+#: ../gitg/gitg-window.c:576
+#, c-format
+msgid "Cherry-pick revision on <%s>"
 msgstr ""
 
-#: ../gitg/gitg-window.c:780
+#: ../gitg/gitg-window.c:840
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr "%d revisiones cargadas en %.2fs"
 
-#: ../gitg/gitg-window.c:791
+#: ../gitg/gitg-window.c:860
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "Cargando %d revisiones..."
 
-#: ../gitg/gitg-window.c:800
+#: ../gitg/gitg-window.c:869
 msgid "Could not find git repository"
 msgstr "No se pudo encontrar el repositorio git"
 
-#: ../gitg/gitg-window.c:983
+#: ../gitg/gitg-window.c:1171
+#| msgid "All branches"
+msgid "Local branches"
+msgstr "Ramas locales"
+
+#: ../gitg/gitg-window.c:1192
 msgid "All branches"
 msgstr "Todas las ramas"
 
-#: ../gitg/gitg-window.c:1192
+#: ../gitg/gitg-window.c:1267
+msgid "Begin loading repository"
+msgstr "Iniciar la carga del repositorio"
+
+#: ../gitg/gitg-window.c:1451
 msgid "Open git repository"
 msgstr "Abrir repositorio git"
 
-#: ../gitg/gitg-window.c:1313
+#: ../gitg/gitg-window.c:1572
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr "gitg es un visor de repositorios git para GTk+/GNOME"
 
-#: ../gitg/gitg-window.c:1314
+#: ../gitg/gitg-window.c:1573
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -204,48 +259,77 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330,\n"
 "Boston, MA 02111-1307, USA."
 msgstr ""
+"Este programa es software libre; puede redistribuirlo y/o modificarlo bajo\n"
+"los tÃ©rminos de la Licencia PÃºblica General de GNU tal como se publica por\n"
+"la Free Software Foundation; ya sea la versiÃ³n 2 de la Licencia, o (a su\n"
+"elecciÃ³n) cualquier versiÃ³n posterior.\n"
+"\n"
+"Este programa se distribuye con la esperanza de que le sea Ãºtil, pero SIN\n"
+"NINGUNA GARANTÃ?A; sin incluso la garantÃa implÃcita de MERCANTILIDAD o\n"
+"IDONEIDAD PARA UN PROPÃ?SITO PARTICULAR. Vea la Licencia PÃºblica General GNU\n"
+"para mÃ¡s detalles.\n"
+"\n"
+"DeberÃa haber recibido una copia de la Licencia PÃºblica General de GNU "
+"junto\n"
+"con este programa, si no es asÃ, escriba a la Free Software Foundation, "
+"Inc,\n"
+"59 Temple Place - Suite 330, Boston, MA 02111-1307, EE. UU."
+
+#: ../gitg/gitg-window.c:2040
+msgid "new"
+msgstr "nueva"
 
-#: ../gitg/gitg-window.c:1775 ../gitg/gitg-window.c:1809
+#: ../gitg/gitg-window.c:2148 ../gitg/gitg-window.c:2187
 #, c-format
 msgid "New local branch <%s>"
 msgstr "Rama local nueva <%s>"
 
-#: ../gitg/gitg-window.c:1787 ../gitg/gitg-branch-actions.c:316
-#, fuzzy
+#: ../gitg/gitg-window.c:2160 ../gitg/gitg-branch-actions.c:316
 msgid "Remove remote branch"
-msgstr "Seleccionar rama"
+msgstr "Eliminar la rama remota"
 
-#: ../gitg/gitg-window.c:1791
+#: ../gitg/gitg-window.c:2165
 msgid "Checkout working copy"
-msgstr ""
+msgstr "Descargar (checkout) la copia de trabajo"
 
-#: ../gitg/gitg-window.c:1792
-#, fuzzy
+#: ../gitg/gitg-window.c:2166
 msgid "Remove local branch"
-msgstr "Seleccionar rama"
+msgstr "Eliminar la rama local"
 
-#: ../gitg/gitg-window.c:1800 ../gitg/gitg-branch-actions.c:392
+#: ../gitg/gitg-window.c:2168
+msgid "Rename local branch"
+msgstr "Renombrar la copia local"
+
+#: ../gitg/gitg-window.c:2176 ../gitg/gitg-branch-actions.c:392
 msgid "Remove stash"
 msgstr ""
 
-#: ../gitg/gitg-window.c:1805 ../gitg/gitg-branch-actions.c:457
-#: ../gitg/gitg-branch-actions.c:459
-#, fuzzy
+#: ../gitg/gitg-window.c:2182 ../gitg/gitg-branch-actions.c:454
+#: ../gitg/gitg-branch-actions.c:456
 msgid "Remove tag"
-msgstr "Revertir"
+msgstr "Eliminar etiqueta"
 
-#: ../gitg/gitg-window.c:1984
-msgid "Not all fields are correctly filled in"
-msgstr ""
-
-#: ../gitg/gitg-window.c:1986
+#: ../gitg/gitg-window.c:2483
 msgid "Please make sure to fill in both the tag name and the commit message"
 msgstr ""
 
+#: ../gitg/gitg-window.c:2487
+msgid "Please make sure to fill in the tag name"
+msgstr "AsegÃºrese de rellenar el nombre de la etiqueta"
+
+#: ../gitg/gitg-window.c:2496
+msgid "Not all fields are correctly filled in"
+msgstr "No se han rellenado correctamente todos los campos"
+
+#. Single one, pick filename
+#: ../gitg/gitg-window.c:2590
+msgid "Save format patch"
+msgstr "Guardar el formato del parche"
+
 #: ../gitg/gitg-branch-actions.c:249
 #, c-format
 msgid "Branch <%s> could not be removed"
-msgstr ""
+msgstr "No se pudo eliminar la rama <%s>"
 
 #: ../gitg/gitg-branch-actions.c:250
 msgid ""
@@ -265,21 +349,20 @@ msgstr ""
 #: ../gitg/gitg-branch-actions.c:293
 #, c-format
 msgid "Failed to remove remote branch <%s>."
-msgstr ""
+msgstr "FallÃ³ al eliminar la rama remota <%s>."
 
 #: ../gitg/gitg-branch-actions.c:314
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to remove the remote branch <%s>?"
-msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+msgstr "Â¿EstÃ¡ seguro de que quiere eliminar la rama remota <%s>?"
 
 #: ../gitg/gitg-branch-actions.c:315
 msgid "This permanently removes the remote branch."
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:9
-#, fuzzy
+#: ../gitg/gitg-branch-actions.c:332 ../gitg/gitg-menus.xml.h:11
 msgid "Remove branch"
-msgstr "Seleccionar rama"
+msgstr "Eliminar rama"
 
 #: ../gitg/gitg-branch-actions.c:390
 #, fuzzy
@@ -298,211 +381,283 @@ msgstr ""
 msgid "The stash item could not be successfully removed"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:453
-#, fuzzy, c-format
+#: ../gitg/gitg-branch-actions.c:450
+#, c-format
 msgid "Are you sure you want to remove the tag <%s>?"
-msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+msgstr "Â¿EstÃ¡ seguro de que quiere eliminar la etiqueta <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:476
+#: ../gitg/gitg-branch-actions.c:473
 #, c-format
 msgid "The tag <%s> could not be successfully removed"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:480
+#: ../gitg/gitg-branch-actions.c:477
 msgid "Failed to remove tag"
+msgstr "FallÃ³ al eliminar la etiqueta"
+
+#: ../gitg/gitg-branch-actions.c:534
+#, c-format
+msgid "Branch <%s> could not be renamed to <%s>"
+msgstr "No se pudo renombrar la rama <%s> a <%s>"
+
+#: ../gitg/gitg-branch-actions.c:535
+msgid ""
+"This usually means that a branch with that name already exists. Do you want "
+"to overwrite the branch?"
 msgstr ""
+"Esto generalmente significa que ya existe una rama con ese nombre. Â¿Quiere "
+"sobreescribir la rama?"
 
-#: ../gitg/gitg-branch-actions.c:580
-#, fuzzy
+#: ../gitg/gitg-branch-actions.c:536
+#| msgid "Filename"
+msgid "Force rename"
+msgstr "Forzar el renombrado"
+
+#: ../gitg/gitg-branch-actions.c:545
+#, c-format
+msgid "Branch <%s> could not be forcefully renamed"
+msgstr "No se pudo renombrar de forma forzada la rama <%s>"
+
+#: ../gitg/gitg-branch-actions.c:585 ../gitg/gitg-preferences.ui.h:13
+#: ../gitg/gitg-repository.ui.h:6 ../gitg/gitg-tag.ui.h:4
+msgid "Name:"
+msgstr "Nombre:"
+
+#: ../gitg/gitg-branch-actions.c:693
 msgid "Do you want to temporarily stash these changes?"
-msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:584
+#: ../gitg/gitg-branch-actions.c:697
 #, fuzzy
 msgid "Do you want to stash and reapply these changes?"
 msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
 
-#: ../gitg/gitg-branch-actions.c:589
+#: ../gitg/gitg-branch-actions.c:702
 msgid "You have uncommited changes in your current working tree"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:591
+#: ../gitg/gitg-branch-actions.c:704
 msgid "Stash changes"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:767
+#: ../gitg/gitg-branch-actions.c:880
 msgid "Failed to save current index state"
-msgstr ""
+msgstr "FallÃ³ al guardar el estado Ãndice actual"
 
-#: ../gitg/gitg-branch-actions.c:821 ../gitg/gitg-branch-actions.c:1103
-#: ../gitg/gitg-branch-actions.c:1398
+#: ../gitg/gitg-branch-actions.c:934 ../gitg/gitg-branch-actions.c:1216
+#: ../gitg/gitg-branch-actions.c:1508 ../gitg/gitg-branch-actions.c:1758
 #, c-format
 msgid "Failed to checkout local branch <%s>"
-msgstr ""
+msgstr "FallÃ³ al descargar (checkout) la rama local <%s>"
 
-#: ../gitg/gitg-branch-actions.c:859
+#: ../gitg/gitg-branch-actions.c:972
 #, c-format
 msgid "Failed to checkout remote branch <%s> to local branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:899
+#: ../gitg/gitg-branch-actions.c:1012
 #, c-format
 msgid "Failed to checkout tag <%s> to local branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:990
+#: ../gitg/gitg-branch-actions.c:1103
 #, c-format
 msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:994
+#: ../gitg/gitg-branch-actions.c:1107
 #, c-format
 msgid "Failed to merge %s branch <%s> with %s branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1002 ../gitg/gitg-branch-actions.c:1004
-#: ../gitg/gitg-branch-actions.c:1070 ../gitg/gitg-branch-actions.c:1072
-#: ../gitg/gitg-branch-actions.c:1111 ../gitg/gitg-branch-actions.c:1113
-#: ../gitg/gitg-branch-actions.c:1147 ../gitg/gitg-branch-actions.c:1149
-#: ../gitg/gitg-branch-actions.c:1194 ../gitg/gitg-branch-actions.c:1196
+#: ../gitg/gitg-branch-actions.c:1115 ../gitg/gitg-branch-actions.c:1117
+#: ../gitg/gitg-branch-actions.c:1183 ../gitg/gitg-branch-actions.c:1185
+#: ../gitg/gitg-branch-actions.c:1224 ../gitg/gitg-branch-actions.c:1226
+#: ../gitg/gitg-branch-actions.c:1260 ../gitg/gitg-branch-actions.c:1262
+#: ../gitg/gitg-branch-actions.c:1307 ../gitg/gitg-branch-actions.c:1309
 msgid "local"
 msgstr "local"
 
-#: ../gitg/gitg-branch-actions.c:1002 ../gitg/gitg-branch-actions.c:1004
-#: ../gitg/gitg-branch-actions.c:1070 ../gitg/gitg-branch-actions.c:1072
-#: ../gitg/gitg-branch-actions.c:1111 ../gitg/gitg-branch-actions.c:1113
-#: ../gitg/gitg-branch-actions.c:1147 ../gitg/gitg-branch-actions.c:1149
-#: ../gitg/gitg-branch-actions.c:1194 ../gitg/gitg-branch-actions.c:1196
+#: ../gitg/gitg-branch-actions.c:1115 ../gitg/gitg-branch-actions.c:1117
+#: ../gitg/gitg-branch-actions.c:1183 ../gitg/gitg-branch-actions.c:1185
+#: ../gitg/gitg-branch-actions.c:1224 ../gitg/gitg-branch-actions.c:1226
+#: ../gitg/gitg-branch-actions.c:1260 ../gitg/gitg-branch-actions.c:1262
+#: ../gitg/gitg-branch-actions.c:1307 ../gitg/gitg-branch-actions.c:1309
 msgid "remote"
 msgstr "remota"
 
-#: ../gitg/gitg-branch-actions.c:1021
+#: ../gitg/gitg-branch-actions.c:1134 ../gitg/gitg-branch-actions.c:1677
 msgid "The stashed changes have been stored to be reapplied manually"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1026
+#: ../gitg/gitg-branch-actions.c:1139 ../gitg/gitg-branch-actions.c:1682
 msgid "Failed to checkout previously checked out branch"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1047
+#: ../gitg/gitg-branch-actions.c:1160 ../gitg/gitg-branch-actions.c:1703
 msgid "Failed to reapply stash correctly"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1048
+#: ../gitg/gitg-branch-actions.c:1161 ../gitg/gitg-branch-actions.c:1704
 msgid ""
 "There might be unresolved conflicts in the working tree or index which you "
 "need to resolve manually"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1069
-#, fuzzy, c-format
+#: ../gitg/gitg-branch-actions.c:1182
+#, c-format
 msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
-msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
+msgstr "Â¿EstÃ¡ seguro de que quiere mezclar la rama %s <%s> en la rama %s <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:1077 ../gitg/gitg-branch-actions.c:1079
-#: ../gitg/gitg-branch-actions.c:1123 ../gitg/gitg-menus.xml.h:4
+#: ../gitg/gitg-branch-actions.c:1190 ../gitg/gitg-branch-actions.c:1192
+#: ../gitg/gitg-branch-actions.c:1236 ../gitg/gitg-menus.xml.h:6
 msgid "Merge"
 msgstr "Mezclar"
 
-#: ../gitg/gitg-branch-actions.c:1104
+#: ../gitg/gitg-branch-actions.c:1217
 msgid "The branch on which to merge could not be checked out"
-msgstr ""
+msgstr "No se pudo descargar (checkout) la rama en la que mezclar"
 
-#: ../gitg/gitg-branch-actions.c:1110
+#: ../gitg/gitg-branch-actions.c:1223
 #, c-format
 msgid "Merging %s branch <%s> onto %s branch <%s>"
 msgstr "Mezclando la rama %s <%s> en la rama %s <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1146
+#: ../gitg/gitg-branch-actions.c:1259
 #, fuzzy, c-format
 msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
 msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
 
-#: ../gitg/gitg-branch-actions.c:1154 ../gitg/gitg-branch-actions.c:1156
-#: ../gitg/gitg-branch-actions.c:1206 ../gitg/gitg-menus.xml.h:7
+#: ../gitg/gitg-branch-actions.c:1267 ../gitg/gitg-branch-actions.c:1269
+#: ../gitg/gitg-branch-actions.c:1319 ../gitg/gitg-menus.xml.h:9
 msgid "Rebase"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1179
+#: ../gitg/gitg-branch-actions.c:1292
 msgid "Unable to rebase"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1180
+#: ../gitg/gitg-branch-actions.c:1293
 msgid ""
 "There are still uncommitted changes in your working tree and you are trying "
 "to rebase a branch onto the currently checked out branch. Either remove, "
 "stash or commit your changes first and try again"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1193
+#: ../gitg/gitg-branch-actions.c:1306
 #, c-format
 msgid "Rebasing %s branch <%s> onto %s branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1232
+#: ../gitg/gitg-branch-actions.c:1345
 #, c-format
 msgid "Failed to push local branch <%s> to remote <%s>"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1233
+#: ../gitg/gitg-branch-actions.c:1346
 msgid ""
 "This usually means that the remote branch could not be fast-forwarded. Try "
 "fetching the latest changes."
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1257
+#: ../gitg/gitg-branch-actions.c:1370
 #, c-format
 msgid "Are you sure you want to push <%s> to <%s>?"
 msgstr "Â¿EstÃ¡ seguro de que quiere empujar <%s> en <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:1263 ../gitg/gitg-branch-actions.c:1265
-#: ../gitg/gitg-branch-actions.c:1286 ../gitg/gitg-branch-actions.c:1318
-#: ../gitg/gitg-branch-actions.c:1320 ../gitg/gitg-branch-actions.c:1347
+#: ../gitg/gitg-branch-actions.c:1376 ../gitg/gitg-branch-actions.c:1378
+#: ../gitg/gitg-branch-actions.c:1399 ../gitg/gitg-branch-actions.c:1432
+#: ../gitg/gitg-branch-actions.c:1434 ../gitg/gitg-branch-actions.c:1457
 msgid "Push"
 msgstr "Empujar"
 
-#: ../gitg/gitg-branch-actions.c:1278 ../gitg/gitg-branch-actions.c:1332
+#: ../gitg/gitg-branch-actions.c:1391
 #, c-format
 msgid "Pushing local branch <%s> to remote branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1312
+#: ../gitg/gitg-branch-actions.c:1426
 #, fuzzy, c-format
-msgid "Are you sure you want to push <%s> to remote <%s>?"
+msgid "Are you sure you want to push <%s> to remote <%s/%s>?"
 msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
 
-#: ../gitg/gitg-branch-actions.c:1371
+#: ../gitg/gitg-branch-actions.c:1444
+#, fuzzy, c-format
+#| msgid "Merging %s branch <%s> onto %s branch <%s>"
+msgid "Pushing local branch <%s> to remote branch <%s/%s>"
+msgstr "Mezclando la rama %s <%s> en la rama %s <%s>"
+
+#: ../gitg/gitg-branch-actions.c:1481
 #, fuzzy, c-format
 msgid "Are you sure you want to apply the stash item to local branch <%s>?"
 msgstr "Â¿EstÃ¡ seguro de que quiere revertir estos cambios?"
 
-#: ../gitg/gitg-branch-actions.c:1376 ../gitg/gitg-branch-actions.c:1378
+#: ../gitg/gitg-branch-actions.c:1486 ../gitg/gitg-branch-actions.c:1488
 msgid "Apply stash"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1417
+#: ../gitg/gitg-branch-actions.c:1527
 #, c-format
 msgid "The stash could not be applied to local branch <%s>"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1421
+#: ../gitg/gitg-branch-actions.c:1531
 msgid "Failed to apply stash"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1467
+#: ../gitg/gitg-branch-actions.c:1591
 msgid ""
 "The tag object could not be successfully created. Please make sure you have "
 "a GPG key and the key is unlocked"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1471
+#: ../gitg/gitg-branch-actions.c:1595
 msgid "The tag object could not be successfully created"
 msgstr ""
 
-#: ../gitg/gitg-branch-actions.c:1476
+#: ../gitg/gitg-branch-actions.c:1600
 msgid "Failed to create tag"
 msgstr "FallÃ³ al crear la etiqueta"
 
+#: ../gitg/gitg-branch-actions.c:1657
+#, c-format
+msgid "Failed to cherry-pick on <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1724
+#, fuzzy, c-format
+#| msgid "Are you sure you want to push <%s> to <%s>?"
+msgid "Are you sure you want to cherry-pick that revision on <%s>?"
+msgstr "Â¿EstÃ¡ seguro de que quiere empujar <%s> en <%s>?"
+
+#: ../gitg/gitg-branch-actions.c:1729 ../gitg/gitg-branch-actions.c:1731
+#: ../gitg/gitg-branch-actions.c:1779
+msgid "Cherry-pick"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1759
+msgid "The branch on which to cherry-pick could not be checked out"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1766
+#, c-format
+msgid "Cherry-picking on <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1836
+#| msgid "Failed to create tag"
+msgid "Failed to generate format-patch"
+msgstr "FallÃ³ al generar el formato de parche"
+
+#: ../gitg/gitg-branch-actions.c:1882
+#, c-format
+msgid "Generating format-patch for <%s>"
+msgstr ""
+
+#: ../gitg/gitg-branch-actions.c:1888 ../gitg/gitg-menus.xml.h:5
+msgid "Format patch"
+msgstr ""
+
 #: ../gitg/gitg-repository-dialog.c:173 ../gitg/gitg-repository.ui.h:4
 msgid "Fetch"
 msgstr "Obtener"
@@ -536,7 +691,7 @@ msgstr "Rama:"
 msgid "Co_mmit message"
 msgstr ""
 
-#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:5
+#: ../gitg/gitg-window.ui.h:6 ../gitg/gitg-preferences.ui.h:6
 msgid "Commit"
 msgstr "Efectuar"
 
@@ -608,79 +763,87 @@ msgstr ""
 msgid "<b>History</b>"
 msgstr "<b>HistÃ³rico</b>"
 
-#: ../gitg/gitg-preferences.ui.h:3 ../gitg/gitg-repository.ui.h:1
+#: ../gitg/gitg-preferences.ui.h:3
+#| msgid "<b>History</b>"
+msgid "<b>Main</b>"
+msgstr "<b>Principal</b>"
+
+#: ../gitg/gitg-preferences.ui.h:4 ../gitg/gitg-repository.ui.h:1
 msgid "<b>User</b>"
 msgstr "<b>Usuario</b>"
 
-#: ../gitg/gitg-preferences.ui.h:4
+#: ../gitg/gitg-preferences.ui.h:5
 msgid "Collapse inactive lanes"
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-repository.ui.h:2
+#: ../gitg/gitg-preferences.ui.h:7 ../gitg/gitg-repository.ui.h:2
 msgid "Configuration"
 msgstr "ConfiguraciÃ³n"
 
-#: ../gitg/gitg-preferences.ui.h:7
+#: ../gitg/gitg-preferences.ui.h:8
 msgid ""
 "Configure global git settings. This corresponds to the settings as stored in "
 "~/.gitconfig. Repository specific settings can be configured at the "
 "repository properties."
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:8
+#: ../gitg/gitg-preferences.ui.h:9
 msgid "Display right _margin"
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:3
+#: ../gitg/gitg-preferences.ui.h:10 ../gitg/gitg-repository.ui.h:3
 msgid "E-mail:"
 msgstr "Correo-e:"
 
-#: ../gitg/gitg-preferences.ui.h:10
+#: ../gitg/gitg-preferences.ui.h:11
 msgid "Early"
 msgstr "Temprano"
 
-#: ../gitg/gitg-preferences.ui.h:11
+#: ../gitg/gitg-preferences.ui.h:12
 msgid "Late"
 msgstr "Tarde"
 
-#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-repository.ui.h:6
-#: ../gitg/gitg-tag.ui.h:4
-msgid "Name:"
-msgstr "Nombre:"
-
-#: ../gitg/gitg-preferences.ui.h:13
+#: ../gitg/gitg-preferences.ui.h:14
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../gitg/gitg-preferences.ui.h:14
+#: ../gitg/gitg-preferences.ui.h:15
 msgid "Preferences that apply to the commit view"
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:15
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Preferences that apply to the revision view"
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:16
+#: ../gitg/gitg-preferences.ui.h:17
 msgid "Search filters revisions in the history view"
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:17
+#: ../gitg/gitg-preferences.ui.h:18
+msgid "Show history in topological order"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Show staged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:18
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "Show stash in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:19
+#: ../gitg/gitg-preferences.ui.h:21
 msgid "Show unstaged changes in history"
 msgstr ""
 
-#: ../gitg/gitg-preferences.ui.h:20
+#: ../gitg/gitg-preferences.ui.h:22
+msgid "Use vertical layout"
+msgstr ""
+
+#: ../gitg/gitg-preferences.ui.h:23
 msgid "View"
 msgstr "Ver"
 
-#: ../gitg/gitg-preferences.ui.h:21
+#: ../gitg/gitg-preferences.ui.h:24
 msgid "_Right margin at column:"
 msgstr ""
 
@@ -696,19 +859,11 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
-#: ../gitg/gitg-repository.ui.h:10
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../gitg/gitg-repository.ui.h:11
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
 #: ../gitg/gitg-tag.ui.h:1
 msgid "Create signed tag object"
 msgstr ""
 
-#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:3
+#: ../gitg/gitg-tag.ui.h:2 ../gitg/gitg-menus.xml.h:4
 msgid "Create tag"
 msgstr ""
 
@@ -725,31 +880,40 @@ msgstr ""
 msgid "Checkout branch"
 msgstr "Seleccionar rama"
 
-#: ../gitg/gitg-menus.xml.h:5
+#: ../gitg/gitg-menus.xml.h:3
+msgid "Cherry-pick on..."
+msgstr ""
+
+#: ../gitg/gitg-menus.xml.h:7
 msgid "Merge branch with..."
 msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:6
+#: ../gitg/gitg-menus.xml.h:8
 msgid "Push branch to..."
 msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:8
+#: ../gitg/gitg-menus.xml.h:10
 msgid "Rebase branch onto..."
 msgstr ""
 
-#: ../gitg/gitg-menus.xml.h:10
+#: ../gitg/gitg-menus.xml.h:12
+#, fuzzy
+msgid "Rename branch"
+msgstr "Seleccionar rama"
+
+#: ../gitg/gitg-menus.xml.h:13
 msgid "_Author"
 msgstr "_Autor"
 
-#: ../gitg/gitg-menus.xml.h:11
+#: ../gitg/gitg-menus.xml.h:14
 msgid "_Date"
 msgstr "_Fecha"
 
-#: ../gitg/gitg-menus.xml.h:12
+#: ../gitg/gitg-menus.xml.h:15
 msgid "_Hash"
 msgstr "_Hash"
 
-#: ../gitg/gitg-menus.xml.h:13
+#: ../gitg/gitg-menus.xml.h:16
 msgid "_Subject"
 msgstr "A_sunto"
 
@@ -782,14 +946,17 @@ msgstr "Abrir repositorio git"
 msgid "_View"
 msgstr "_Ver"
 
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
 #~ msgid "Author"
 #~ msgstr "Autor"
 
 #~ msgid "Date"
 #~ msgstr "Fecha"
 
-#~ msgid "Filename"
-#~ msgstr "Nombre de archivo"
-
 #~ msgid "Subject"
 #~ msgstr "Asunto"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]