[gitg] Updated Galician translations

[Francisco Diéguez Souto <frandieguez src gnome org>]

commit a11d1f427f56d7209557862baa518aaef398e627
Author: Fran Diéguez <fran dieguez mabishu com>
Date:   Sun Jan 9 15:59:44 2011 +0100

    Updated Galician translations

 po/gl.po |  590 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 381 insertions(+), 209 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index ead7e20..4024b87 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4,42 +4,51 @@
 # FIRST AUTHOR <EMAIL ADDRESS>, YEAR.
 #
 # Ignacio Casal Quinteiro <icq gnome org>, 2009.
-# Fran Diéguez <frandieguez ubuntu com>, 2010.
+# Fran Diéguez <frandieguez ubuntu com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gitg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-21 11:06+0200\n"
-"PO-Revision-Date: 2010-06-21 11:08+0200\n"
+"POT-Creation-Date: 2011-01-09 15:55+0100\n"
+"PO-Revision-Date: 2011-01-09 15:58+0100\n"
 "Last-Translator: Fran Diéguez <frandieguez ubuntu com>\n"
-"Language-Team: Galician <gnome g11 net>\n"
+"Language-Team: Galician <gnome-gl-list gnome org>\n"
+"Language: gl\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-branch-actions.c:168
-#: ../gitg/gitg-branch-actions.c:221 ../gitg/gitg.c:238
-#: ../gitg/gitg-window.c:1650 ../gitg/gitg-window.c:1664
-#: ../gitg/gitg-window.ui.h:11
+#: ../data/gitg.desktop.in.in.h:2 ../gitg/gitg-branch-actions.c:167
+#: ../gitg/gitg-branch-actions.c:220 ../gitg/gitg.c:237
+#: ../gitg/gitg-window.c:1670 ../gitg/gitg-window.c:1684
+#: ../gitg/gitg-window.ui.h:15
 msgid "gitg"
 msgstr "gitg"
 
-#: ../data/gitg.schemas.in.h:1
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:1
+msgid "Allow External Diff Program"
+msgstr "Permitir un programa diff externo"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
+msgid "Allow an external diff program to be used when viewing diffs in gitg."
+msgstr "Permitir usar un programa diff externo ao ver diferenzas en gitg."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
 msgid "Column at Which Right Margin is Shown"
 msgstr "Columna na cal se mostra o marxe"
 
-#: ../data/gitg.schemas.in.h:2
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:4
 msgid "Filter Revisions When Searching"
 msgstr "Filtrar as revisións ao buscar"
 
-#: ../data/gitg.schemas.in.h:3
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
 msgid ""
 "Setting that indicates when an inactive lane should be collapsed. Valid "
 "values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
@@ -47,31 +56,31 @@ msgstr ""
 "Opción que indica cando unha parte inactiva se mostra recollida. Os valores "
 "correctos son 0 a 4, onde 0 indica «pronto» e 4 indica «máis tarde»."
 
-#: ../data/gitg.schemas.in.h:4
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
 msgid ""
 "Setting that indicates whether to show the history in topological order."
 msgstr ""
 "Configuración que indica se se debe mostrar o historial en orde topolóxico."
 
-#: ../data/gitg.schemas.in.h:5
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
 msgid "Setting that sets the orientation layout of the main view."
 msgstr ""
 "Configuración que estabelece a orientación da distribución na xanela "
 "principal."
 
-#: ../data/gitg.schemas.in.h:6
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
 msgid "Show History in Topological Order"
 msgstr "Mostrar o historial por orde topolóxico"
 
-#: ../data/gitg.schemas.in.h:7
-msgid "Show Main View in Vertical Layout"
-msgstr "Mostra a vista principal en distribución vertical"
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+msgid "Show Main View in Vertical or Horizontal Layout"
+msgstr "Mostra a vista principal en distribución vertical ou horizontal"
 
-#: ../data/gitg.schemas.in.h:8
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
 msgid "Show Right Margin in Commit Message View"
 msgstr "Mostrar a marxe dereito na vista de mensaxe de «commit». "
 
-#: ../data/gitg.schemas.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
 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."
@@ -80,7 +89,7 @@ msgstr ""
 "«commit». Isto pode ser útil para ver de forma sinxela como cortar a mensaxe "
 "de remisión nunha columna específica."
 
-#: ../data/gitg.schemas.in.h:10
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
 msgid ""
 "The column at which the right margin is shown if the right-margin preference "
 "is set to TRUE."
@@ -88,41 +97,41 @@ msgstr ""
 "A columna na que se mostra a marxe dereita se a preferencia de marxe dereita "
 "está estabelecida como verdadeira."
 
-#: ../data/gitg.schemas.in.h:11
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
 msgid "The command to handle GITG scheme URLs"
 msgstr "A orde para xestionar os URL de esquema de GITG"
 
-#: ../data/gitg.schemas.in.h:12
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
 msgid "The command to handle GITG scheme URLs."
 msgstr "A orde para xestionar os URL de esquema de GITG."
 
-#: ../data/gitg.schemas.in.h:13
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
 msgid "When to Collapse Inactive Lanes"
 msgstr "Cando contraer as liñas inactivas"
 
-#: ../data/gitg.schemas.in.h:14
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
 msgid "Whether command to handle GITG scheme URLs is enabled"
 msgstr ""
 "Indica se a orde para xestionar os URL de esquema de GITG está activada"
 
-#: ../data/gitg.schemas.in.h:15
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
 msgid "Whether command to handle GITG scheme URLs is enabled."
 msgstr ""
 "Indica se a orde para xestionar os URL de esquema de GITG está activado."
 
-#: ../data/gitg.schemas.in.h:16
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
 msgid "Whether command to handle GITG scheme URLs needs a terminal"
 msgstr ""
 "Indica se a orde para xestionar os URL de esquema de GIT necesita unha "
 "terminal."
 
-#: ../data/gitg.schemas.in.h:17
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
 msgid "Whether command to handle GITG scheme URLs needs a terminal."
 msgstr ""
 "Indica se a orde para xestionar os URL de esquema de GITG necesita unha "
 "terminal."
 
-#: ../data/gitg.schemas.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
 msgid ""
 "Whether searching filters the revisions in the history view instead of "
 "jumping to the first match."
@@ -130,12 +139,12 @@ msgstr ""
 "Indica se buscar os filtros das revisións na visualización de historial no "
 "lugar de saltar á primeira aparición."
 
-#: ../gitg/gitg-branch-actions.c:271
+#: ../gitg/gitg-branch-actions.c:275
 #, c-format
 msgid "Branch <%s> could not be removed"
 msgstr "Non se puido eliminar a rama <%s>"
 
-#: ../gitg/gitg-branch-actions.c:272
+#: ../gitg/gitg-branch-actions.c:276
 msgid ""
 "This usually means that the branch is not fully merged in HEAD. Do you want "
 "to forcefully remove the branch?"
@@ -143,82 +152,82 @@ msgstr ""
 "Isto xeralmente significa que a rama non está completamente misturada na "
 "rama principal («HEAD»). Quere forzar a liminación da rama?"
 
-#: ../gitg/gitg-branch-actions.c:273
+#: ../gitg/gitg-branch-actions.c:277
 msgid "Force remove"
 msgstr "Forzar a eliminación"
 
-#: ../gitg/gitg-branch-actions.c:282
+#: ../gitg/gitg-branch-actions.c:291
 #, c-format
 msgid "Branch <%s> could not be forcefully removed"
 msgstr "Non foi posíbel eliminar a rama <%s> á forza"
 
-#: ../gitg/gitg-branch-actions.c:315
+#: ../gitg/gitg-branch-actions.c:324
 #, c-format
 msgid "Failed to remove remote branch <%s>."
 msgstr "Produciuse un fallo ao eliminar a rama local <%s>"
 
-#: ../gitg/gitg-branch-actions.c:336
+#: ../gitg/gitg-branch-actions.c:345
 #, c-format
 msgid "Are you sure you want to remove the remote branch <%s>?"
 msgstr "Está seguro de que quere eliminar a rama remota <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:337
+#: ../gitg/gitg-branch-actions.c:346
 msgid "This permanently removes the remote branch."
 msgstr "Isto elimina de forma permanente a rama remota."
 
-#: ../gitg/gitg-branch-actions.c:338 ../gitg/gitg-window.c:2889
+#: ../gitg/gitg-branch-actions.c:347 ../gitg/gitg-window.c:2909
 msgid "Remove remote branch"
 msgstr "Elimnar a rama remota"
 
-#: ../gitg/gitg-branch-actions.c:353 ../gitg/gitg-menus.xml.h:11
+#: ../gitg/gitg-branch-actions.c:362 ../gitg/gitg-menus.xml.h:12
 msgid "Remove branch"
 msgstr "Eliminar a rama"
 
-#: ../gitg/gitg-branch-actions.c:411
+#: ../gitg/gitg-branch-actions.c:421
 msgid "Are you sure you want to remove this stash item?"
 msgstr "Está seguro de que sacar este elemento da reserva?"
 
-#: ../gitg/gitg-branch-actions.c:412
+#: ../gitg/gitg-branch-actions.c:422
 msgid "This permanently removes the stash item"
 msgstr "Isto sacará de forma permanente o elemento da reserva"
 
-#: ../gitg/gitg-branch-actions.c:413 ../gitg/gitg-window.c:2905
+#: ../gitg/gitg-branch-actions.c:423 ../gitg/gitg-window.c:2925
 msgid "Remove stash"
 msgstr "Eliminar reserva"
 
-#: ../gitg/gitg-branch-actions.c:439
+#: ../gitg/gitg-branch-actions.c:449
 msgid "Failed to remove stash"
 msgstr "Produciuse un fallo ao sacar da reserva"
 
-#: ../gitg/gitg-branch-actions.c:440
+#: ../gitg/gitg-branch-actions.c:450
 msgid "The stash item could not be successfully removed"
 msgstr "Non foi posíbel sacar o elemento da reserva de forma correcta"
 
-#: ../gitg/gitg-branch-actions.c:471
+#: ../gitg/gitg-branch-actions.c:481
 #, c-format
 msgid "Are you sure you want to remove the tag <%s>?"
 msgstr "Está seguro de que quere eliminar a etiqueta <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:475 ../gitg/gitg-branch-actions.c:477
-#: ../gitg/gitg-window.c:2911
+#: ../gitg/gitg-branch-actions.c:485 ../gitg/gitg-branch-actions.c:487
+#: ../gitg/gitg-window.c:2931
 msgid "Remove tag"
 msgstr "Eliminar etiqueta"
 
-#: ../gitg/gitg-branch-actions.c:494
+#: ../gitg/gitg-branch-actions.c:504
 #, c-format
 msgid "The tag <%s> could not be successfully removed"
 msgstr "Non foi posíbel quitar de forma satisfactoria a etiqueta <%s>"
 
-#: ../gitg/gitg-branch-actions.c:498
+#: ../gitg/gitg-branch-actions.c:508
 msgid "Failed to remove tag"
 msgstr "Produciuse un fallo ao eliminar a etiqueta"
 
-#: ../gitg/gitg-branch-actions.c:555
+#: ../gitg/gitg-branch-actions.c:571
 #, c-format
 msgid "Branch <%s> could not be renamed to <%s>"
 msgstr "Non foi posíbel renomear a rama <%s> a <%s>"
 
-#: ../gitg/gitg-branch-actions.c:556
+#: ../gitg/gitg-branch-actions.c:572
 msgid ""
 "This usually means that a branch with that name already exists. Do you want "
 "to overwrite the branch?"
@@ -226,100 +235,101 @@ msgstr ""
 "Isto xeralmente significa que xa existe unha rama con ese nome. Quere "
 "sobrescribir a rama?"
 
-#: ../gitg/gitg-branch-actions.c:557
+#: ../gitg/gitg-branch-actions.c:573
 msgid "Force rename"
 msgstr "Forzar o renomeado"
 
-#: ../gitg/gitg-branch-actions.c:566
+#: ../gitg/gitg-branch-actions.c:588
 #, c-format
 msgid "Branch <%s> could not be forcefully renamed"
 msgstr "Non foi posíbel renomear de forma forzada a rama <%s>"
 
-#: ../gitg/gitg-branch-actions.c:606 ../gitg/gitg-preferences.ui.h:14
-#: ../gitg/gitg-repository.ui.h:6 ../gitg/gitg-tag.ui.h:4
+#: ../gitg/gitg-branch-actions.c:632 ../gitg/gitg-new-branch.ui.h:2
+#: ../gitg/gitg-preferences.ui.h:17 ../gitg/gitg-repository.ui.h:6
+#: ../gitg/gitg-tag.ui.h:4
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../gitg/gitg-branch-actions.c:713
+#: ../gitg/gitg-branch-actions.c:754
 msgid "Do you want to temporarily stash these changes?"
 msgstr "Ten certeza que quere reservar temporalmente os cambios?"
 
-#: ../gitg/gitg-branch-actions.c:717
+#: ../gitg/gitg-branch-actions.c:758
 msgid "Do you want to stash and reapply these changes?"
 msgstr "Ten certeza que quere reservar e volver a aplicar estes cambios?"
 
-#: ../gitg/gitg-branch-actions.c:722
+#: ../gitg/gitg-branch-actions.c:763
 msgid "You have uncommited changes in your current working tree"
 msgstr "Ten cambios sen efectuar na súa árbore de traballo actual"
 
-#: ../gitg/gitg-branch-actions.c:724
+#: ../gitg/gitg-branch-actions.c:765
 msgid "Stash changes"
 msgstr "Reservar os cambios"
 
-#: ../gitg/gitg-branch-actions.c:907
+#: ../gitg/gitg-branch-actions.c:1020
 msgid "Failed to save current index state"
 msgstr "Produciuse un fallo ao gardar o estado actual do índice"
 
-#: ../gitg/gitg-branch-actions.c:961 ../gitg/gitg-branch-actions.c:1242
-#: ../gitg/gitg-branch-actions.c:1533 ../gitg/gitg-branch-actions.c:1781
+#: ../gitg/gitg-branch-actions.c:1071 ../gitg/gitg-branch-actions.c:1367
+#: ../gitg/gitg-branch-actions.c:1658 ../gitg/gitg-branch-actions.c:1955
 #, c-format
 msgid "Failed to checkout local branch <%s>"
 msgstr "Produciuse un fallo ao obter («checkout») a rama local <%s>"
 
-#: ../gitg/gitg-branch-actions.c:999
+#: ../gitg/gitg-branch-actions.c:1109
 #, c-format
 msgid "Failed to checkout remote branch <%s> to local branch <%s>"
 msgstr ""
-"Produciuse un fallo ao obter («checkout») a rama remota <%s> na rama local <%"
-"s>"
+"Produciuse un fallo ao obter («checkout») a rama remota <%s> na rama local <"
+"%s>"
 
-#: ../gitg/gitg-branch-actions.c:1038
+#: ../gitg/gitg-branch-actions.c:1148
 #, c-format
 msgid "Failed to checkout tag <%s> to local branch <%s>"
 msgstr ""
 "Produciuse un fallo ao obter («checkout») na etiqueta <%s> na rama local <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1129
+#: ../gitg/gitg-branch-actions.c:1239
 #, c-format
 msgid "Failed to rebase %s branch <%s> onto %s branch <%s>"
 msgstr "Produciuse un fallo ao rebasar a rama %s <%s> na rama %s <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1133
+#: ../gitg/gitg-branch-actions.c:1243
 #, c-format
 msgid "Failed to merge %s branch <%s> with %s branch <%s>"
 msgstr "Produciuse un fallo ao misturar a rama %s <%s> coa rama %s <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1141 ../gitg/gitg-branch-actions.c:1143
-#: ../gitg/gitg-branch-actions.c:1209 ../gitg/gitg-branch-actions.c:1211
-#: ../gitg/gitg-branch-actions.c:1250 ../gitg/gitg-branch-actions.c:1252
-#: ../gitg/gitg-branch-actions.c:1286 ../gitg/gitg-branch-actions.c:1288
-#: ../gitg/gitg-branch-actions.c:1333 ../gitg/gitg-branch-actions.c:1335
+#: ../gitg/gitg-branch-actions.c:1251 ../gitg/gitg-branch-actions.c:1253
+#: ../gitg/gitg-branch-actions.c:1330 ../gitg/gitg-branch-actions.c:1332
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+#: ../gitg/gitg-branch-actions.c:1411 ../gitg/gitg-branch-actions.c:1413
+#: ../gitg/gitg-branch-actions.c:1458 ../gitg/gitg-branch-actions.c:1460
 msgid "local"
 msgstr "local"
 
-#: ../gitg/gitg-branch-actions.c:1141 ../gitg/gitg-branch-actions.c:1143
-#: ../gitg/gitg-branch-actions.c:1209 ../gitg/gitg-branch-actions.c:1211
-#: ../gitg/gitg-branch-actions.c:1250 ../gitg/gitg-branch-actions.c:1252
-#: ../gitg/gitg-branch-actions.c:1286 ../gitg/gitg-branch-actions.c:1288
-#: ../gitg/gitg-branch-actions.c:1333 ../gitg/gitg-branch-actions.c:1335
+#: ../gitg/gitg-branch-actions.c:1251 ../gitg/gitg-branch-actions.c:1253
+#: ../gitg/gitg-branch-actions.c:1330 ../gitg/gitg-branch-actions.c:1332
+#: ../gitg/gitg-branch-actions.c:1375 ../gitg/gitg-branch-actions.c:1377
+#: ../gitg/gitg-branch-actions.c:1411 ../gitg/gitg-branch-actions.c:1413
+#: ../gitg/gitg-branch-actions.c:1458 ../gitg/gitg-branch-actions.c:1460
 msgid "remote"
 msgstr "remota"
 
-#: ../gitg/gitg-branch-actions.c:1160 ../gitg/gitg-branch-actions.c:1700
+#: ../gitg/gitg-branch-actions.c:1276 ../gitg/gitg-branch-actions.c:1869
 msgid "The stashed changes have been stored to be reapplied manually"
 msgstr ""
 "Almacenáronse os cambios reservados para volvelos a aplicar manualmente"
 
-#: ../gitg/gitg-branch-actions.c:1165 ../gitg/gitg-branch-actions.c:1705
+#: ../gitg/gitg-branch-actions.c:1281 ../gitg/gitg-branch-actions.c:1874
 msgid "Failed to checkout previously checked out branch"
 msgstr ""
 "Produciuse un fallo ao obter («checkout») a rama anteriormente descargada."
 
-#: ../gitg/gitg-branch-actions.c:1186 ../gitg/gitg-branch-actions.c:1726
+#: ../gitg/gitg-branch-actions.c:1307 ../gitg/gitg-branch-actions.c:1900
 msgid "Failed to reapply stash correctly"
 msgstr "Produciuse un fallo ao aplicar a reserva correctamente"
 
-#: ../gitg/gitg-branch-actions.c:1187 ../gitg/gitg-branch-actions.c:1727
+#: ../gitg/gitg-branch-actions.c:1308 ../gitg/gitg-branch-actions.c:1901
 msgid ""
 "There might be unresolved conflicts in the working tree or index which you "
 "need to resolve manually"
@@ -327,40 +337,40 @@ msgstr ""
 "Poden existir conflitos sen resolver na árbore de traballo ou índice que "
 "debe resolver de forma manual"
 
-#: ../gitg/gitg-branch-actions.c:1208
+#: ../gitg/gitg-branch-actions.c:1329
 #, c-format
 msgid "Are you sure you want to merge %s branch <%s> onto %s branch <%s>?"
 msgstr "Ten certeza que quere misturar a rama %s <%s> na rama %s <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:1216 ../gitg/gitg-branch-actions.c:1218
-#: ../gitg/gitg-branch-actions.c:1262 ../gitg/gitg-menus.xml.h:6
+#: ../gitg/gitg-branch-actions.c:1337 ../gitg/gitg-branch-actions.c:1339
+#: ../gitg/gitg-branch-actions.c:1387 ../gitg/gitg-menus.xml.h:7
 msgid "Merge"
 msgstr "Misturar"
 
-#: ../gitg/gitg-branch-actions.c:1243
+#: ../gitg/gitg-branch-actions.c:1368
 msgid "The branch on which to merge could not be checked out"
 msgstr "Non foi posíbel obter («checkout») a rama na que misturar"
 
-#: ../gitg/gitg-branch-actions.c:1249
+#: ../gitg/gitg-branch-actions.c:1374
 #, c-format
 msgid "Merging %s branch <%s> onto %s branch <%s>"
 msgstr "Misturando a rama %s <%s> na rama %s <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1285
+#: ../gitg/gitg-branch-actions.c:1410
 #, c-format
 msgid "Are you sure you want to rebase %s branch <%s> onto %s branch <%s>?"
 msgstr "Ten certeza que quere rebasar a rama %s <%s> na rama %s <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:1293 ../gitg/gitg-branch-actions.c:1295
-#: ../gitg/gitg-branch-actions.c:1345 ../gitg/gitg-menus.xml.h:9
+#: ../gitg/gitg-branch-actions.c:1418 ../gitg/gitg-branch-actions.c:1420
+#: ../gitg/gitg-branch-actions.c:1470 ../gitg/gitg-menus.xml.h:10
 msgid "Rebase"
 msgstr "Rebasar"
 
-#: ../gitg/gitg-branch-actions.c:1318
+#: ../gitg/gitg-branch-actions.c:1443
 msgid "Unable to rebase"
 msgstr "Non foi posíbel rebasar"
 
-#: ../gitg/gitg-branch-actions.c:1319
+#: ../gitg/gitg-branch-actions.c:1444
 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, "
@@ -370,17 +380,17 @@ msgstr ""
 "rebasar unha rama na súa rama actual obtida. Tente eliminar, reservar ou "
 "remitir os cambios primeiro e ténteo de novo."
 
-#: ../gitg/gitg-branch-actions.c:1332
+#: ../gitg/gitg-branch-actions.c:1457
 #, c-format
 msgid "Rebasing %s branch <%s> onto %s branch <%s>"
 msgstr "Rebasando a rama %s <%s> na rama %s <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1371
+#: ../gitg/gitg-branch-actions.c:1496
 #, c-format
 msgid "Failed to push local branch <%s> to remote <%s>"
 msgstr "Produciuse un fallo ao empurrar a rama local <%s> á remota <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1372
+#: ../gitg/gitg-branch-actions.c:1497
 msgid ""
 "This usually means that the remote branch could not be fast-forwarded. Try "
 "fetching the latest changes."
@@ -388,51 +398,59 @@ msgstr ""
 "Isto normalmente significa que a rama remota puido ser resolta polo método "
 "rápido «fast-forwarded». Tente a obter os últimos cambios."
 
-#: ../gitg/gitg-branch-actions.c:1396
+#: ../gitg/gitg-branch-actions.c:1521
 #, c-format
 msgid "Are you sure you want to push <%s> to <%s>?"
 msgstr "Ten certeza que quere empurrar <%s> en <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:1402 ../gitg/gitg-branch-actions.c:1404
-#: ../gitg/gitg-branch-actions.c:1425 ../gitg/gitg-branch-actions.c:1457
-#: ../gitg/gitg-branch-actions.c:1459 ../gitg/gitg-branch-actions.c:1482
+#: ../gitg/gitg-branch-actions.c:1527 ../gitg/gitg-branch-actions.c:1529
+#: ../gitg/gitg-branch-actions.c:1550 ../gitg/gitg-branch-actions.c:1582
+#: ../gitg/gitg-branch-actions.c:1584 ../gitg/gitg-branch-actions.c:1607
 msgid "Push"
 msgstr "Empurrar"
 
-#: ../gitg/gitg-branch-actions.c:1417
+#: ../gitg/gitg-branch-actions.c:1542
 #, c-format
 msgid "Pushing local branch <%s> to remote branch <%s>"
 msgstr "Empurrando a rama local <%s> na rama remota <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1451
+#: ../gitg/gitg-branch-actions.c:1576
 #, c-format
 msgid "Are you sure you want to push <%s> to remote <%s/%s>?"
 msgstr "Ten certeza que quere empurrar <%s> na rama remota <%s/%s>?"
 
-#: ../gitg/gitg-branch-actions.c:1469
+#: ../gitg/gitg-branch-actions.c:1594
 #, c-format
 msgid "Pushing local branch <%s> to remote branch <%s/%s>"
 msgstr "Empurrando a rama local <%s> á rama remota <%s/%s>"
 
-#: ../gitg/gitg-branch-actions.c:1506
+#: ../gitg/gitg-branch-actions.c:1631
 #, c-format
 msgid "Are you sure you want to apply the stash item to local branch <%s>?"
 msgstr "Ten certeza que quere aplicar o elemento reservado á rama local <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:1511 ../gitg/gitg-branch-actions.c:1513
+#: ../gitg/gitg-branch-actions.c:1636 ../gitg/gitg-branch-actions.c:1638
 msgid "Apply stash"
 msgstr "Aplicar a reserva"
 
-#: ../gitg/gitg-branch-actions.c:1552
+#: ../gitg/gitg-branch-actions.c:1677
 #, c-format
 msgid "The stash could not be applied to local branch <%s>"
 msgstr "Non foi posíbel aplicar a reserva á rama local <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1556
+#: ../gitg/gitg-branch-actions.c:1681
 msgid "Failed to apply stash"
 msgstr "Produciuse un fallo ao aplicar a reserva"
 
-#: ../gitg/gitg-branch-actions.c:1616
+#: ../gitg/gitg-branch-actions.c:1724
+msgid "The branch could not be successfully created"
+msgstr "Non foi posíbel crear correctamente a rama"
+
+#: ../gitg/gitg-branch-actions.c:1728
+msgid "Failed to create a branch"
+msgstr "Produciuse un fallo ao crear unha rama"
+
+#: ../gitg/gitg-branch-actions.c:1780
 msgid ""
 "The tag object could not be successfully created. Please make sure you have "
 "a GPG key and the key is unlocked"
@@ -440,91 +458,91 @@ msgstr ""
 "Non foi posíbel crear correctamente o obxecto da etiqueta. Asegúrese que ten "
 "unha chave GPG e a chave non está bloqueada."
 
-#: ../gitg/gitg-branch-actions.c:1620
+#: ../gitg/gitg-branch-actions.c:1784
 msgid "The tag object could not be successfully created"
 msgstr "Non foi posíbel quitar de forma satisfactoria o obxecto de etiqueta"
 
-#: ../gitg/gitg-branch-actions.c:1625
+#: ../gitg/gitg-branch-actions.c:1789
 msgid "Failed to create tag"
 msgstr "Produciuse un fallo ao crear a etiqueta"
 
-#: ../gitg/gitg-branch-actions.c:1680
+#: ../gitg/gitg-branch-actions.c:1844
 #, c-format
 msgid "Failed to cherry-pick on <%s>"
 msgstr "Produciuse un fallo ao aplicar os cambios («cherry-pick») <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1747
+#: ../gitg/gitg-branch-actions.c:1921
 #, c-format
 msgid "Are you sure you want to cherry-pick that revision on <%s>?"
 msgstr ""
 "Ten certeza que quere aplicar os cambios («cherry-pick») á revisión en <%s>?"
 
-#: ../gitg/gitg-branch-actions.c:1752 ../gitg/gitg-branch-actions.c:1754
-#: ../gitg/gitg-branch-actions.c:1802
+#: ../gitg/gitg-branch-actions.c:1926 ../gitg/gitg-branch-actions.c:1928
+#: ../gitg/gitg-branch-actions.c:1976
 msgid "Cherry-pick"
 msgstr "Aplicar os cambios («cherry-pick»)"
 
-#: ../gitg/gitg-branch-actions.c:1782
+#: ../gitg/gitg-branch-actions.c:1956
 msgid "The branch on which to cherry-pick could not be checked out"
 msgstr ""
 "Non foi posíbel obter a rama sobre a que aplicar os cambios («cherry-pick»)"
 
-#: ../gitg/gitg-branch-actions.c:1789
+#: ../gitg/gitg-branch-actions.c:1963
 #, c-format
 msgid "Cherry-picking on <%s>"
 msgstr "Aplicando os cambios («cherry-picking») en %s"
 
-#: ../gitg/gitg-branch-actions.c:1857
+#: ../gitg/gitg-branch-actions.c:2031
 msgid "Failed to generate format-patch"
 msgstr "Produciuse un fallo ao xerar o formato do parche"
 
-#: ../gitg/gitg-branch-actions.c:1905
+#: ../gitg/gitg-branch-actions.c:2081
 #, c-format
 msgid "Generating format-patch for <%s>"
 msgstr "Xerar o formato do parche para <%s>"
 
-#: ../gitg/gitg-branch-actions.c:1913 ../gitg/gitg-menus.xml.h:5
+#: ../gitg/gitg-branch-actions.c:2089 ../gitg/gitg-menus.xml.h:6
 msgid "Format patch"
 msgstr "Formato do parche"
 
-#: ../gitg/gitg.c:54
+#: ../gitg/gitg.c:53
 msgid "Show the application's version"
 msgstr "Mostrar a versión do aplicativo"
 
-#: ../gitg/gitg.c:55
+#: ../gitg/gitg.c:54
 msgid "Start gitg in commit mode"
 msgstr "Iniciar gitg en modo commit"
 
-#: ../gitg/gitg.c:56
+#: ../gitg/gitg.c:55
 msgid "Select commit after loading the repository"
 msgstr "Seleccionar o «commit» despois de cargar o repositorio"
 
-#: ../gitg/gitg.c:66
+#: ../gitg/gitg.c:65
 msgid "- git repository viewer"
 msgstr "- visor de repositorios git"
 
-#: ../gitg/gitg-commit-view.c:222 ../gitg/gitg-revision-files-panel.c:256
+#: ../gitg/gitg-commit-view.c:224 ../gitg/gitg-revision-files-panel.c:256
 msgid "Cannot display file content as text"
 msgstr "Non se pode mostrar o contido do ficheiro como texto"
 
-#: ../gitg/gitg-commit-view.c:1156
+#: ../gitg/gitg-commit-view.c:1176
 msgid "unstage"
 msgstr "Non preseleccionar"
 
-#: ../gitg/gitg-commit-view.c:1157
+#: ../gitg/gitg-commit-view.c:1177
 msgid "stage"
 msgstr "preseleccionar"
 
-#: ../gitg/gitg-commit-view.c:1991
+#: ../gitg/gitg-commit-view.c:2031
 msgid "You must first stage some changes before committing"
 msgstr ""
 "Primeiro debe preseleccionar algúns cambios antes de realizar o «commit»"
 
-#: ../gitg/gitg-commit-view.c:1999
+#: ../gitg/gitg-commit-view.c:2039
 msgid "Please enter a commit message before committing"
 msgstr "Introduza unha mensaxe de commit antes de facer commit"
 
-#: ../gitg/gitg-commit-view.c:2011
+#: ../gitg/gitg-commit-view.c:2051
 msgid ""
 "Your user name or email could not be retrieved for use in the sign off "
 "message"
@@ -532,36 +550,36 @@ msgstr ""
 "Non foi posíbel obter o seu nome de usuario ou o contrasinal para usalo na "
 "mensaxe de asinado."
 
-#: ../gitg/gitg-commit-view.c:2013
+#: ../gitg/gitg-commit-view.c:2053
 msgid "Something went wrong while trying to commit"
 msgstr "Algo foi mal ao tentar remitir"
 
-#: ../gitg/gitg-commit-view.c:2197
+#: ../gitg/gitg-commit-view.c:2246
 msgid "Revert fail"
 msgstr "Fallou ao reverter"
 
-#: ../gitg/gitg-commit-view.c:2208
+#: ../gitg/gitg-commit-view.c:2257
 msgid "Are you sure you want to revert these changes?"
 msgstr "Está seguro de que quere reverter os cambios?"
 
-#: ../gitg/gitg-commit-view.c:2211
+#: ../gitg/gitg-commit-view.c:2260
 msgid "Reverting changes is permanent and cannot be undone"
 msgstr "Reverter os cambios é permanente e non é posíbel desfacelo"
 
-#: ../gitg/gitg-repository-dialog.c:244 ../gitg/gitg-repository.ui.h:4
+#: ../gitg/gitg-repository-dialog.c:245 ../gitg/gitg-repository.ui.h:4
 msgid "Fetch"
 msgstr "Obter"
 
-#: ../gitg/gitg-repository-dialog.c:249
+#: ../gitg/gitg-repository-dialog.c:250
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../gitg/gitg-repository-dialog.c:633 ../gitg/gitg-repository.ui.h:7
+#: ../gitg/gitg-repository-dialog.c:634 ../gitg/gitg-repository.ui.h:7
 #: ../gitg/gitg-tag.ui.h:5
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../gitg/gitg-revision-changes-panel.c:278
+#: ../gitg/gitg-revision-changes-panel.c:270
 msgid "Changes"
 msgstr "Cambios"
 
@@ -577,66 +595,66 @@ msgstr "Ficheiros"
 msgid "(Empty)"
 msgstr "(Baleiro)"
 
-#: ../gitg/gitg-window.c:648
+#: ../gitg/gitg-window.c:682
 msgid "Select branch"
 msgstr "Seleccionar rama"
 
-#: ../gitg/gitg-window.c:717
+#: ../gitg/gitg-window.c:751
 #, c-format
 msgid "Push local branch <%s> to remote branch <%s>"
 msgstr "Empurrar a rama local <%s> á rama remota <%s>"
 
-#: ../gitg/gitg-window.c:724
+#: ../gitg/gitg-window.c:758
 #, c-format
 msgid "Merge/rebase local branch <%s> with/on local branch <%s>"
 msgstr "Misturar/rebasar a rama local <%s> coa/na rama local <%s>"
 
-#: ../gitg/gitg-window.c:731
+#: ../gitg/gitg-window.c:765
 #, c-format
 msgid "Merge/rebase local branch <%s> with/on remote branch <%s>"
 msgstr "Misturar/rebasar a rama local <%s> coa/na rama remota <%s>"
 
-#: ../gitg/gitg-window.c:738
+#: ../gitg/gitg-window.c:772
 #, c-format
 msgid "Apply stash to local branch <%s>"
 msgstr "Aplicar a reserva á rama local <%s>"
 
-#: ../gitg/gitg-window.c:818
+#: ../gitg/gitg-window.c:852
 #, c-format
 msgid "Cherry-pick revision on <%s>"
 msgstr "Aplicar os cambios («cherry-pick») da revisión en <%s>"
 
-#: ../gitg/gitg-window.c:1200
+#: ../gitg/gitg-window.c:1219
 #, c-format
 msgid "Loaded %d revisions in %.2fs"
 msgstr "Cargadas %d revisións en %.2fs"
 
-#: ../gitg/gitg-window.c:1222
+#: ../gitg/gitg-window.c:1241
 #, c-format
 msgid "Loading %d revisions..."
 msgstr "Cargando %d revisións..."
 
-#: ../gitg/gitg-window.c:1583
+#: ../gitg/gitg-window.c:1603
 msgid "Local branches"
 msgstr "Ramas locais"
 
-#: ../gitg/gitg-window.c:1604
+#: ../gitg/gitg-window.c:1624
 msgid "All branches"
 msgstr "Todas as ramas"
 
-#: ../gitg/gitg-window.c:1682
+#: ../gitg/gitg-window.c:1702
 msgid "Begin loading repository"
 msgstr "Comezar cargando repositorio"
 
-#: ../gitg/gitg-window.c:2124
+#: ../gitg/gitg-window.c:2144
 msgid "Open git repository"
 msgstr "Abrir repositorio git"
 
-#: ../gitg/gitg-window.c:2222
+#: ../gitg/gitg-window.c:2242
 msgid "gitg is a git repository viewer for gtk+/GNOME"
 msgstr "gitg é un visor de repositorios git para gtk+/Gnome"
 
-#: ../gitg/gitg-window.c:2223
+#: ../gitg/gitg-window.c:2243
 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"
@@ -668,57 +686,191 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place, Suite 330,\n"
 "Boston, MA 02111-1307, USA."
 
-#: ../gitg/gitg-window.c:2548
+#: ../gitg/gitg-window.c:2568
 msgid "new"
 msgstr "nova"
 
-#: ../gitg/gitg-window.c:2878 ../gitg/gitg-window.c:2916
+#: ../gitg/gitg-window.c:2898 ../gitg/gitg-window.c:2936
 #, c-format
 msgid "New local branch <%s>"
 msgstr "Nova rama local <%s>"
 
-#: ../gitg/gitg-window.c:2894
+#: ../gitg/gitg-window.c:2914
 msgid "Checkout working copy"
 msgstr "Obter a copia de traballo"
 
-#: ../gitg/gitg-window.c:2895
+#: ../gitg/gitg-window.c:2915
 msgid "Remove local branch"
 msgstr "Eliminar a rama local"
 
-#: ../gitg/gitg-window.c:2897
+#: ../gitg/gitg-window.c:2917
 msgid "Rename local branch"
 msgstr "Renomear a rama local"
 
-#: ../gitg/gitg-window.c:3232
+#: ../gitg/gitg-window.c:3283 ../gitg/gitg-window.c:3339
+msgid "Not all fields are correctly filled in"
+msgstr "Non se completaron todos os campos de forma correcta"
+
+#: ../gitg/gitg-window.c:3287
+msgid "Please make sure to fill in the branch name"
+msgstr "Asegúrese de completar o nome da etiqueta"
+
+#: ../gitg/gitg-window.c:3326
 msgid "Please make sure to fill in both the tag name and the commit message"
 msgstr ""
 "Asegúrese de rechear tanto o nome da etiqueta como a mensaxe de «commit»"
 
-#: ../gitg/gitg-window.c:3236
+#: ../gitg/gitg-window.c:3330
 msgid "Please make sure to fill in the tag name"
 msgstr "Asegúrse de rechear o nome da etiqueta"
 
-#: ../gitg/gitg-window.c:3245
-msgid "Not all fields are correctly filled in"
-msgstr "Non se completaron todos os campos de forma correcta"
+#: ../gitg/gitg-window.c:3407
+msgid "Format patch failed for unknown reason"
+msgstr ""
+"Produciuse un fallo no formateo do parche debido a unha razón descoñecida"
+
+#: ../gitg/gitg-window.c:3411
+msgid "Please check if you have the right permissions to write the file"
+msgstr "Comprobe se ten permisos correctos para escribir o ficheiro"
 
 #. Single one, pick filename
-#: ../gitg/gitg-window.c:3340
+#: ../gitg/gitg-window.c:3452
 msgid "Save format patch"
 msgstr "Gardar o formato do parche"
 
-#: ../libgitg/gitg-repository.c:883
+#: ../libgitg/gitg-encodings.c:144 ../libgitg/gitg-encodings.c:186
+#: ../libgitg/gitg-encodings.c:188 ../libgitg/gitg-encodings.c:190
+#: ../libgitg/gitg-encodings.c:192 ../libgitg/gitg-encodings.c:194
+#: ../libgitg/gitg-encodings.c:196 ../libgitg/gitg-encodings.c:198
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libgitg/gitg-encodings.c:157 ../libgitg/gitg-encodings.c:181
+#: ../libgitg/gitg-encodings.c:231 ../libgitg/gitg-encodings.c:274
+msgid "Western"
+msgstr "Occidental"
+
+#: ../libgitg/gitg-encodings.c:159 ../libgitg/gitg-encodings.c:233
+#: ../libgitg/gitg-encodings.c:270
+msgid "Central European"
+msgstr "Centroeuropeo"
+
+#: ../libgitg/gitg-encodings.c:161
+msgid "South European"
+msgstr "Europa do Sur"
+
+#: ../libgitg/gitg-encodings.c:163 ../libgitg/gitg-encodings.c:177
+#: ../libgitg/gitg-encodings.c:284
+msgid "Baltic"
+msgstr "BaÌ?ltico"
+
+#: ../libgitg/gitg-encodings.c:165 ../libgitg/gitg-encodings.c:235
+#: ../libgitg/gitg-encodings.c:248 ../libgitg/gitg-encodings.c:252
+#: ../libgitg/gitg-encodings.c:254 ../libgitg/gitg-encodings.c:272
+msgid "Cyrillic"
+msgstr "CiriÌ?lico"
+
+#: ../libgitg/gitg-encodings.c:167 ../libgitg/gitg-encodings.c:241
+#: ../libgitg/gitg-encodings.c:282
+msgid "Arabic"
+msgstr "AÌ?rabe"
+
+#: ../libgitg/gitg-encodings.c:169 ../libgitg/gitg-encodings.c:276
+msgid "Greek"
+msgstr "Grego"
+
+#: ../libgitg/gitg-encodings.c:171
+msgid "Hebrew Visual"
+msgstr "Hebreo visual"
+
+#: ../libgitg/gitg-encodings.c:173 ../libgitg/gitg-encodings.c:237
+#: ../libgitg/gitg-encodings.c:278
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../libgitg/gitg-encodings.c:175
+msgid "Nordic"
+msgstr "NoÌ?rdico"
+
+#: ../libgitg/gitg-encodings.c:179
+msgid "Celtic"
+msgstr "Celta"
+
+#: ../libgitg/gitg-encodings.c:183
+msgid "Romanian"
+msgstr "RomaneÌ?s"
+
+#: ../libgitg/gitg-encodings.c:201
+msgid "Armenian"
+msgstr "Armenio"
+
+#: ../libgitg/gitg-encodings.c:203 ../libgitg/gitg-encodings.c:205
+#: ../libgitg/gitg-encodings.c:219
+msgid "Chinese Traditional"
+msgstr "ChineÌ?s tradicional"
+
+#: ../libgitg/gitg-encodings.c:207
+msgid "Cyrillic/Russian"
+msgstr "CiriÌ?lico/Ruso"
+
+#: ../libgitg/gitg-encodings.c:210 ../libgitg/gitg-encodings.c:212
+#: ../libgitg/gitg-encodings.c:214 ../libgitg/gitg-encodings.c:244
+#: ../libgitg/gitg-encodings.c:259
+msgid "Japanese"
+msgstr "XaponeÌ?s"
+
+#: ../libgitg/gitg-encodings.c:217 ../libgitg/gitg-encodings.c:246
+#: ../libgitg/gitg-encodings.c:250 ../libgitg/gitg-encodings.c:265
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../libgitg/gitg-encodings.c:222 ../libgitg/gitg-encodings.c:224
+#: ../libgitg/gitg-encodings.c:226
+msgid "Chinese Simplified"
+msgstr "ChineÌ?s simplificado"
+
+#: ../libgitg/gitg-encodings.c:228
+msgid "Georgian"
+msgstr "Xeorxiano"
+
+#: ../libgitg/gitg-encodings.c:239 ../libgitg/gitg-encodings.c:280
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: ../libgitg/gitg-encodings.c:256
+msgid "Cyrillic/Ukrainian"
+msgstr "CiriÌ?lico/UcraiÌ?no"
+
+#: ../libgitg/gitg-encodings.c:261 ../libgitg/gitg-encodings.c:267
+#: ../libgitg/gitg-encodings.c:286
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../libgitg/gitg-encodings.c:263
+msgid "Thai"
+msgstr "Tailandés"
+
+#: ../libgitg/gitg-encodings.c:457
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: ../libgitg/gitg-repository.c:887
 msgid "Staged changes"
 msgstr "Cambios preseleccionados"
 
-#: ../libgitg/gitg-repository.c:887
+#: ../libgitg/gitg-repository.c:891
 msgid "Unstaged changes"
 msgstr "Cambios non preseleccionados"
 
-#: ../libgitg/gitg-repository.c:1517
+#: ../libgitg/gitg-repository.c:1527
 msgid "Not a valid git repository"
 msgstr "Non é un repositorio git válido"
 
+#: ../libgitg/gitg-smart-charset-converter.c:322
+msgid "It is not possible to detect the encoding automatically"
+msgstr "Non é posíbel detectar a codificación automaticamente"
+
+#. ex:ts=8:noet:
 #: ../gitg/gitg-commit-menu.ui.h:1
 msgid "Ignore"
 msgstr "Ignorar"
@@ -747,39 +899,43 @@ msgstr "Obter rama («checkout»)"
 msgid "Cherry-pick on..."
 msgstr "Cherry-pick en..."
 
-#: ../gitg/gitg-menus.xml.h:4 ../gitg/gitg-tag.ui.h:2
+#: ../gitg/gitg-menus.xml.h:4 ../gitg/gitg-new-branch.ui.h:1
+msgid "Create branch"
+msgstr "Crear rama"
+
+#: ../gitg/gitg-menus.xml.h:5 ../gitg/gitg-tag.ui.h:2
 msgid "Create tag"
 msgstr "Crear etiqueta"
 
-#: ../gitg/gitg-menus.xml.h:7
+#: ../gitg/gitg-menus.xml.h:8
 msgid "Merge branch with..."
 msgstr "Misturar rama con..."
 
-#: ../gitg/gitg-menus.xml.h:8
+#: ../gitg/gitg-menus.xml.h:9
 msgid "Push branch to..."
 msgstr "Empurrar a rama a..."
 
-#: ../gitg/gitg-menus.xml.h:10
+#: ../gitg/gitg-menus.xml.h:11
 msgid "Rebase branch onto..."
 msgstr "Rebasar rama en..."
 
-#: ../gitg/gitg-menus.xml.h:12
+#: ../gitg/gitg-menus.xml.h:13
 msgid "Rename branch"
 msgstr "Renomear rama"
 
-#: ../gitg/gitg-menus.xml.h:13
+#: ../gitg/gitg-menus.xml.h:14
 msgid "_Author"
 msgstr "_Autor"
 
-#: ../gitg/gitg-menus.xml.h:14
+#: ../gitg/gitg-menus.xml.h:15
 msgid "_Date"
 msgstr "_Data"
 
-#: ../gitg/gitg-menus.xml.h:15
+#: ../gitg/gitg-menus.xml.h:16
 msgid "_Hash"
 msgstr "_Hash"
 
-#: ../gitg/gitg-menus.xml.h:16
+#: ../gitg/gitg-menus.xml.h:17
 msgid "_Subject"
 msgstr "A_sunto"
 
@@ -788,30 +944,38 @@ msgid "<b>Commit Message</b>"
 msgstr "<b>Mensaxe de remisión</b>"
 
 #: ../gitg/gitg-preferences.ui.h:2
+msgid "<b>Diff Program</b>"
+msgstr "<b>Programa Diff</b>"
+
+#: ../gitg/gitg-preferences.ui.h:3
 msgid "<b>Interface</b>"
 msgstr "<b>Interface</b>"
 
-#: ../gitg/gitg-preferences.ui.h:3
+#: ../gitg/gitg-preferences.ui.h:4
 msgid "<b>Revisions</b>"
 msgstr "<b>Revisións</b>"
 
-#: ../gitg/gitg-preferences.ui.h:4 ../gitg/gitg-repository.ui.h:1
+#: ../gitg/gitg-preferences.ui.h:5 ../gitg/gitg-repository.ui.h:1
 msgid "<b>User</b>"
 msgstr "<b>Usuario</b>"
 
-#: ../gitg/gitg-preferences.ui.h:5
+#: ../gitg/gitg-preferences.ui.h:6
+msgid "Allow external diff program"
+msgstr "Permitir un programa diff externo"
+
+#: ../gitg/gitg-preferences.ui.h:7
 msgid "Collapse inactive lanes"
 msgstr "Contrar as liñas inactivas"
 
-#: ../gitg/gitg-preferences.ui.h:6 ../gitg/gitg-window.ui.h:5
+#: ../gitg/gitg-preferences.ui.h:8 ../gitg/gitg-window.ui.h:6
 msgid "Commit"
 msgstr "Facer commit"
 
-#: ../gitg/gitg-preferences.ui.h:7 ../gitg/gitg-repository.ui.h:2
+#: ../gitg/gitg-preferences.ui.h:9 ../gitg/gitg-repository.ui.h:2
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../gitg/gitg-preferences.ui.h:8
+#: ../gitg/gitg-preferences.ui.h:10
 msgid ""
 "Configure global git settings. This corresponds to the settings as stored in "
 "~/.gitconfig. Repository specific settings can be configured at the "
@@ -821,63 +985,67 @@ msgstr ""
 "almacenadas en ~/.gitconfig. Os axustes específicos poden configurar as "
 "propiedades do repositorio."
 
-#: ../gitg/gitg-preferences.ui.h:9
+#: ../gitg/gitg-preferences.ui.h:11
+msgid "Diff"
+msgstr "Diff"
+
+#: ../gitg/gitg-preferences.ui.h:12
 msgid "Display right _margin"
 msgstr "Mostrar a _marxe dereita"
 
-#: ../gitg/gitg-preferences.ui.h:10 ../gitg/gitg-repository.ui.h:3
+#: ../gitg/gitg-preferences.ui.h:13 ../gitg/gitg-repository.ui.h:3
 msgid "E-mail:"
 msgstr "Correo electrónico:"
 
-#: ../gitg/gitg-preferences.ui.h:11
+#: ../gitg/gitg-preferences.ui.h:14
 msgid "Early"
 msgstr "Pronto"
 
-#: ../gitg/gitg-preferences.ui.h:12 ../gitg/gitg-window.ui.h:7
+#: ../gitg/gitg-preferences.ui.h:15 ../gitg/gitg-window.ui.h:9
 msgid "History"
 msgstr "Historial"
 
-#: ../gitg/gitg-preferences.ui.h:13
+#: ../gitg/gitg-preferences.ui.h:16
 msgid "Late"
 msgstr "Tarde"
 
-#: ../gitg/gitg-preferences.ui.h:15
+#: ../gitg/gitg-preferences.ui.h:18
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../gitg/gitg-preferences.ui.h:16
+#: ../gitg/gitg-preferences.ui.h:19
 msgid "Preferences that apply to the commit view"
 msgstr "Preferencias que se aplican á vista de «commit»"
 
-#: ../gitg/gitg-preferences.ui.h:17
+#: ../gitg/gitg-preferences.ui.h:20
 msgid "Preferences that apply to the history view"
 msgstr "Preferencias que se aplican á vista de historial"
 
-#: ../gitg/gitg-preferences.ui.h:18
+#: ../gitg/gitg-preferences.ui.h:21
 msgid "Search filters revisions in the history view"
 msgstr "Buscar revisións filtradas no visor do historial"
 
-#: ../gitg/gitg-preferences.ui.h:19
+#: ../gitg/gitg-preferences.ui.h:22
 msgid "Show history in topological order"
 msgstr "Mostrar o historial en orde topolóxico"
 
-#: ../gitg/gitg-preferences.ui.h:20
+#: ../gitg/gitg-preferences.ui.h:23
 msgid "Show staged changes in history"
 msgstr "Mostrar os cambios preseleccionados no historial"
 
-#: ../gitg/gitg-preferences.ui.h:21
+#: ../gitg/gitg-preferences.ui.h:24
 msgid "Show stash in history"
 msgstr "Mostrar a reserva no historial"
 
-#: ../gitg/gitg-preferences.ui.h:22
+#: ../gitg/gitg-preferences.ui.h:25
 msgid "Show unstaged changes in history"
 msgstr "Mostrar os cambios non seleccionados no historial"
 
-#: ../gitg/gitg-preferences.ui.h:23
+#: ../gitg/gitg-preferences.ui.h:26
 msgid "Use vertical layout"
 msgstr "Usar a distribución vertical"
 
-#: ../gitg/gitg-preferences.ui.h:24
+#: ../gitg/gitg-preferences.ui.h:27
 msgid "_Right margin at column:"
 msgstr "Marxe _dereita na columna:"
 
@@ -954,26 +1122,42 @@ msgid "Amend"
 msgstr "Anexar"
 
 #: ../gitg/gitg-window.ui.h:3
+msgid "Author"
+msgstr "Autor"
+
+#: ../gitg/gitg-window.ui.h:4
 msgid "Branch:"
 msgstr "Rama:"
 
-#: ../gitg/gitg-window.ui.h:4
+#: ../gitg/gitg-window.ui.h:5
 msgid "Co_mmit message"
 msgstr "Mensaxe de re_misión"
 
-#: ../gitg/gitg-window.ui.h:6
+#: ../gitg/gitg-window.ui.h:7
 msgid "Context:"
 msgstr "Contexto:"
 
 #: ../gitg/gitg-window.ui.h:8
+msgid "Date"
+msgstr "Data"
+
+#: ../gitg/gitg-window.ui.h:10
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../gitg/gitg-window.ui.h:11
+msgid "Unstaged"
+msgstr "Non reservado"
+
+#: ../gitg/gitg-window.ui.h:12
 msgid "_Changes"
 msgstr "_Cambios"
 
-#: ../gitg/gitg-window.ui.h:9
+#: ../gitg/gitg-window.ui.h:13
 msgid "_Staged"
 msgstr "_Reservado"
 
-#: ../gitg/gitg-window.ui.h:10
+#: ../gitg/gitg-window.ui.h:14
 msgid "_Unstaged"
 msgstr "Non _reservado"
 
@@ -1001,17 +1185,5 @@ msgstr "Non _reservado"
 #~ msgid "gtk-remove"
 #~ msgstr "gtk-remove"
 
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Filename"
-#~ msgstr "Nome de ficheiro"
-
-#~ msgid "Subject"
-#~ msgstr "Asunto"
-
 #~ msgid "Co_mment"
 #~ msgstr "Co_mentario"