[gitg] Update Galician translations
- From: Francisco Diéguez Souto <frandieguez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Update Galician translations
- Date: Wed, 24 Feb 2016 09:06:40 +0000 (UTC)
commit abd59fb6a11ccc1845e4da5aaa10c4e529c62fa3
Author: Fran Dieguez <fran dieguez mabishu com>
Date: Wed Feb 24 10:06:16 2016 +0100
Update Galician translations
Signed-off-by: Fran Dieguez <fran dieguez mabishu com>
po/gl.po | 1199 ++++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 885 insertions(+), 314 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 51c08e8..ed6489b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,24 +3,28 @@
# This file is distributed under the same license as the PACKAGE package.
# Ignacio Casal Quinteiro <icq gnome org>, 2009.
# Fran Diéguez <frandieguez gnome org>, 2010, 2011.
-# Fran Dieguez <frandieguez gnome org>, 2012, 2013, 2014, 2015.
-#
+# Fran Dieguez <frandieguez gnome org>, 2012, 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: gitg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-18 00:54+0100\n"
-"PO-Revision-Date: 2015-03-18 00:55+0100\n"
+"POT-Creation-Date: 2016-02-18 00:00+0100\n"
+"PO-Revision-Date: 2016-02-23 16:12+0200\n"
"Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
-"Language-Team: Galician <gnome-l10n-gl gnome org>\n"
+"Language-Team: gnome-l10n-gl 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"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Virtaal 0.7.1\n"
-#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:54
+#: ../contrib/xml/xml-reader.c:327
+#, c-format
+msgid "Could not parse XML from stream"
+msgstr "Non foi posíbel analizar o XML desde o fluxo"
+
+#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:39
#: ../gitg/resources/ui/gitg-window.ui.h:1
msgid "gitg"
msgstr "gitg"
@@ -56,10 +60,38 @@ msgid "The activity which gitg activates by default when first launched."
msgstr "A actividade que activa gitg por omisión ao arrincar por primeira vez."
#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+msgid "Use Gravatar"
+msgstr "Usar Gravatar"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+msgid "Enable the use of gravatar to display user avatars."
+msgstr "Actiar o uso de gravatar para mostrar os avatares de usuario."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+msgid "Enable Monitoring"
+msgstr "Activar monitorización"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:10
+msgid "Automatically update when external changes to .git are detected"
+msgstr "Actualizar automaticamente cando se atopen cambios externos en .git"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+msgid "Enable Diff Highlighting"
+msgstr "Activar o realzado das diferencias"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+msgid ""
+"Setting that determines whether to enable syntax highlighting in diff views."
+msgstr ""
+"Configuración que determina se o realzado de sintaxe está activado nas "
+"vistas de diferencias"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
msgid "When to Collapse Inactive Lanes"
msgstr "Cando contraer as liñas inactivas"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
msgid ""
"Setting that indicates when an inactive lane should be collapsed. Valid "
"values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'."
@@ -67,7 +99,7 @@ msgstr ""
"Opción que indica cando unha parte inactiva debe contraerse. Os valores "
"correctos son 0 - 4, onde 0 indica «pronto» e 4 indica «máis tarde»."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
msgid ""
"Setting that indicates whether to collapse history lanes which do not show "
"activity. Enabling this can provide a cleaner history view when there is a "
@@ -79,31 +111,31 @@ msgstr ""
"limpa cando hai moito desenvolvemento en paralelo. Vexa «collapse-inactive-"
"lanes» para controlar cando se deben contraer as liñas."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
msgid "Show History in Topological Order"
msgstr "Mostrar o historial por orde topolóxico"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
msgid ""
"Setting that indicates whether to show the history in topological order."
msgstr "Opción que indica se se debe mostrar o historial en orde topolóxico."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
msgid "Show Stashed Changes"
msgstr "Mostrar os cambios na reserva"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
msgid ""
"Setting that indicates whether to show items for the stash in the history."
msgstr ""
"Configuración que indica se se deben mostrar os elementos de reserva no "
"historial."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
msgid "Show Staged Changes"
msgstr "Mostrar os cambios reservados"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
msgid ""
"Setting that indicates whether to show a virtual item for the currently "
"staged changes in the history."
@@ -111,11 +143,11 @@ msgstr ""
"Configuración que indica se se debe mostrar no historial un elemento visual "
"para os cambios reservados actualmente."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
msgid "Show Unstaged Changes"
msgstr "Mostrar os cambios non reservados"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
msgid ""
"Setting that indicates whether to show a virtual item for the currently "
"unstaged changes in the history."
@@ -123,11 +155,11 @@ msgstr ""
"Configuración que indica se se debe mostrar no historial un elemento virtual "
"para os elementos non reservados actualmente."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
msgid "Mainline Head"
msgstr "HEAD principal"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
msgid ""
"Setting that indicates whether to always preserve a mainline in the history "
"for the current HEAD."
@@ -135,11 +167,44 @@ msgstr ""
"Configuración que indica se se deben preservar unha liña principal no "
"historial para o HEAD actual."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+msgid "Default selection of the history activity"
+msgstr "Selección por omisión da actividade do historial"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+msgid ""
+"Setting that determines the default selection on startup of the history "
+"activity."
+msgstr ""
+"Configuración que determina a selección por omisión ao inicio da actividade "
+"do historial."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+msgid "Reference Sort Order"
+msgstr "Modo da ordenación de referencias"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+msgid "The order by which references in the history sidebar should be sorted."
+msgstr ""
+"O modo no que se deben ordenar as referencias na barra lateral do historial"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+msgid "Show Upstream With Branch"
+msgstr "Mostrar maestra con rama"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+msgid ""
+"Determines whether to also show the upstream (remote) tracking branch when "
+"selecting a local branch in the history view."
+msgstr ""
+"Determina se se debe mostrar a rama maestra (remota) ao seleccionar a rama "
+"local na vista de histórico."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
msgid "Show Right Margin in Commit Message View"
msgstr "Mostrar a marxe dereito na vista de mensaxe de «commit». "
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
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."
@@ -148,11 +213,11 @@ msgstr ""
"pode ser útil para ver de forma doada onde romper a mensaxe de «commit» "
"nunha columna específica."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
msgid "Column at Which Right Margin is Shown"
msgstr "Columna na cal se mostra o marxe dereito"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
msgid ""
"The column at which the right margin is shown if the show-right-margin "
"preference is set to TRUE."
@@ -160,11 +225,11 @@ msgstr ""
"A columna na que se mostra a marxe dereita se a opción show-right-margin "
"está estabelecida como verdadeira."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
msgid "Show Subject Margin in Commit Message View"
msgstr "Mostrar a marxe do asunto na vista de mensaxe de remisión. "
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
msgid ""
"Highlight the subject text of the commit message when it passes the margin "
"specified by subject-margin-position."
@@ -172,11 +237,11 @@ msgstr ""
"Realzar o texto do asunto na mensaxe de remisión ao pasarse do marxe "
"especificado por subject-margin-position."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
msgid "Column at Which Subject Margin is Shown"
msgstr "Columna na cal se mostra a marxe do asunto"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
msgid ""
"The column at which the subject margin is shown if the show-subject-margin "
"preference is set to TRUE."
@@ -184,11 +249,11 @@ msgstr ""
"A columna na que se mostra a marxe do asunto se a opción show-subject-margin "
"está estabelecida como verdadeira."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
msgid "Enable Spell Checking"
msgstr "Activar a corrección ortográfica"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:41
msgid ""
"Setting which determines whether or not spell checking is enabled when "
"writing a commit message."
@@ -196,11 +261,11 @@ msgstr ""
"Configuración que determina se a corrección ortográfica está activada ao "
"escribir mensaxes de remisión."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:42
msgid "Spell Checking Language"
msgstr "Idioma da corrección ortográfica"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:43
msgid ""
"The language to use when spell checking is enabled for writing a commit "
"message."
@@ -208,11 +273,11 @@ msgstr ""
"O idioma a usar cando a corrección ortográfica está activada ao escribir un "
"mensaxe de remisión."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:44
msgid "Ignore Whitespace Changes"
msgstr "Ignorar os cambios nos espazos en branco"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:45
msgid ""
"Setting that indicates whether to ignore whitespace changes when showing the "
"diff of a commit."
@@ -220,22 +285,30 @@ msgstr ""
"Configuración que indica se ignorar os cambios nos espazos en branco ao "
"mostrar as diferencias dunha remisión"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:46
msgid "Show Changes Inline"
msgstr "Mostrar os cambios en liña"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
msgid ""
"Setting that indicates whether changes within lines should be shown inline."
msgstr ""
"Configuración que indica se se deben mostrar as diferencias entre liñas en "
"liña."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:48
+msgid "Wrap"
+msgstr "Axustar"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
+msgid "Wrap lines."
+msgstr "Axustar liñas."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
msgid "Number of Before/After Context Lines"
msgstr "Número de liñas por diante e detrás do contexto"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:37
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:51
msgid ""
"Setting that determines how many lines of context (before and after) should "
"be shown when showing the diff of a commit."
@@ -243,11 +316,11 @@ msgstr ""
"Configuración que determina cantas liñas de contexto (antes e despois) se "
"deberían mostrar ao mostrar as diferencias dunha remisión."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:52
msgid "Rendered Width of a Tab Character"
msgstr "Ancho mostrado do caracter tabulación"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:39
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:53
msgid ""
"Setting that determines how much space a tab character should occupy when "
"showing the diff of a commit."
@@ -255,7 +328,7 @@ msgstr ""
"Configuración que determina canto espazo debe ocupar un caracter de "
"tabulación ao mostrar as diferencias dunha remisión."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:54
msgid ""
"Setting that determines how many lines of context (before and after) should "
"be shown when showing the diff to be staged/unstaged in the commit area."
@@ -264,39 +337,47 @@ msgstr ""
"deberían mostrar ao mostrar as diferencias da reserva ou dos cambios "
"reservados no área de remisión."
-#: ../gitg/commit/gitg-commit-dialog.vala:283
+#: ../gitg/commit/gitg-commit-dialog.vala:308
#, c-format
msgid "Cannot set spell checking language: %s"
msgstr "Non é posíbel comprobar a ortografía do idioma: %s"
-#: ../gitg/commit/gitg-commit.vala:72
-#: ../gitg/preferences/gitg-preferences-commit.vala:119
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+#: ../gitg/commit/gitg-commit-dialog.vala:508
+#: ../gitg/commit/gitg-commit.vala:1067
+msgid "There are no changes to be committed"
+msgstr "Non hai cambios para remitir"
+
+#: ../gitg/commit/gitg-commit-dialog.vala:509
+#: ../gitg/commit/gitg-commit.vala:1068
+msgid "Use amend to change the commit message of the previous commit"
+msgstr "Use engadir para cambiar a mensaxe de remisión da anterior remisión"
+
+#: ../gitg/commit/gitg-commit.vala:104
+msgctxt "Activity"
msgid "Commit"
-msgstr "Remitir"
+msgstr "Commit"
-#: ../gitg/commit/gitg-commit.vala:77
+#: ../gitg/commit/gitg-commit.vala:109
msgid "Create new commits and manage the staging area"
msgstr "Crear novas remisións e xestionar a reserva"
-#: ../gitg/commit/gitg-commit.vala:152
+#: ../gitg/commit/gitg-commit.vala:184
msgid "_Stage selection"
msgstr "Selección de _reserva"
-#: ../gitg/commit/gitg-commit.vala:188
+#: ../gitg/commit/gitg-commit.vala:223
#, c-format
msgid "Failed to stage the removal of submodule `%s'"
msgstr "Produciuse un fallo ao reservar a eliminación do submódulo «%s»"
-#: ../gitg/commit/gitg-commit.vala:204
+#: ../gitg/commit/gitg-commit.vala:239
#, c-format
msgid "Failed to open the repository of submodule `%s' while trying to stage"
msgstr ""
"Produciuse un fallo ao abrir o repositorio do submódulo «%s» ao tentar "
"reservar"
-#: ../gitg/commit/gitg-commit.vala:218
+#: ../gitg/commit/gitg-commit.vala:253
#, c-format
msgid ""
"Failed to lookup the working directory commit of submodule `%s' while trying "
@@ -305,162 +386,132 @@ msgstr ""
"Produciuse un fallo ao buscar o directorio de traballo de «commit» do "
"submódulo «%s» ao tentar reservar"
-#: ../gitg/commit/gitg-commit.vala:231
+#: ../gitg/commit/gitg-commit.vala:266
#, c-format
msgid "Failed to stage the submodule `%s'"
msgstr "Produciuse un fallo ao reservar o submódulo «%s»"
-#: ../gitg/commit/gitg-commit.vala:253
+#: ../gitg/commit/gitg-commit.vala:288
#, c-format
msgid "Failed to stage the removal of file `%s'"
msgstr "Produciuse un fallo ao reservar a eliminación do ficheiro «%s»"
-#: ../gitg/commit/gitg-commit.vala:267
+#: ../gitg/commit/gitg-commit.vala:302
#, c-format
msgid "Failed to stage the file `%s'"
msgstr "Produciuse un fallo ao reservar o ficheiro «%s» "
-#: ../gitg/commit/gitg-commit.vala:536
+#: ../gitg/commit/gitg-commit.vala:574
msgid "_Unstage selection"
msgstr "Selección de _desreserva"
-#: ../gitg/commit/gitg-commit.vala:601
+#: ../gitg/commit/gitg-commit.vala:640
#, c-format
msgid "Failed to unstage the removal of file `%s'"
msgstr "Produciuse un fallo ao desreservar a eliminación do ficheiro «%s»"
-#: ../gitg/commit/gitg-commit.vala:602
+#: ../gitg/commit/gitg-commit.vala:641
#, c-format
msgid "Failed to unstage the file `%s'"
msgstr "Produciuse un fallo desreservar o ficheiro «%s»"
-#: ../gitg/commit/gitg-commit.vala:609
+#: ../gitg/commit/gitg-commit.vala:648
#, c-format
msgid "Failed to unstage the removal of submodule `%s'"
msgstr "Produciuse un fallo ao desreservar a eliminación do submódulo «%s»"
-#: ../gitg/commit/gitg-commit.vala:610
+#: ../gitg/commit/gitg-commit.vala:649
#, c-format
msgid "Failed to unstage the submodule `%s'"
msgstr "Produciuse un fallo desreservar o submódulo «%s»"
#. Populate staged items
-#: ../gitg/commit/gitg-commit.vala:805
+#: ../gitg/commit/gitg-commit.vala:853
msgid "Staged"
msgstr "Reservado"
-#: ../gitg/commit/gitg-commit.vala:813
+#: ../gitg/commit/gitg-commit.vala:861
msgid "No staged files"
msgstr "Non hai ningún ficheiro reservado"
#. Populate unstaged items
-#: ../gitg/commit/gitg-commit.vala:829
+#: ../gitg/commit/gitg-commit.vala:884
msgid "Unstaged"
msgstr "Sen reservar"
-#: ../gitg/commit/gitg-commit.vala:837
+#: ../gitg/commit/gitg-commit.vala:892
msgid "No unstaged files"
msgstr "Non hai ficheiro sen reservar"
#. Populate untracked items
-#: ../gitg/commit/gitg-commit.vala:853
+#: ../gitg/commit/gitg-commit.vala:915
msgid "Untracked"
msgstr "Sen seguimento"
-#: ../gitg/commit/gitg-commit.vala:857
+#: ../gitg/commit/gitg-commit.vala:919
msgid "No untracked files"
msgstr "Non hai ficheiro sen seguimento"
-#: ../gitg/commit/gitg-commit.vala:875
+#: ../gitg/commit/gitg-commit.vala:944
msgid "Submodule"
msgstr "Submódulo"
-#: ../gitg/commit/gitg-commit.vala:879
+#: ../gitg/commit/gitg-commit.vala:948
msgid "No dirty submodules"
msgstr "Non hai submódulos sucios"
-#: ../gitg/commit/gitg-commit.vala:991
-msgid "There are no changes to be committed"
-msgstr "Non hai cambios para remitir"
-
-#: ../gitg/commit/gitg-commit.vala:992
-msgid "Use amend to change the commit message of the previous commit"
-msgstr "Use engadir para cambiar a mensaxe de remisión da anterior remisión"
-
-#: ../gitg/commit/gitg-commit.vala:1018
+#: ../gitg/commit/gitg-commit.vala:1095
msgid "Failed to commit"
msgstr "Produciuse un fallo ao remitir"
-#. TODO: better to show user info dialog directly or something
-#: ../gitg/commit/gitg-commit.vala:1034 ../gitg/commit/gitg-commit.vala:1213
+#: ../gitg/commit/gitg-commit.vala:1111
msgid "Failed to pass pre-commit"
msgstr "Produciuse un fallo ao pasar a pre-remisión"
-#: ../gitg/commit/gitg-commit.vala:1201
-msgid ""
-"Your user name and email are not configured yet. Please go to the user "
-"configuration and provide your name and email."
-msgstr ""
-"O seu nome de usuario e correo electrónico non están configurados aínda. "
-"Vaia á configuración do usuario e forneza un nome e correo."
-
-#: ../gitg/commit/gitg-commit.vala:1205
-msgid ""
-"Your user name is not configured yet. Please go to the user configuration "
-"and provide your name."
-msgstr ""
-"O seu nome de usuario non están configurado aínda. Vaia á configuración do "
-"usuario e forneza un nome."
-
-#: ../gitg/commit/gitg-commit.vala:1209
-msgid ""
-"Your email is not configured yet. Please go to the user configuration and "
-"provide your email."
-msgstr ""
-"O seu correo electrónico non están configurado aínda. Vaia á configuración "
-"do usuario e forneza un correo."
-
-#: ../gitg/commit/gitg-commit.vala:1268 ../gitg/commit/gitg-commit.vala:1415
+#: ../gitg/commit/gitg-commit.vala:1314 ../gitg/commit/gitg-commit.vala:1464
msgid "Discard changes"
msgstr "Rexeitar os cambios"
-#: ../gitg/commit/gitg-commit.vala:1269
+#: ../gitg/commit/gitg-commit.vala:1315
msgid "Are you sure you want to permanently discard the selected changes?"
msgstr ""
"Ten certeza que quere rexeitar de forma permanente os cambios seleccionados?"
-#: ../gitg/commit/gitg-commit.vala:1278 ../gitg/commit/gitg-commit.vala:1441
-#: ../gitg/gitg-commit-action-create-patch.vala:143
-#: ../gitg/gitg-window.vala:468 ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
+#: ../gitg/commit/gitg-commit.vala:1324 ../gitg/commit/gitg-commit.vala:1490
+#: ../gitg/commit/gitg-commit.vala:1605
+#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-dash-view.vala:437 ../gitg/gitg-window.vala:190
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2
+#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2
#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:2
#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:2
-#: ../gitg/resources/ui/gitg-window.ui.h:5
+#: ../gitg/resources/ui/gitg-window.ui.h:9
#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:1
msgid "_Cancel"
msgstr "_Cancelar"
-#: ../gitg/commit/gitg-commit.vala:1279 ../gitg/commit/gitg-commit.vala:1442
+#: ../gitg/commit/gitg-commit.vala:1325 ../gitg/commit/gitg-commit.vala:1491
msgid "Discard"
msgstr "Rexeitar"
-#: ../gitg/commit/gitg-commit.vala:1307
+#: ../gitg/commit/gitg-commit.vala:1354
msgid "Failed to discard selection"
msgstr "Produciuse un fallo ao rexeitar a selección"
-#: ../gitg/commit/gitg-commit.vala:1336
+#: ../gitg/commit/gitg-commit.vala:1384
msgid "Failed to stage selection"
msgstr "Produciuse un fallo na selección da reserva"
-#: ../gitg/commit/gitg-commit.vala:1340
+#: ../gitg/commit/gitg-commit.vala:1388
msgid "Failed to unstage selection"
msgstr "Produciuse un fallo na selección de desreserva"
-#: ../gitg/commit/gitg-commit.vala:1399
+#: ../gitg/commit/gitg-commit.vala:1448
msgid "Failed to discard changes"
msgstr "Produciuse un fallo ao rexeitar os cambios"
-#: ../gitg/commit/gitg-commit.vala:1420
+#: ../gitg/commit/gitg-commit.vala:1469
#, c-format
msgid ""
"Are you sure you want to permanently discard all changes made to the file `"
@@ -469,7 +520,7 @@ msgstr ""
"Ten certeza que quere rexeitar de forma permanente todos os cambios feitos "
"no ficheiro «%s»?"
-#: ../gitg/commit/gitg-commit.vala:1431
+#: ../gitg/commit/gitg-commit.vala:1480
#, c-format
msgid ""
"Are you sure you want to permanently discard all changes made to the files "
@@ -478,22 +529,108 @@ msgstr ""
"Ten certeza que quere rexeitar de forma permanente todos os cambios feitos "
"nos ficheiros %s e «%s»?"
-#: ../gitg/commit/gitg-commit.vala:1475
+#: ../gitg/commit/gitg-commit.vala:1563
+msgid "Failed to delete files"
+msgstr "Produciuse un fallo ao eliminar os ficheiros"
+
+#: ../gitg/commit/gitg-commit.vala:1579
+msgid "Delete file"
+msgid_plural "Delete files"
+msgstr[0] "Eliminar ficheiro"
+msgstr[1] "Eliminar ficheiros"
+
+#: ../gitg/commit/gitg-commit.vala:1584
+#, c-format
+msgid "Are you sure you want to permanently delete the file `%s'?"
+msgstr "Ten certeza que quere eliminar de forma permanente o ficheiro «%s»?"
+
+#: ../gitg/commit/gitg-commit.vala:1595
+#, c-format
+msgid "Are you sure you want to permanently delete the files %s and `%s'?"
+msgstr ""
+"Ten certeza que quere eliminar de forma permanente os ficheiros %s e «%s»?"
+
+#: ../gitg/commit/gitg-commit.vala:1640
msgid "_Stage changes"
msgstr "Cambios _reservados"
-#: ../gitg/commit/gitg-commit.vala:1485
+#: ../gitg/commit/gitg-commit.vala:1650
msgid "_Unstage changes"
msgstr "Cambios _non reservados"
-#: ../gitg/commit/gitg-commit.vala:1495
+#: ../gitg/commit/gitg-commit.vala:1660
msgid "_Discard changes"
msgstr "_Rexeitar cambios"
-#: ../gitg/commit/gitg-commit.vala:1518
+#: ../gitg/commit/gitg-commit.vala:1670
+msgid "D_elete file"
+msgid_plural "D_elete files"
+msgstr[0] "_Eliminar ficheiro"
+msgstr[1] "_Eliminar ficheiros"
+
+#: ../gitg/commit/gitg-commit.vala:1693
msgid "_Edit file"
msgstr "_Editar ficheiro"
+#: ../gitg/gitg-action-support.vala:95
+#, c-format
+msgid "Failed to stash changes: %s"
+msgstr "Produciuse un fallo ao reservar os cambios: %s"
+
+#: ../gitg/gitg-action-support.vala:130
+msgid "Unstaged changes"
+msgstr "Cambios non reservados"
+
+#: ../gitg/gitg-action-support.vala:131
+msgid ""
+"You appear to have unstaged changes in your working directory. Would you "
+"like to stash the changes before the checkout?"
+msgstr ""
+"Semella que ten cambios non reservados no seu directorio de traballo. Desexa "
+"reservlos cambios antes de obter?"
+
+#: ../gitg/gitg-action-support.vala:133
+#: ../gitg/gitg-commit-action-cherry-pick.vala:163
+#: ../gitg/gitg-ref-action-delete.vala:88
+#: ../gitg/gitg-ref-action-merge.vala:194
+#: ../gitg/resources/ui/gitg-remote-notification.ui.h:1
+#: ../gitg/resources/ui/gitg-simple-notification.ui.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../gitg/gitg-action-support.vala:134
+msgid "Stash changes"
+msgstr "Cambios reservados"
+
+#: ../gitg/gitg-action-support.vala:138 ../gitg/gitg-action-support.vala:165
+msgid "Failed with conflicts"
+msgstr "Produciuse un fallo con conflitos"
+
+#: ../gitg/gitg-action-support.vala:181
+#, c-format
+msgid "Failed to checkout conflicts: %s"
+msgstr "Produciuse un fallo ao obter («checkout») os conflitos: %s"
+
+#: ../gitg/gitg-action-support.vala:199
+msgid "Failed to obtain author details"
+msgstr "Produciuse un fallo ao obter os detalles do autor"
+
+#: ../gitg/gitg-action-support.vala:223
+#: ../gitg/gitg-ref-action-checkout.vala:88
+#, c-format
+msgid "Failed to lookup commit: %s"
+msgstr "Produciuse un fallo ao buscar as remisións: %s"
+
+#: ../gitg/gitg-action-support.vala:255
+#, c-format
+msgid "Failed to create commit: %s"
+msgstr "Produciuse un fallo ao crear a remisión: %s"
+
+#: ../gitg/gitg-action-support.vala:277
+#, c-format
+msgid "Failed to checkout index: %s"
+msgstr "Produciuse un fallo ao obter («checkout») o índice: %s"
+
#: ../gitg/gitg-application.vala:56
msgid "Show the application's version"
msgstr "Mostrar a versión do aplicativo"
@@ -511,70 +648,172 @@ msgstr ""
msgid "Do not try to load a repository from the current working directory"
msgstr "Non tentar cargar un repositorio desde o cartafol actual"
-#: ../gitg/gitg-application.vala:90
+#: ../gitg/gitg-application.vala:94
msgid "- Git repository viewer"
msgstr "- Explorador de repositorios Git"
-#: ../gitg/gitg-application.vala:209
+#: ../gitg/gitg-application.vala:226
msgid "gitg is a Git repository viewer for gtk+/GNOME"
msgstr "gitg é un explorador de repositorios Git para gtk+/GNOME"
-#: ../gitg/gitg-application.vala:218
+#: ../gitg/gitg-application.vala:235
msgid "translator-credits"
msgstr "Fran Dieguez <frandieguez gnome org>, 2014."
-#: ../gitg/gitg-application.vala:221
+#: ../gitg/gitg-application.vala:238
msgid "gitg homepage"
msgstr "Páxina web de gitg"
-#: ../gitg/gitg-author-details-dialog.vala:67
-msgid "Unable to open the .gitconfig file."
-msgstr "Non foi posíbel abrir o ficheiro .gitconfig."
+#: ../gitg/gitg-application.vala:369
+msgid ""
+"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
+"depends) to be compiled with threading support.\n"
+"\n"
+"If you manually compiled libgit2, then please configure libgit2 with -"
+"DTHREADSAFE:BOOL=ON.\n"
+"\n"
+"Otherwise, report a bug in your distributions' bug reporting system for "
+"providing libgit2 without threading support."
+msgstr ""
+"Sentímolo moito, pero gitg require libgit2 (unha biblioteca da que depende "
+"gitg) para ser compilado con compatibilidade de fíos.\n"
+"\n"
+"Se quere compilar manualmente libgit2, entón configure libgit2 con -"
+"DTHREADSAFE:BOOL=ON.\n"
+"\n"
+"Doutro xeito, informe dun erro no sistema de informe de erros da súa "
+"distribución para que fornezan libgit2 sen compatibilidade de fíos."
+
+#. ex: ts=4 noet
+#: ../gitg/gitg-author-details-dialog.vala:85
+#: ../gitg/gitg-author-details-dialog.vala:105
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
+msgid "Author Details"
+msgstr "Detalles do autor"
+
+#: ../gitg/gitg-author-details-dialog.vala:86
+msgid "Enter default details used for all repositories:"
+msgstr "Escriba a información predeterminada usada para os repositorios:"
-#: ../gitg/gitg-author-details-dialog.vala:148
+#. Translators: %s is the repository name
+#: ../gitg/gitg-author-details-dialog.vala:108
+#, c-format
+msgid "Override global details for repository '%s':"
+msgstr "Sobrescribir a información global para o repositorio «%s»:"
+
+#: ../gitg/gitg-author-details-dialog.vala:220
msgid "Failed to set Git user config."
msgstr "Produciuse un fallo ao estabelecer a configuración de Git do usuario."
-#: ../gitg/gitg-clone-dialog.vala:87
+#: ../gitg/gitg-clone-dialog.vala:89
msgid "The URL introduced is not supported"
msgstr "O URL introducido non é compatíbel"
+#: ../gitg/gitg-commit-action-cherry-pick.vala:53
+msgid "Cherry pick onto"
+msgstr "Aplicar os cambios («cherry-pick») en"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:58
+msgid "Cherry pick this commit onto a branch"
+msgstr "Aplicar este cambio nunha rama («cherry-pick»)"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:117
+#, c-format
+msgid "Failed to lookup the commit for branch %s: %s"
+msgstr "Produciuse un fallo ao buscar a remisión para a rama %s: %s"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:132
+#, c-format
+msgid "Failed to cherry-pick the commit: %s"
+msgstr ""
+"Produciuse un fallo ao aplicar os cambios da revisión («cherry-pick»): %s"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:144
+#: ../gitg/gitg-commit-action-cherry-pick.vala:160
+msgid "Cherry pick has conflicts"
+msgstr "«Cherry-pick» ten conflitos"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:153
+#, c-format
+msgid ""
+"The cherry pick of %s onto %s has caused conflicts, would you like to "
+"checkout branch %s with the cherry pick to your working directory to resolve "
+"the conflicts?"
+msgstr ""
+"O «cherry pick» de %s en %s causou conflitos. Desexa obter a rama %s co «"
+"cherry pick» no seu directorio de traballo para resolver os conflitos?"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:157
+#, c-format
+msgid ""
+"The cherry-pick of %s onto %s has caused conflicts, would you like to "
+"checkout the cherry pick to your working directory to resolve the conflicts?"
+msgstr ""
+"O «cherry pick» de %s en %s causou conflitos. Desexa obter o «cherry pick» "
+"no seu directorio de traballo para resolver os conflitos?"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:164
+#: ../gitg/gitg-ref-action-checkout.vala:48
+#: ../gitg/gitg-ref-action-merge.vala:195
+msgid "Checkout"
+msgstr "Obter"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:168
+msgid "Cherry pick failed with conflicts"
+msgstr "O «cherry pick» fallou con confitos"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:179
+msgid "Cherry pick finished with conflicts in working directory"
+msgstr "O «cherry pick» rematou con conflitos no directorio de traballo"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:199
+#, c-format
+msgid "Cherry pick %s onto %s"
+msgstr "Aplicando os cambios («cherry-picking») %s en %s"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:224
+msgid "Successfully cherry picked"
+msgstr "Cambios aplicados «cherry pick» con éxito"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:261
+#, c-format
+msgid "Cherry pick onto %s"
+msgstr "Aplicar cambios («cherry-picking») en %s"
+
#: ../gitg/gitg-commit-action-create-branch.vala:48
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
-msgid "Create Branch"
+msgid "Create branch"
msgstr "Crear rama"
#: ../gitg/gitg-commit-action-create-branch.vala:53
msgid "Create a new branch at the selected commit"
msgstr "Crea unha nova rama na remisión seleccionada"
-#: ../gitg/gitg-commit-action-create-branch.vala:85
+#: ../gitg/gitg-commit-action-create-branch.vala:75
msgid "Failed to create branch"
msgstr "Produciuse un erro ao crear a rama"
#: ../gitg/gitg-commit-action-create-patch.vala:63
-msgid "Create Patch"
+msgid "Create patch"
msgstr "Crear parche"
#: ../gitg/gitg-commit-action-create-patch.vala:68
msgid "Create a patch from the selected commit"
msgstr "Crea un parche desde a remisión seleccionada"
-#: ../gitg/gitg-commit-action-create-patch.vala:141
+#: ../gitg/gitg-commit-action-create-patch.vala:143
msgid "Save Patch File"
msgstr "Gardar ficheiro de parche"
-#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-commit-action-create-patch.vala:147
msgid "_Save Patch"
msgstr "_Gardar parche"
-#: ../gitg/gitg-commit-action-create-patch.vala:168
+#: ../gitg/gitg-commit-action-create-patch.vala:172
msgid "Failed to create patch"
msgstr "Produciuse un fallo ao crear o parche"
#: ../gitg/gitg-commit-action-create-tag.vala:48
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
-msgid "Create Tag"
+msgid "Create tag"
msgstr "Crear etiqueta"
#: ../gitg/gitg-commit-action-create-tag.vala:53
@@ -593,10 +832,81 @@ msgstr "Produciuse un fallo ao buscar a etiqueta"
msgid "Provide a message to create an annotated tag"
msgstr "Fornceza unha mensaxe para crear unha etiqueta anotada"
-#: ../gitg/gitg-dash-view.vala:148
-msgid "_Delete"
+#: ../gitg/gitg-dash-view.vala:171
+msgid "_Remove"
msgstr "_Eliminar"
+#. Translators: the two %s will be replaced to create a link to perform the scanning action.
+#: ../gitg/gitg-dash-view.vala:227
+#, c-format
+msgid "We can also %sscan your home directory%s for git repositories."
+msgstr ""
+"Tamén pode %sanalizar o seu cartafol persoal%s para buscar repositorios git."
+
+#. Translators: the two %s will be used to create a link to the author dialog.
+#: ../gitg/gitg-dash-view.vala:230
+#, c-format
+msgid "In the mean time, you may want to %sset up your git profile%s."
+msgstr "Namentres, pode querer %sconfigurar o seu perfíl de git%s."
+
+#: ../gitg/gitg-dash-view.vala:382
+msgid "Failed to clone repository"
+msgstr "Produciuse un fallo ao clonar o repositorio"
+
+#: ../gitg/gitg-dash-view.vala:413
+msgid "Failed to add repository"
+msgstr "Produciuse un fallo ao engadir o repositorio"
+
+#: ../gitg/gitg-dash-view.vala:429
+msgid "Create new repository"
+msgstr "Crear novo repositorio"
+
+#. Translators: %s is a file name
+#: ../gitg/gitg-dash-view.vala:432
+#, c-format
+msgid ""
+"The location <i>%s</i> does not appear to be a valid git repository. Would "
+"you like to initialize a new git repository at this location?"
+msgstr ""
+"A localización <i>%s</i> non semella ser un repositorio git válido. Desexa "
+"inicializar un novo repositorio nesa localización?"
+
+#: ../gitg/gitg-dash-view.vala:438
+msgid "Create repository"
+msgstr "Crear repositorio"
+
+#: ../gitg/gitg-dash-view.vala:454
+msgid "Failed to create repository"
+msgstr "Produciuse un fallo ao crear o repositorio"
+
+#: ../gitg/gitg-dash-view.vala:524
+#, c-format
+msgid "Scanning for repositories in %s"
+msgstr "Buscando repositorio en %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:53
+msgid "Checkout the selected reference"
+msgstr "Obter a referencia seleccionada"
+
+#: ../gitg/gitg-ref-action-checkout.vala:72
+#, c-format
+msgid "Checkout %s"
+msgstr "Obter %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:101
+#, c-format
+msgid "Failed to checkout branch: %s"
+msgstr "Produciuse un fallo ao obter a rama: %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:111
+#, c-format
+msgid "Failed to update HEAD: %s"
+msgstr "Produciuse un fallo actualizar HEAD: %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:121
+msgid "Successfully checked out branch to working directory"
+msgstr ""
+
#: ../gitg/gitg-ref-action-copy-name.vala:48
msgid "Copy name"
msgstr "Copiar nome"
@@ -606,7 +916,7 @@ msgid "Copy the name of the reference to the clipboard"
msgstr "Copia o nome da referencia ao portapapeis"
#: ../gitg/gitg-ref-action-delete.vala:48
-#: ../gitg/gitg-ref-action-delete.vala:88
+#: ../gitg/gitg-ref-action-delete.vala:89
msgid "Delete"
msgstr "Eliminar"
@@ -644,12 +954,6 @@ msgstr "Eliminar a rama remota %s"
msgid "Are you sure that you want to permanently delete the remote branch %s?"
msgstr "Ten certeza que quere eliminar de forma permanente a rama remota %s?"
-#: ../gitg/gitg-ref-action-delete.vala:89
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:9
-#: ../libgitg/resources/ui/gitg-remote-notification.ui.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
#. Translators: %s is the name of the tag
#: ../gitg/gitg-ref-action-delete.vala:119
#, c-format
@@ -684,39 +988,112 @@ msgstr "Obter desde %s"
msgid "Fetch remote objects from %s"
msgstr "Obter obxectos remotos desde %s"
-#: ../gitg/gitg-ref-action-fetch.vala:110
+#: ../gitg/gitg-ref-action-fetch.vala:98
#, c-format
msgid "Fetching from %s"
msgstr "Obtendo desde %s"
#. Translators: new refers to a new remote reference having been fetched,
-#: ../gitg/gitg-ref-action-fetch.vala:118
+#: ../gitg/gitg-ref-action-fetch.vala:106
msgid "new"
msgstr "nova"
#. Translators: updated refers to a remote reference having been updated,
-#: ../gitg/gitg-ref-action-fetch.vala:123
+#: ../gitg/gitg-ref-action-fetch.vala:111
msgid "updated"
msgstr "actualizado"
-#: ../gitg/gitg-ref-action-fetch.vala:134
+#: ../gitg/gitg-ref-action-fetch.vala:121
#, c-format
msgid "Failed to fetch from %s: %s"
msgstr "Produciuse un fallo ao obter desde %s: %s"
#. Translators: the %s will get replaced with the remote url,
-#: ../gitg/gitg-ref-action-fetch.vala:146
+#: ../gitg/gitg-ref-action-fetch.vala:134
#, c-format
msgid "Fetched from %s: everything is up to date"
msgstr "Obtido desde %s: todo actualizado"
#. Translators: the first %s is the remote url to fetch from,
#. * the second is a list of references that got updated.
-#: ../gitg/gitg-ref-action-fetch.vala:152
+#: ../gitg/gitg-ref-action-fetch.vala:140
#, c-format
msgid "Fetched from %s: %s"
msgstr "Obtido desde %s: %s"
+#: ../gitg/gitg-ref-action-merge.vala:63
+#, c-format
+msgid "Merge into %s"
+msgstr ""
+
+#. TODO
+#: ../gitg/gitg-ref-action-merge.vala:69
+#, fuzzy, c-format
+msgid "Merge another branch into branch %s"
+msgstr "Misturando a rama %s <%s> na rama %s <%s>"
+
+#: ../gitg/gitg-ref-action-merge.vala:106
+#, fuzzy, c-format
+msgid "Failed to merge commits: %s"
+msgstr "Produciuse un fallo ao remitir"
+
+#: ../gitg/gitg-ref-action-merge.vala:175
+#: ../gitg/gitg-ref-action-merge.vala:191
+msgid "Merge has conflicts"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:184
+#, c-format
+msgid ""
+"The merge of %s into %s has caused conflicts, would you like to checkout "
+"branch %s with the merge to your working directory to resolve the conflicts?"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:188
+#, c-format
+msgid ""
+"The merge of %s into %s has caused conflicts, would you like to checkout the "
+"merge to your working directory to resolve the conflicts?"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:199
+msgid "Merge failed with conflicts"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:210
+msgid "Finished merge with conflicts in working directory"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:222
+#, c-format
+msgid "Merge %s into %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:231
+#, fuzzy, c-format
+msgid "Failed to lookup our commit: %s"
+msgstr "Produciuse un fallo ao buscar a etiqueta"
+
+#: ../gitg/gitg-ref-action-merge.vala:241
+#, fuzzy, c-format
+msgid "Failed to lookup their commit: %s"
+msgstr "Produciuse un fallo ao buscar a etiqueta"
+
+#: ../gitg/gitg-ref-action-merge.vala:278
+#, c-format
+msgid "Successfully merged %s into %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:320
+#, fuzzy, c-format
+msgid "Merge %s into branch %s"
+msgstr "Eliminar rama %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:482
+#: ../gitg/history/gitg-history-refs-list.vala:1176
+msgid "Tags"
+msgstr "Etiquetas"
+
#: ../gitg/gitg-ref-action-rename.vala:48
msgid "Rename"
msgstr "Renomear"
@@ -734,78 +1111,141 @@ msgstr "O nome especificado «%s» contén caracteres non válidos"
msgid "Invalid name"
msgstr "Nome non válido"
-#: ../gitg/gitg-ref-action-rename.vala:141
+#: ../gitg/gitg-ref-action-rename.vala:131
msgid "Failed to rename"
msgstr "Produciuse un fallo ao renomear"
-#: ../gitg/gitg.vala:64
-msgid ""
-"We are terribly sorry, but gitg requires libgit2 (a library on which gitg "
-"depends) to be compiled with threading support.\n"
-"\n"
-"If you manually compiled libgit2, then please configure libgit2 with -"
-"DTHREADSAFE:BOOL=ON.\n"
-"\n"
-"Otherwise, report a bug in your distributions' bug reporting system for "
-"providing libgit2 without threading support."
+#: ../gitg/gitg-window.vala:187
+#, fuzzy
+msgid "Add Repository"
+msgstr "Abrir repositorio"
+
+#: ../gitg/gitg-window.vala:191
+msgid "_Add"
msgstr ""
-"Sentímolo moito, pero gitg require libgit2 (unha biblioteca da que depende "
-"gitg) para ser compilado con compatibilidade de fíos.\n"
-"\n"
-"Se quere compilar manualmente libgit2, entón configure libgit2 con -"
-"DTHREADSAFE:BOOL=ON.\n"
-"\n"
-"Doutro xeito, informe dun erro no sistema de informe de erros da súa "
-"distribución para que fornezan libgit2 sen compatibilidade de fíos."
-#: ../gitg/gitg-window.vala:403
+#: ../gitg/gitg-window.vala:193
+#, fuzzy
+msgid "_Scan for all git repositories from this directory"
+msgstr "Non tentar cargar un repositorio desde o cartafol actual"
+
+#: ../gitg/gitg-window.vala:481
msgid "Projects"
msgstr "Proxectos"
-#: ../gitg/gitg-window.vala:466
-msgid "Open Repository"
-msgstr "Abrir repositorio"
-
-#: ../gitg/gitg-window.vala:469
-msgid "_Open"
-msgstr "_Abrir"
-
-#: ../gitg/gitg-window.vala:764
+#: ../gitg/gitg-window.vala:912
#, c-format
msgid "'%s' is not a Git repository."
msgstr "«%s» non é un repositorio Git."
-#: ../gitg/history/gitg-history-refs-list.vala:136
+#: ../gitg/gitg-window.vala:1061
+msgid ""
+"Your user name and email are not configured yet. Please go to the user "
+"configuration and provide your name and email."
+msgstr ""
+"O seu nome de usuario e correo electrónico non están configurados aínda. "
+"Vaia á configuración do usuario e forneza un nome e correo."
+
+#: ../gitg/gitg-window.vala:1065
+msgid ""
+"Your user name is not configured yet. Please go to the user configuration "
+"and provide your name."
+msgstr ""
+"O seu nome de usuario non están configurado aínda. Vaia á configuración do "
+"usuario e forneza un nome."
+
+#: ../gitg/gitg-window.vala:1069
+msgid ""
+"Your email is not configured yet. Please go to the user configuration and "
+"provide your email."
+msgstr ""
+"O seu correo electrónico non están configurado aínda. Vaia á configuración "
+"do usuario e forneza un correo."
+
+#: ../gitg/gitg-window.vala:1072
+#, fuzzy
+msgid "Missing author details"
+msgstr "Detalles do autor"
+
+#: ../gitg/gitg-remote-notification.vala:90
+#: ../gitg/gitg-simple-notification.vala:99
+#: ../gitg/resources/ui/gitg-window.ui.h:10
+msgid "Close"
+msgstr "Pechar"
+
+#: ../gitg/history/gitg-history-command-line.vala:42
+msgid "Select all commits by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:44
+msgid "Select all branches by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:46
+msgid "Select all remotes by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:48
+msgid "Select all tags by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:50
+msgid "Select the specified reference by default in the history activity"
+msgstr ""
+
+#: ../gitg/history/gitg-history-command-line.vala:50
+msgid "REFERENCE"
+msgstr ""
+
+#: ../gitg/history/gitg-history-refs-list.vala:165
+#, c-format
+msgid "%d ahead, %d behind"
+msgstr ""
+
+#: ../gitg/history/gitg-history-refs-list.vala:169
+#, c-format
+msgid "%d ahead"
+msgstr ""
+
+#: ../gitg/history/gitg-history-refs-list.vala:173
+#, c-format
+msgid "%d behind"
+msgstr ""
+
+#: ../gitg/history/gitg-history-refs-list.vala:207
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
msgid "All commits"
msgstr "Todas as remisións"
-#: ../gitg/history/gitg-history-refs-list.vala:835
+#: ../gitg/history/gitg-history-refs-list.vala:1174
msgid "Branches"
msgstr "Ramas"
-#: ../gitg/history/gitg-history-refs-list.vala:836
+#: ../gitg/history/gitg-history-refs-list.vala:1175
msgid "Remotes"
msgstr "Remotos"
-#: ../gitg/history/gitg-history-refs-list.vala:837
-msgid "Tags"
-msgstr "Etiquetas"
-
-#: ../gitg/history/gitg-history.vala:246
-#: ../gitg/preferences/gitg-preferences-history.vala:128
+#: ../gitg/history/gitg-history.vala:306
+#: ../gitg/preferences/gitg-preferences-history.vala:218
#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3
msgid "History"
msgstr "Historial"
-#: ../gitg/history/gitg-history.vala:251
+#: ../gitg/history/gitg-history.vala:311
msgid "Examine the history of the repository"
msgstr "Examinar o historial do repositorio"
-#: ../gitg/history/gitg-history.vala:602
+#: ../gitg/history/gitg-history.vala:796
msgid "Mainline"
msgstr "Liña principal"
-#: ../gitg/preferences/gitg-preferences-interface.vala:96
+#: ../gitg/preferences/gitg-preferences-commit.vala:119
+#, fuzzy
+msgctxt "Preferences"
+msgid "Commit"
+msgstr "Remitir"
+
+#: ../gitg/preferences/gitg-preferences-interface.vala:120
msgid "Interface"
msgstr "Interface"
@@ -866,39 +1306,36 @@ msgstr "%e de %b de %Y, %H:%M"
msgid "%b %e %Y, %I:%M %p"
msgstr "%e de %b de %Y, %I:%M %p"
-#: ../libgitg/gitg-diff-view.vala:249
-msgid "stage"
-msgstr "preseleccionar"
-
-#: ../libgitg/gitg-diff-view.vala:250
-msgid "unstage"
-msgstr "Non preseleccionar"
-
-#: ../libgitg/gitg-diff-view.vala:251
-msgid "Loading diff…"
-msgstr "Cargando diferenzas…"
+#: ../libgitg/gitg-diff-view-commit-details.vala:142
+#, fuzzy
+msgid "Collapse all"
+msgstr "Contraer as liñas inactivas"
-#: ../libgitg/gitg-diff-view.vala:252
-msgid "Notes:"
-msgstr "Notas:"
+#: ../libgitg/gitg-diff-view-commit-details.vala:146
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2
+msgid "Expand all"
+msgstr ""
-#: ../libgitg/gitg-diff-view.vala:253
-msgid "Parents:"
-msgstr "Pais:"
+#: ../libgitg/gitg-diff-view-commit-details.vala:199
+#, fuzzy, c-format
+msgid "Committed by %s"
+msgstr "Remitido por:"
-#: ../libgitg/gitg-diff-view.vala:254
-msgid "Diff against:"
-msgstr "Diferencia fronte:"
+#. Translators: this is used to construct: "at <directory>", to indicate where the repository is at.
+#: ../libgitg/gitg-repository-list-box.vala:154
+#, c-format
+msgid "at %s"
+msgstr ""
-#: ../libgitg/gitg-diff-view.vala:255
-msgid "Committed by:"
-msgstr "Remitido por:"
+#. Translators: this is used to construct: "<branch-name> at <directory>"
+#: ../libgitg/gitg-repository-list-box.vala:163
+#, c-format
+msgid "%s at %s"
+msgstr ""
-#: ../libgitg/gitg-remote-notification.vala:72
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:6
-#: ../gitg/resources/ui/gitg-window.ui.h:6
-msgid "Close"
-msgstr "Pechar"
+#: ../libgitg/gitg-repository-list-box.vala:409
+msgid "Cloning…"
+msgstr ""
#: ../libgitg/gitg-stage.vala:334
#, c-format
@@ -907,11 +1344,12 @@ msgstr ""
"Non foi posíbel ler a mensaxe de remisión despois de executar o hook commit-"
"msg: %s"
-#: ../plugins/diff/gitg-diff.vala:106
+#: ../plugins/diff/gitg-diff.vala:112
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11
msgid "Diff"
msgstr "Diff"
-#: ../plugins/diff/gitg-diff.vala:111
+#: ../plugins/diff/gitg-diff.vala:117
msgid "Show the changes introduced by the selected commit"
msgstr "Mostrar os cambios introducidos pola remisión seleccionados"
@@ -923,39 +1361,27 @@ msgstr "Ficheiros"
msgid "Show the files in the tree of the selected commit"
msgstr "Mostrar os ficheiros no árbore das remisións seleccionadas"
-#. ex: ts=4 noet
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
-msgid "Author Details"
-msgstr "Detalles do autor"
-
#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:3
-#, no-c-format
-msgid "Note: The Git config file '%s' does not exist."
-msgstr "Nota: O ficheiro de configuración de Git «%s» non existe."
+msgid "_Save"
+msgstr "_Gardar"
#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:4
-msgid "Enter details to set as default for all repositories:"
+#, fuzzy
+msgid "Default details used for all repositories"
msgstr ""
"Escriba a información para configurar como predeterminados para todos os "
"seus repositorios:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
-msgid "Enter details for repository '%s':"
-msgstr "Escriba a información para o repositorio %s:"
-
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:7
-msgid "E-mail: "
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:5
+#, fuzzy
+msgid "E-mail:"
msgstr "Correo electrónico:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:8
-msgid "Name: "
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
+#, fuzzy
+msgid "Name:"
msgstr "Nome:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:10
-msgid "Save"
-msgstr "Gardar"
-
#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
msgid "Clone Repository"
msgstr "Clonar repositorio"
@@ -980,6 +1406,12 @@ msgstr "Seleccionar localización…"
msgid "Bare repository"
msgstr "Repositorio baleiro"
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
+#, fuzzy
+msgctxt "Create Dialog"
+msgid "Commit"
+msgstr "Remitir"
+
#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
#: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
msgid "C_ommit"
@@ -1040,6 +1472,10 @@ msgstr "Data"
msgid "Open"
msgstr "Abrir"
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+msgid "Create Branch"
+msgstr "Crear rama"
+
#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
msgid "C_reate"
@@ -1049,43 +1485,49 @@ msgstr "C_rear"
msgid "Branch _name:"
msgstr "_Nome da rama:"
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+msgid "Create Tag"
+msgstr "Crear etiqueta"
+
#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
msgid "Tag _name:"
msgstr "_Nome da etiqueta:"
+#: ../gitg/resources/ui/gitg-dash-view.ui.h:1
+msgid ""
+"No repositories have been added yet. To get started, you can add an existing "
+"repository or clone a new one."
+msgstr ""
+
#: ../gitg/resources/ui/gitg-menus.ui.h:1
msgid "_New Window"
msgstr "Xanela _nova"
#: ../gitg/resources/ui/gitg-menus.ui.h:2
+msgid "_Author Details"
+msgstr "Detalles do _autor"
+
+#: ../gitg/resources/ui/gitg-menus.ui.h:3
msgid "_Preferences"
msgstr "_Preferencias"
-#: ../gitg/resources/ui/gitg-menus.ui.h:3
+#: ../gitg/resources/ui/gitg-menus.ui.h:4
+msgid "_Keyboard Shortcuts"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-menus.ui.h:5
msgid "_Help"
msgstr "A_xuda"
-#: ../gitg/resources/ui/gitg-menus.ui.h:4
+#: ../gitg/resources/ui/gitg-menus.ui.h:6
msgid "_About"
msgstr "So_bre"
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
+#: ../gitg/resources/ui/gitg-menus.ui.h:7
msgid "_Quit"
msgstr "_Saír"
-#: ../gitg/resources/ui/gitg-menus.ui.h:6
-msgid "_Open Repository…"
-msgstr "_Abrir repositorio…"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:7
-msgid "_Clone Repository…"
-msgstr "_Clonar repositorio…"
-
#: ../gitg/resources/ui/gitg-menus.ui.h:8
-msgid "_Author Details"
-msgstr "Detalles do _autor"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:9
msgid "_Reload"
msgstr "_Recargar"
@@ -1110,26 +1552,53 @@ msgid "Commit Message"
msgstr "Mensaxe de remisión"
#: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
+#, fuzzy
+msgid "Default selection"
+msgstr "Rexe_itar seleccion"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#, fuzzy
+msgid "Current branch"
+msgstr "Crear rama"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+msgid "All branches"
+msgstr "Todas as ramas"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#, fuzzy
+msgid "References"
+msgstr "Preferencias"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+msgid "Sort references in the sidebar by latest activity"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:7
+msgid "Show upstream (remote) branch when selecting a local branch"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
msgid "Commits"
msgstr "Remisións"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
msgid "Collapse inactive lanes"
msgstr "Contraer as liñas inactivas"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
msgid "Early"
msgstr "Pronto"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
msgid "Late"
msgstr "Tarde"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
msgid "Show history in topological order"
msgstr "Mostrar historial en orde topolóxico"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:13
msgid "Preserve mainline for currently checked out branch"
msgstr "Manter a liña principal da rama actual descargada"
@@ -1141,6 +1610,10 @@ msgstr "Inicio"
msgid "Start with activity:"
msgstr "Iniciar con unha actividade:"
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+msgid "Commit"
+msgstr "Remitir"
+
#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:5
msgid "Layout"
msgstr "Distribución"
@@ -1149,41 +1622,98 @@ msgstr "Distribución"
msgid "Use horizontal layout"
msgstr "Usar distribución horizontal"
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:7
+msgid "Avatars"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:8
+msgid "Use gravatar service to provide user avatars"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:9
+msgid "Monitoring"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:12
+msgid "Enable syntax highlighting of source code in diff views"
+msgstr ""
+
#: ../gitg/resources/ui/gitg-preferences.ui.h:1
msgid "Preferences"
msgstr "Preferencias"
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:1
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Windows"
+msgstr "Xanela _nova"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Open the window menu"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:4
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Open a repository"
+msgstr "Abrir repositorio"
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Open the help"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Find"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Close the active window"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:8
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Mostrar a versión do aplicativo"
+
#: ../gitg/resources/ui/gitg-window.ui.h:2
msgid "Show the list of recently used repositories"
msgstr "Mostra unha lista dos repositorios usados recentemente"
#: ../gitg/resources/ui/gitg-window.ui.h:3
-msgid "Find a word or phrase"
-msgstr "Buscar unha palabra ou frase"
+msgid "Clone"
+msgstr ""
#: ../gitg/resources/ui/gitg-window.ui.h:4
-msgid "General settings and options"
-msgstr "Opcións e preferencias xerais"
-
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:1
-msgid "Ignore whitespace changes"
-msgstr "Ignorar os cambios nos espazos en branco"
+#, fuzzy
+msgid "Clone repository"
+msgstr "Clonar repositorio"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:2
-msgid "Show changes inline"
-msgstr "Mostrar os cambios en liña"
+#: ../gitg/resources/ui/gitg-window.ui.h:5
+msgid "Add"
+msgstr ""
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:3
-msgid "Developer tools"
-msgstr "Ferramentas de desenvolvemento"
+#: ../gitg/resources/ui/gitg-window.ui.h:6
+#, fuzzy
+msgid "Add repository"
+msgstr "Repositorio baleiro"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:4
-msgid "Tab width"
-msgstr "Ancho da tabulación"
+#: ../gitg/resources/ui/gitg-window.ui.h:7
+msgid "Find a word or phrase"
+msgstr "Buscar unha palabra ou frase"
-#: ../libgitg/resources/ui/diff-view/diff-view-options.ui.h:5
-msgid "Context"
-msgstr "Contexto"
+#: ../gitg/resources/ui/gitg-window.ui.h:8
+msgid "General settings and options"
+msgstr "Opcións e preferencias xerais"
#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:2
msgid "_Authenticate"
@@ -1217,6 +1747,34 @@ msgstr "Lembrar o contrasinal até _saír da sesión"
msgid "Remember _forever"
msgstr "_Lemprar para sempre"
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1
+#, fuzzy
+msgid "Parents"
+msgstr "Pais:"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1
+#, fuzzy
+msgid "Tab width:"
+msgstr "Ancho da tabulación"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:2
+msgid "Wrap lines:"
+msgstr ""
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:3
+#, fuzzy
+msgid "Ignore whitespace:"
+msgstr "Ignorar os cambios nos espazos en branco"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1
+#, fuzzy
+msgid "Context:"
+msgstr "Contexto"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:2
+msgid "Spacing"
+msgstr ""
+
#: ../libgitg/resources/ui/gitg-repository-list-box-row.ui.h:1
msgid ""
"Remove the repository from the list (does not delete the repository from "
@@ -1227,6 +1785,48 @@ msgstr "Quitar o repositorio da lista (non elimina o repositorio do disco)"
msgid "column"
msgstr "columna"
+#~ msgid "Unable to open the .gitconfig file."
+#~ msgstr "Non foi posíbel abrir o ficheiro .gitconfig."
+
+#~ msgid "_Delete"
+#~ msgstr "_Eliminar"
+
+#~ msgid "_Open"
+#~ msgstr "_Abrir"
+
+#~ msgid "stage"
+#~ msgstr "preseleccionar"
+
+#~ msgid "unstage"
+#~ msgstr "Non preseleccionar"
+
+#~ msgid "Loading diff…"
+#~ msgstr "Cargando diferenzas…"
+
+#~ msgid "Notes:"
+#~ msgstr "Notas:"
+
+#~ msgid "Diff against:"
+#~ msgstr "Diferencia fronte:"
+
+#~ msgid "Note: The Git config file '%s' does not exist."
+#~ msgstr "Nota: O ficheiro de configuración de Git «%s» non existe."
+
+#~ msgid "Save"
+#~ msgstr "Gardar"
+
+#~ msgid "_Open Repository…"
+#~ msgstr "_Abrir repositorio…"
+
+#~ msgid "_Clone Repository…"
+#~ msgstr "_Clonar repositorio…"
+
+#~ msgid "Show changes inline"
+#~ msgstr "Mostrar os cambios en liña"
+
+#~ msgid "Developer tools"
+#~ msgstr "Ferramentas de desenvolvemento"
+
#~ msgid "Show stash in history"
#~ msgstr "Mostrar as reservas no historial"
@@ -1236,9 +1836,6 @@ msgstr "columna"
#~ msgid "Show unstaged changes in history"
#~ msgstr "Mostrar os cambios non seleccionados no historial"
-#~ msgid "_Save"
-#~ msgstr "_Gardar"
-
#~ msgid "%d minutes ago"
#~ msgstr "Hai %d minutos"
@@ -1315,9 +1912,6 @@ msgstr "columna"
#~ msgstr ""
#~ "Seleccionar un cartafol para abrir o repositorio git correspondente."
-#~ msgid "Recent repository"
-#~ msgstr "Repositorio recente"
-
#~ msgid "Path:"
#~ msgstr "Ruta:"
@@ -1416,9 +2010,6 @@ msgstr "columna"
#~ msgid "You have uncommited changes in your current working tree"
#~ msgstr "Ten cambios sen remitir na súa árbore de traballo actual"
-#~ msgid "Failed to checkout local branch <%s>"
-#~ msgstr "Produciuse un fallo ao obter («checkout») a rama local <%s>"
-
#~ msgid "Failed to checkout remote branch <%s> to local branch <%s>"
#~ msgstr ""
#~ "Produciuse un fallo ao obter («checkout») a rama remota <%s> na rama "
@@ -1464,9 +2055,6 @@ msgstr "columna"
#~ msgid "The branch on which to merge could not be checked out"
#~ msgstr "Non foi posíbel obter («checkout») a rama na que misturar"
-#~ msgid "Merging %s branch <%s> onto %s branch <%s>"
-#~ msgstr "Misturando a rama %s <%s> na rama %s <%s>"
-
#~ 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>?"
@@ -1533,11 +2121,6 @@ msgstr "columna"
#~ msgid "The tag object could not be successfully created"
#~ msgstr "Non foi posíbel crear correctamente o obxecto de etiqueta."
-#~ msgid "Failed to cherry-pick on <%s>"
-#~ msgstr ""
-#~ "Produciuse un fallo ao aplicar os cambios da revisión («cherry-pick») "
-#~ "sobre <%s>"
-
#~ msgid "Are you sure you want to cherry-pick that revision on <%s>?"
#~ msgstr ""
#~ "Ten certeza que quere aplicar os cambios da revisión («cherry-pick») á "
@@ -1551,9 +2134,6 @@ msgstr "columna"
#~ "Non foi posíbel obter a rama sobre a que aplicar os cambios («cherry-"
#~ "pick»)"
-#~ msgid "Cherry-picking on <%s>"
-#~ msgstr "Aplicando os cambios («cherry-picking») en <%s>"
-
#~ msgid "Failed to generate format-patch"
#~ msgstr "Produciuse un fallo ao xerar o parche de corrección"
@@ -1632,9 +2212,6 @@ msgstr "columna"
#~ msgid "Local branches"
#~ msgstr "Ramas locais"
-#~ msgid "All branches"
-#~ msgstr "Todas as ramas"
-
#~ msgid "Begin loading repository"
#~ msgstr "Iniciar a carga do repositirio"
@@ -1778,9 +2355,6 @@ msgstr "columna"
#~ msgid "_Hash"
#~ msgstr "_Hash"
-#~ msgid "Checkout branch"
-#~ msgstr "Obter rama («checkout»)"
-
#~ msgid "Rebase branch onto..."
#~ msgstr "Rebasar rama en…"
@@ -1793,9 +2367,6 @@ msgstr "columna"
#~ msgid "Apply stash to..."
#~ msgstr "Aplicar reserva a…"
-#~ msgid "Cherry-pick on..."
-#~ msgstr "Aplicar cambios («Cherry-pick») en…"
-
#~ msgid "<b>Revisions</b>"
#~ msgstr "<b>Revisións</b>"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
