[gitg] [l10n] Updated Catalan (Valencian) translation
- From: Gil Forcada Codinachs <gforcada src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] [l10n] Updated Catalan (Valencian) translation
- Date: Thu, 5 Oct 2017 11:37:48 +0000 (UTC)
commit 6ddb6f793c0d065e1b7d5550cf8e38459143e3ce
Author: Xavi Ivars <xavi ivars gmail com>
Date: Thu Oct 5 13:37:39 2017 +0200
[l10n] Updated Catalan (Valencian) translation
po/ca valencia po | 1623 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 1258 insertions(+), 365 deletions(-)
---
diff --git a/po/ca valencia po b/po/ca valencia po
index 743576a..398a34e 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -2,22 +2,31 @@
# Copyright © 2013 Free Software Foundation, Inc.
# This file is distributed under the same license as the gitg package.
# Gil Forcada <gilforcada guifi net>, 2013, 2014.
-#
+# Xavi Ivars <xavi ivars gmail com>, 2015.
+# Jordi Serratosa <jordis softcatala cat>, 2017.
msgid ""
msgstr ""
"Project-Id-Version: gitg\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-17 00:05+0200\n"
-"PO-Revision-Date: 2014-08-17 00:03+0200\n"
-"Last-Translator: Gil Forcada <gilforcada guifi net>\n"
-"Language-Team: Catalan <tradgnome softcatala org>\n"
-"Language: ca@valencia\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=gitg&keywords=I18N+L10N&component=gitg\n"
+"POT-Creation-Date: 2017-09-10 07:17+0000\n"
+"PO-Revision-Date: 2015-08-04 23:10+0200\n"
+"Last-Translator: Xavi Ivars <xavi ivars gmail com>\n"
+"Language-Team: Softcatalà - Xavi Ivars\n"
+"Language: ca-valencia\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bits\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\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 ""
+
+#: ../data/gitg.desktop.in.in.h:1 ../gitg/gitg.vala:39
#: ../gitg/resources/ui/gitg-window.ui.h:1
msgid "gitg"
msgstr "gitg"
@@ -28,13 +37,13 @@ msgstr "Navegador de dipòsits Git"
#: ../data/org.gnome.gitg.gschema.xml.in.in.h:1
msgid "Default Clone Directory"
-msgstr ""
+msgstr "Directori on clonar per defecte"
#: ../data/org.gnome.gitg.gschema.xml.in.in.h:2
msgid ""
"The default directory in which new repositories should be suggested to be "
"cloned."
-msgstr ""
+msgstr "El directori per defecte on se suggerirà clonar els nous dipòsits."
#: ../data/org.gnome.gitg.gschema.xml.in.in.h:3
msgid "Orientation of the main interface (vertical or horizontal)"
@@ -45,10 +54,51 @@ msgid "Setting that sets the orientation of the main interface."
msgstr "Paràmetre que estableix l'orientació de la interfície principal."
#: ../data/org.gnome.gitg.gschema.xml.in.in.h:5
+msgid "Default Activity"
+msgstr "Activitat per defecte"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
+msgid "The activity which gitg activates by default when first launched."
+msgstr ""
+"L'activitat que gitg activa per defecte quan s'executa per primera vegada."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+msgid "Use Gravatar"
+msgstr "Utilitza Gravatar"
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+msgid "Enable the use of gravatar to display user avatars."
+msgstr "Habilita l'ús de gravatar per mostrar els avatars dels usuaris."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+msgid "Enable Monitoring"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+msgid "Enable Diff Highlighting"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
+#, fuzzy
+#| msgid ""
+#| "Setting which determines whether or not spell checking is enabled when "
+#| "writing a commit message."
+msgid ""
+"Setting that determines whether to enable syntax highlighting in diff views."
+msgstr ""
+"Paràmetre que determina si la verificació ortogràfica quan s'escriu un "
+"missatge de publicació."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
msgid "When to Collapse Inactive Lanes"
msgstr "Quan contraure els carrils inactius"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:6
+#: ../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'."
@@ -56,7 +106,7 @@ msgstr ""
"Paràmetre que indica quan s'ha de contraure un carril inactiu. Els valors "
"vàlids són 0 - 4, on 0 indica «d'hora» i 4 indica «tard»."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:7
+#: ../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 "
@@ -69,33 +119,30 @@ msgstr ""
"Vegeu l'opció «collapse-inactive-lanes» per controlar quan s'han de "
"contraure els carrils."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:8
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
msgid "Show History in Topological Order"
msgstr "Mostra l'historial en orde topològic"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:9
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
msgid ""
"Setting that indicates whether to show the history in topological order."
msgstr "Paràmetre que indica si es mostra l'historial en orde topològic."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:10
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
msgid "Show Stashed Changes"
-msgstr "Mostra els guardats temporals a l'historial"
+msgstr "Mostra els canvis guardats temporalment a l'historial"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:11
+#: ../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 ""
-"Paràmetre que indica si es mostren elements de guardat temporal a "
-"l'historial."
+"Paràmetre que indica si es mostren elements de guardat temporal a l'historial."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:12
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
msgid "Show Staged Changes"
-msgstr "Mostra els guardats temporals a l'historial"
+msgstr "Mostra els canvis preparats per ser publicats"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:13
+#: ../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."
@@ -103,13 +150,11 @@ msgstr ""
"Paràmetre que indica si es mostra un element virtual pel guardat temporal "
"actual a l'historial."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:14
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
msgid "Show Unstaged Changes"
-msgstr ""
-"Mostra els canvis que encara no estan en el guardat temporal a l'historial"
+msgstr "Mostra els canvis que encara no estan preparats per ser publicats"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:15
+#: ../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."
@@ -117,11 +162,51 @@ msgstr ""
"Paràmetre que indica si es mostra un element virtual per als canvis que "
"encara no estan al guardat temporal actualment a l'historial."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:16
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
+msgid "Mainline Head"
+msgstr "Capçalera de la branca principal"
+
+#: ../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."
+msgstr ""
+"Paràmetre que indica si s'ha de preservar una línia principal a la història "
+"per a la capçalera actual."
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
+msgid "Default selection of the history activity"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+msgid ""
+"Setting that determines the default selection on startup of the history "
+"activity."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+msgid "Reference Sort Order"
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
+msgid "The order by which references in the history sidebar should be sorted."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+msgid "Show Upstream With Branch"
+msgstr ""
+
+#: ../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 ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
msgid "Show Right Margin in Commit Message View"
msgstr "Mostra el marge dret a la vista de missatge de publicació"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:17
+#: ../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."
@@ -130,11 +215,11 @@ msgstr ""
"D'esta manera es facilita saber per on trencar el missatge d'enviament a "
"partir d'una certa columna."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:18
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
msgid "Column at Which Right Margin is Shown"
msgstr "Columna on es mostra el marge dret"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:19
+#: ../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."
@@ -142,11 +227,11 @@ msgstr ""
"La columna on es mostra el marge dret si el paràmetre «show-right-margin» és "
"«TRUE» (cert)."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:20
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
msgid "Show Subject Margin in Commit Message View"
msgstr "Mostra el marge de l'assumpte a la vista de missatge de publicació"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:21
+#: ../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."
@@ -154,11 +239,11 @@ msgstr ""
"Realça el text de l'assumpte del missatge de publicació quan se sobrepassa "
"el marge especificat a «subject-margin-position»."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:22
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:38
msgid "Column at Which Subject Margin is Shown"
msgstr "Columna on es mostra el marge de l'assumpte"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:23
+#: ../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."
@@ -166,523 +251,1031 @@ msgstr ""
"La columna a la qual es mostra el marge de l'assumpte si el paràmetre «show-"
"subject-margin» és «TRUE» (cert)."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:24
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:40
msgid "Enable Spell Checking"
msgstr "Habilita la verificació ortogràfica"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:25
+#: ../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."
msgstr ""
+"Paràmetre que determina si la verificació ortogràfica quan s'escriu un "
+"missatge de publicació."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:26
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:42
msgid "Spell Checking Language"
-msgstr "No es pot establir la llengua per a la verificació ortogràfica: %s"
+msgstr "Llengua de verificació ortogràfica"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:27
+#: ../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."
msgstr ""
+"Quina és la llengua que voleu utilitzar quan es faça la verificació "
+"ortogràfica del missatge de publicació."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:28
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:44
msgid "Ignore Whitespace Changes"
-msgstr ""
+msgstr "Ignora els canvis d'espais en blanc"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:29
-#, fuzzy
+#: ../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."
msgstr ""
-"Paràmetre que indica si es mostren elements de guardat temporal a "
-"l'historial."
+"Paràmetre que indica si s'ignoren els canvis d'espais en blanc quan es "
+"mostren les diferències d'una publicació."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:30
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:46
msgid "Show Changes Inline"
-msgstr ""
+msgstr "Mostra els canvis en línia"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:31
-#, fuzzy
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:47
msgid ""
"Setting that indicates whether changes within lines should be shown inline."
msgstr ""
-"Paràmetre que indica si es mostren elements de guardat temporal a "
-"l'historial."
+"Paràmetre que indica si els canvis dins d'una línia es mostren en línia."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:32
-msgid "Number of Before/After Context Lines"
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:48
+msgid "Wrap"
msgstr ""
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:33
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:49
+msgid "Wrap lines."
+msgstr ""
+
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:50
+msgid "Number of Before/After Context Lines"
+msgstr "Nombre de línies de context abans i després"
+
+#: ../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."
msgstr ""
+"Paràmetre que determina quantes línies de context (abans i després) es "
+"mostraran quan s'estan visualitzant les diferències d'una publicació."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:34
+#: ../data/org.gnome.gitg.gschema.xml.in.in.h:52
msgid "Rendered Width of a Tab Character"
-msgstr ""
+msgstr "Amplària de visualització del caràcter de tabulació"
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:35
+#: ../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."
msgstr ""
+"Paràmetre que determina la quantitat d'espai que ocuparà un caràcter de "
+"tabulació quan s'estan visualitzant les diferències d'una publicació."
-#: ../data/org.gnome.gitg.gschema.xml.in.in.h:36
+#: ../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."
msgstr ""
+"Paràmetre que determina quantes línies de context (abans i després) es "
+"mostraran quan s'estan visualitzant les diferències pendents de guardar a "
+"l'àrea de publicació."
-#: ../gitg/commit/gitg-commit-dialog.vala:283
+#: ../gitg/commit/gitg-commit-dialog.vala:308
#, c-format
msgid "Cannot set spell checking language: %s"
msgstr "No es pot establir la llengua per a la verificació ortogràfica: %s"
-#: ../gitg/commit/gitg-commit.vala:59
-#: ../gitg/preferences/gitg-preferences-commit.vala:119
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
+#: ../gitg/commit/gitg-commit-dialog.vala:508
+#: ../gitg/commit/gitg-commit.vala:1077
+msgid "There are no changes to be committed"
+msgstr "No hi ha cap canvi per publicar"
+
+#: ../gitg/commit/gitg-commit-dialog.vala:509
+#: ../gitg/commit/gitg-commit.vala:1078
+msgid "Use amend to change the commit message of the previous commit"
+msgstr ""
+"Utilitzeu «corregeix» per canviar el missatge de publicació de l'última "
+"publicació"
+
+#: ../gitg/commit/gitg-commit.vala:113
+msgctxt "Activity"
msgid "Commit"
-msgstr "Publicació"
+msgstr "Publica"
-#: ../gitg/commit/gitg-commit.vala:64
+#: ../gitg/commit/gitg-commit.vala:118
msgid "Create new commits and manage the staging area"
-msgstr ""
+msgstr "Crea noves publicacions i gestiona l'àrea de guardat temporal"
-#: ../gitg/commit/gitg-commit.vala:107
+#: ../gitg/commit/gitg-commit.vala:193
msgid "_Stage selection"
msgstr "Al_ça temporalment la selecció"
-#: ../gitg/commit/gitg-commit.vala:138
+#: ../gitg/commit/gitg-commit.vala:232
+#, c-format
+msgid "Failed to stage the removal of submodule `%s'"
+msgstr "No s'ha pogut guardar temporalment l'eliminació del submòdul «%s»"
+
+#: ../gitg/commit/gitg-commit.vala:248
+#, c-format
+msgid "Failed to open the repository of submodule `%s' while trying to stage"
+msgstr ""
+"No s'ha pogut obrir el dipòsit del submòdul «%s» mentre s'intentava guardar "
+"temporalment"
+
+#: ../gitg/commit/gitg-commit.vala:263
+#, c-format
+msgid ""
+"Failed to lookup the working directory commit of submodule `%s' while trying "
+"to stage"
+msgstr ""
+"No s'ha pogut visualitzar el directori de treball del submòdul «%s» mentre "
+"s'intentava guardar temporalment"
+
+#: ../gitg/commit/gitg-commit.vala:276
+#, c-format
+msgid "Failed to stage the submodule `%s'"
+msgstr "No s'ha pogut guardar temporalment el submòdul «%s»"
+
+#: ../gitg/commit/gitg-commit.vala:298
#, c-format
msgid "Failed to stage the removal of file `%s'"
msgstr "No s'ha pogut guardar temporalment l'eliminació del fitxer «%s»"
-#: ../gitg/commit/gitg-commit.vala:152
+#: ../gitg/commit/gitg-commit.vala:312
#, c-format
msgid "Failed to stage the file `%s'"
msgstr "No s'ha pogut guardar temporalment el fitxer «%s»"
-#: ../gitg/commit/gitg-commit.vala:182
+#: ../gitg/commit/gitg-commit.vala:584
msgid "_Unstage selection"
-msgstr "_Trau del guardat temporal la selecció"
+msgstr "_Treu del guardat temporal la selecció"
-#: ../gitg/commit/gitg-commit.vala:213
+#: ../gitg/commit/gitg-commit.vala:650
#, c-format
msgid "Failed to unstage the removal of file `%s'"
-msgstr "No s'ha pogut traure del guardat temporal l'eliminació del fitxer «%s»"
+msgstr "No s'ha pogut treure del guardat temporal l'eliminació del fitxer «%s»"
-#: ../gitg/commit/gitg-commit.vala:227
+#: ../gitg/commit/gitg-commit.vala:651
#, c-format
msgid "Failed to unstage the file `%s'"
-msgstr "No s'ha pogut traure del guardat temporal el fitxer «%s»"
+msgstr "No s'ha pogut treure del guardat temporal el fitxer «%s»"
+
+#: ../gitg/commit/gitg-commit.vala:658
+#, c-format
+msgid "Failed to unstage the removal of submodule `%s'"
+msgstr "No s'ha pogut treure del guardat temporal del submòdul «%s»"
+
+#: ../gitg/commit/gitg-commit.vala:659
+#, c-format
+msgid "Failed to unstage the submodule `%s'"
+msgstr "No s'ha pogut treure del guardat temporal el submòdul «%s»"
-#: ../gitg/commit/gitg-commit.vala:368
+#. Populate staged items
+#: ../gitg/commit/gitg-commit.vala:863
msgid "Staged"
msgstr "En el guardat temporal"
-#: ../gitg/commit/gitg-commit.vala:379
+#: ../gitg/commit/gitg-commit.vala:871
msgid "No staged files"
msgstr "Fitxers que no estan al guardat temporal"
-#: ../gitg/commit/gitg-commit.vala:394
+#. Populate unstaged items
+#: ../gitg/commit/gitg-commit.vala:894
msgid "Unstaged"
msgstr "Trets del guardat temporal"
-#: ../gitg/commit/gitg-commit.vala:402
+#: ../gitg/commit/gitg-commit.vala:902
msgid "No unstaged files"
msgstr "No hi ha fitxers trets del guardat temporal"
-#: ../gitg/commit/gitg-commit.vala:417
+#. Populate untracked items
+#: ../gitg/commit/gitg-commit.vala:925
msgid "Untracked"
msgstr "Sense seguiment"
-#: ../gitg/commit/gitg-commit.vala:421
+#: ../gitg/commit/gitg-commit.vala:929
msgid "No untracked files"
msgstr "No hi ha cap fitxer sense seguiment"
-#: ../gitg/commit/gitg-commit.vala:505
-msgid "There are no changes to be committed"
-msgstr "No hi ha cap canvi per publicar"
+#: ../gitg/commit/gitg-commit.vala:954
+msgid "Submodule"
+msgstr "Submòdul"
-#: ../gitg/commit/gitg-commit.vala:506
-msgid "Use amend to change the commit message of the previous commit"
-msgstr ""
-"Utilitzeu «corregeix» per canviar el missatge de publicació de l'última "
-"publicació"
+#: ../gitg/commit/gitg-commit.vala:958
+msgid "No dirty submodules"
+msgstr "No hi ha submòduls bruts"
-#: ../gitg/commit/gitg-commit.vala:532
+#: ../gitg/commit/gitg-commit.vala:1107
msgid "Failed to commit"
msgstr "No s'ha pogut publicar"
-#. TODO: better to show user info dialog directly or something
-#: ../gitg/commit/gitg-commit.vala:548 ../gitg/commit/gitg-commit.vala:727
+#: ../gitg/commit/gitg-commit.vala:1123
msgid "Failed to pass pre-commit"
msgstr "No s'ha passat la pre-publicació"
-#: ../gitg/commit/gitg-commit.vala:715
-msgid ""
-"Your user name and email are not configured yet. Please go to the user "
-"configuration and provide your name and email."
-msgstr ""
-"No heu configurat el vostre nom d'usuari ni el correu electrònic. Aneu a la "
-"configuració d'usuari i afegiu-hi el vostre nom i correu."
-
-#: ../gitg/commit/gitg-commit.vala:719
-msgid ""
-"Your user name is not configured yet. Please go to the user configuration "
-"and provide your name."
-msgstr ""
-"No heu configurat el vostre nom d'usuari. Aneu a la configuració d'usuari i "
-"afegiu-li."
-
-#: ../gitg/commit/gitg-commit.vala:723
-msgid ""
-"Your email is not configured yet. Please go to the user configuration and "
-"provide your email."
-msgstr ""
-"No heu configurat el vostre correu electrònic. Aneu a la configuració "
-"d'usuari i afegiu-li."
-
-#: ../gitg/commit/gitg-commit.vala:782 ../gitg/commit/gitg-commit.vala:909
+#: ../gitg/commit/gitg-commit.vala:1331 ../gitg/commit/gitg-commit.vala:1481
msgid "Discard changes"
-msgstr ""
+msgstr "Descarta els canvis"
-#: ../gitg/commit/gitg-commit.vala:783
+#: ../gitg/commit/gitg-commit.vala:1332
msgid "Are you sure you want to permanently discard the selected changes?"
msgstr ""
+"Esteu segur que voleu descartar definitivament els canvis seleccionats?"
-#: ../gitg/commit/gitg-commit.vala:792 ../gitg/commit/gitg-commit.vala:936
-#: ../gitg/gitg-commit-action-create-patch.vala:143
-#: ../gitg/gitg-window.vala:432 ../gitg/resources/ui/gitg-clone-dialog.ui.h:2
+#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507
+#: ../gitg/commit/gitg-commit.vala:1622
+#: ../gitg/gitg-commit-action-create-patch.vala:145
+#: ../gitg/gitg-dash-view.vala:444 ../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 "_Cancel·la"
-#: ../gitg/commit/gitg-commit.vala:793 ../gitg/commit/gitg-commit.vala:935
+#: ../gitg/commit/gitg-commit.vala:1342 ../gitg/commit/gitg-commit.vala:1508
msgid "Discard"
-msgstr ""
+msgstr "Descarta"
-#: ../gitg/commit/gitg-commit.vala:821
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:1371
msgid "Failed to discard selection"
-msgstr "No s'ha pogut guardar temporalment la selecció"
+msgstr "No s'ha pogut descartar la selecció"
-#: ../gitg/commit/gitg-commit.vala:850
+#: ../gitg/commit/gitg-commit.vala:1401
msgid "Failed to stage selection"
msgstr "No s'ha pogut guardar temporalment la selecció"
-#: ../gitg/commit/gitg-commit.vala:854
+#: ../gitg/commit/gitg-commit.vala:1405
msgid "Failed to unstage selection"
-msgstr "No s'ha pogut traure del guardat temporalment la selecció"
+msgstr "No s'ha pogut treure del guardat temporalment la selecció"
-#: ../gitg/commit/gitg-commit.vala:893
-#, fuzzy
+#: ../gitg/commit/gitg-commit.vala:1465
msgid "Failed to discard changes"
-msgstr "No s'ha pogut definir la configuració d'usuari Git."
+msgstr "No s'han pogut descartar els canvis"
-#: ../gitg/commit/gitg-commit.vala:914
+#: ../gitg/commit/gitg-commit.vala:1486
#, c-format
msgid ""
"Are you sure you want to permanently discard all changes made to the file `"
"%s'?"
msgstr ""
+"Esteu segur que voleu descartar permanentment tots els canvis fets al fitxer "
+"«%s»?"
-#: ../gitg/commit/gitg-commit.vala:925
+#: ../gitg/commit/gitg-commit.vala:1497
#, c-format
msgid ""
"Are you sure you want to permanently discard all changes made to the files "
"%s and `%s'?"
msgstr ""
+"Esteu segur que voleu descartar permanentment tots els canvis fets als "
+"fitxers «%s» i «%s»?"
-#: ../gitg/commit/gitg-commit.vala:969
+#: ../gitg/commit/gitg-commit.vala:1580
#, fuzzy
-msgid "_Stage changes"
-msgstr "Al_ça temporalment la selecció"
+msgid "Failed to delete files"
+msgstr "No s'ha pogut suprimir l'etiqueta %s"
-#: ../gitg/commit/gitg-commit.vala:979
+#: ../gitg/commit/gitg-commit.vala:1596
#, fuzzy
+msgid "Delete file"
+msgid_plural "Delete files"
+msgstr[0] "Suprimeix"
+msgstr[1] "Suprimeix"
+
+#: ../gitg/commit/gitg-commit.vala:1601
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the file `%s'?"
+msgstr "Esteu segurs que voleu suprimir permanentment l'etiqueta %s?"
+
+#: ../gitg/commit/gitg-commit.vala:1612
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete the files %s and `%s'?"
+msgstr "Esteu segurs que voleu suprimir permanentment l'etiqueta %s?"
+
+#: ../gitg/commit/gitg-commit.vala:1658
+msgid "_Stage changes"
+msgstr "Al_ça temporalment els canvis"
+
+#: ../gitg/commit/gitg-commit.vala:1670
msgid "_Unstage changes"
-msgstr "_Trau del guardat temporal la selecció"
+msgstr "_Elimina del guardat temporal"
-#: ../gitg/commit/gitg-commit.vala:989
+#: ../gitg/commit/gitg-commit.vala:1682
msgid "_Discard changes"
+msgstr "Descar_ta els canvis"
+
+#: ../gitg/commit/gitg-commit.vala:1694
+#, fuzzy
+msgid "D_elete file"
+msgid_plural "D_elete files"
+msgstr[0] "Suprimeix"
+msgstr[1] "Suprimeix"
+
+#: ../gitg/commit/gitg-commit.vala:1724
+msgid "_Edit file"
+msgstr "_Edita el fitxer"
+
+#: ../gitg/gitg-action-support.vala:95
+#, fuzzy, c-format
+msgid "Failed to stash changes: %s"
+msgstr "No s'han pogut descartar els canvis"
+
+#: ../gitg/gitg-action-support.vala:130
+#, fuzzy
+msgid "Unstaged changes"
+msgstr "_Elimina del guardat temporal"
+
+#: ../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 ""
-#: ../gitg/gitg-application.vala:55
+#: ../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 "Cancel·la"
+
+#: ../gitg/gitg-action-support.vala:134
+#, fuzzy
+msgid "Stash changes"
+msgstr "Al_ça temporalment els canvis"
+
+#: ../gitg/gitg-action-support.vala:138 ../gitg/gitg-action-support.vala:165
+#, fuzzy
+msgid "Failed with conflicts"
+msgstr "No s'ha pogut publicar"
+
+#: ../gitg/gitg-action-support.vala:181
+#, fuzzy, c-format
+msgid "Failed to checkout conflicts: %s"
+msgstr "No s'ha pogut obtindre des de %s: %s"
+
+#: ../gitg/gitg-action-support.vala:199
+#, fuzzy
+msgid "Failed to obtain author details"
+msgstr "No s'ha pogut guardar temporalment el fitxer «%s»"
+
+#: ../gitg/gitg-action-support.vala:223
+#: ../gitg/gitg-ref-action-checkout.vala:88
+#, fuzzy, c-format
+msgid "Failed to lookup commit: %s"
+msgstr "No s'ha visualitzar l'etiqueta"
+
+#: ../gitg/gitg-action-support.vala:255
+#, fuzzy, c-format
+msgid "Failed to create commit: %s"
+msgstr "No s'ha pogut crear l'etiqueta"
+
+#: ../gitg/gitg-action-support.vala:277
+#, fuzzy, c-format
+msgid "Failed to checkout index: %s"
+msgstr "No s'ha pogut obtindre des de %s: %s"
+
+#: ../gitg/gitg-application.vala:56
msgid "Show the application's version"
msgstr "Mostra la versió de l'aplicació"
-#: ../gitg/gitg-application.vala:58
+#: ../gitg/gitg-application.vala:59
msgid "Start gitg with a particular activity"
msgstr "Inicieu el gitg amb una activitat en concret"
-#: ../gitg/gitg-application.vala:61
+#: ../gitg/gitg-application.vala:62
msgid "Start gitg with the commit activity (shorthand for --activity commit)"
msgstr ""
"Inicieu el gitg amb l'activitat de publicació (abreviatura per a «--activity "
"commit»)"
-#: ../gitg/gitg-application.vala:64
+#: ../gitg/gitg-application.vala:65
msgid "Do not try to load a repository from the current working directory"
msgstr "No proves de carregar un dipòsit des del directori de treball actual"
-#: ../gitg/gitg-application.vala:88
+#: ../gitg/gitg-application.vala:94
msgid "- Git repository viewer"
msgstr "- visualitzador de dipòsits Git"
-#: ../gitg/gitg-application.vala:206
+#: ../gitg/gitg-application.vala:222
msgid "gitg is a Git repository viewer for gtk+/GNOME"
msgstr "El gitg és un visualitzador de dipòsits Git per a gtk+/GNOME"
-#: ../gitg/gitg-application.vala:215
+#: ../gitg/gitg-application.vala:231
msgid "translator-credits"
msgstr "Pau Iranzo <pau iranzo softcatala org>"
-#: ../gitg/gitg-application.vala:218
+#: ../gitg/gitg-application.vala:234
msgid "gitg homepage"
msgstr "Pàgina d'inici del gitg"
-#: ../gitg/gitg-author-details-dialog.vala:67
-msgid "Unable to open the .gitconfig file."
-msgstr "No s'ha pogut obrir el fitxer .gitconfig."
+#: ../gitg/gitg-application.vala:364
+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 ""
+"gitg requereix la libgit2 (una biblioteca de la qual depèn el gitg) "
+"compilada amb compatibilitat de fils.\n"
+"\n"
+"Si heu compilat manualment la libgit2, configureu-la amb -DTHREADSAFE:"
+"BOOL=ON.\n"
+"\n"
+"Si no és el cas, llavors envieu un informe d'errada a l'eina d'informació "
+"d'errades de la vostra distribució per tal que es proporcioni la libgit2 amb "
+"compatibilitat de fils."
+
+#. ex: ts=4 noet
+#: ../gitg/gitg-author-details-dialog.vala:97
+#: ../gitg/gitg-author-details-dialog.vala:117
+#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
+msgid "Author Details"
+msgstr "Dades de l'autor"
+
+#: ../gitg/gitg-author-details-dialog.vala:98
+#, fuzzy
+msgid "Enter default details used for all repositories:"
+msgstr ""
+"Introduïu les dades que s'utilitzaran per defecte per a tots els dipòsits:"
-#: ../gitg/gitg-author-details-dialog.vala:149
+#. Translators: %s is the repository name
+#: ../gitg/gitg-author-details-dialog.vala:120
+#, fuzzy, c-format
+msgid "Override global details for repository '%s':"
+msgstr "Introduïu les dades per al dipòsit «%s»:"
+
+#: ../gitg/gitg-author-details-dialog.vala:232
msgid "Failed to set Git user config."
msgstr "No s'ha pogut definir la configuració d'usuari Git."
-#: ../gitg/gitg-clone-dialog.vala:88
+#: ../gitg/gitg-clone-dialog.vala:89
msgid "The URL introduced is not supported"
msgstr "L'URL que s'ha introduït no és compatible"
-#: ../gitg/gitg-commit-action-create-branch.vala:48
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
-msgid "Create Branch"
+#: ../gitg/gitg-commit-action-cherry-pick.vala:53
+msgid "Cherry pick onto"
msgstr ""
-#: ../gitg/gitg-commit-action-create-branch.vala:53
-msgid "Create a new branch at the selected commit"
+#: ../gitg/gitg-commit-action-cherry-pick.vala:58
+msgid "Cherry pick this commit onto a branch"
msgstr ""
-#: ../gitg/gitg-commit-action-create-branch.vala:85
+#: ../gitg/gitg-commit-action-cherry-pick.vala:117
+#, fuzzy, c-format
+msgid "Failed to lookup the commit for branch %s: %s"
+msgstr "No s'ha visualitzar l'etiqueta"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:132
+#, fuzzy, c-format
+msgid "Failed to cherry-pick the commit: %s"
+msgstr "No s'ha pogut crear l'etiqueta"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:144
+#: ../gitg/gitg-commit-action-cherry-pick.vala:160
#, fuzzy
-msgid "Failed to create branch"
+msgid "Cherry pick has conflicts"
msgstr "No s'ha pogut publicar"
-#: ../gitg/gitg-commit-action-create-patch.vala:63
-msgid "Create Patch"
+#: ../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 ""
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:168
+#, fuzzy
+msgid "Cherry pick failed with conflicts"
+msgstr "No s'ha pogut publicar"
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:179
+msgid "Cherry pick finished with conflicts in working directory"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:199
+#, c-format
+msgid "Cherry pick %s onto %s"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:224
+msgid "Successfully cherry picked"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-cherry-pick.vala:261
+#, c-format
+msgid "Cherry pick onto %s"
+msgstr ""
+
+#: ../gitg/gitg-commit-action-create-branch.vala:48
+#, fuzzy
+msgid "Create branch"
+msgstr "Crea una branca"
+
+#: ../gitg/gitg-commit-action-create-branch.vala:53
+msgid "Create a new branch at the selected commit"
+msgstr "Crea una branca nova a la publicació seleccionada"
+
+#: ../gitg/gitg-commit-action-create-branch.vala:75
+msgid "Failed to create branch"
+msgstr "No s'ha pogut crear la branca"
+
+#: ../gitg/gitg-commit-action-create-patch.vala:63
+#, fuzzy
+msgid "Create patch"
+msgstr "Crea un pedaç"
+
#: ../gitg/gitg-commit-action-create-patch.vala:68
msgid "Create a patch from the selected commit"
-msgstr ""
+msgstr "Crea un pedaç de la publicació seleccionada"
-#: ../gitg/gitg-commit-action-create-patch.vala:141
+#: ../gitg/gitg-commit-action-create-patch.vala:143
msgid "Save Patch File"
msgstr "Guarda el fitxer de pedaç"
-#: ../gitg/gitg-commit-action-create-patch.vala:145
-#, fuzzy
+#: ../gitg/gitg-commit-action-create-patch.vala:147
msgid "_Save Patch"
-msgstr "Guarda el fitxer de pedaç"
+msgstr "Al_ça el fitxer de pedaç"
-#: ../gitg/gitg-commit-action-create-patch.vala:168
-#, fuzzy
+#: ../gitg/gitg-commit-action-create-patch.vala:172
msgid "Failed to create patch"
-msgstr "No s'ha pogut publicar"
+msgstr "No s'ha pogut crear el pedaç"
#: ../gitg/gitg-commit-action-create-tag.vala:48
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
-msgid "Create Tag"
-msgstr ""
+#, fuzzy
+msgid "Create tag"
+msgstr "Crea una etiqueta"
#: ../gitg/gitg-commit-action-create-tag.vala:53
msgid "Create a new tag at the selected commit"
-msgstr ""
+msgstr "Crea una etiqueta nova a la publicació seleccionada"
#: ../gitg/gitg-commit-action-create-tag.vala:92
-#, fuzzy
msgid "Failed to create tag"
-msgstr "No s'ha pogut publicar"
+msgstr "No s'ha pogut crear l'etiqueta"
#: ../gitg/gitg-commit-action-create-tag.vala:109
-#, fuzzy
msgid "Failed to lookup tag"
-msgstr "No s'ha pogut publicar"
+msgstr "No s'ha trobat l'etiqueta"
-#: ../gitg/gitg-create-tag-dialog.vala:106
+#: ../gitg/gitg-create-tag-dialog.vala:110
msgid "Provide a message to create an annotated tag"
+msgstr "Proporcioneu un missatge per a crear una etiqueta anotada"
+
+#: ../gitg/gitg-dash-view.vala:87
+msgid "Select and manage projects"
msgstr ""
-#: ../gitg/gitg-dash-view.vala:141
-msgid "_Delete"
+#: ../gitg/gitg-dash-view.vala:176
+#, fuzzy
+#| msgid "Remotes"
+msgid "_Remove"
+msgstr "Ubicacions remotes"
+
+#. Translators: the two %s will be replaced to create a link to perform the scanning action.
+#: ../gitg/gitg-dash-view.vala:232
+#, c-format
+msgid "We can also %sscan your home directory%s for git repositories."
msgstr ""
+#. Translators: the two %s will be used to create a link to the author dialog.
+#: ../gitg/gitg-dash-view.vala:235
+#, c-format
+msgid "In the mean time, you may want to %sset up your git profile%s."
+msgstr ""
+
+#: ../gitg/gitg-dash-view.vala:389
+msgid "Failed to clone repository"
+msgstr "No s'ha pogut clonar el dipòsit"
+
+#: ../gitg/gitg-dash-view.vala:420
+msgid "Failed to add repository"
+msgstr "No s'ha pogut afegir el dipòsit"
+
+#: ../gitg/gitg-dash-view.vala:436
+#, fuzzy
+msgid "Create new repository"
+msgstr "Clona el dipòsit"
+
+#. Translators: %s is a file name
+#: ../gitg/gitg-dash-view.vala:439
+#, 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 ""
+
+#: ../gitg/gitg-dash-view.vala:445
+#, fuzzy
+msgid "Create repository"
+msgstr "Dipòsit buit"
+
+#: ../gitg/gitg-dash-view.vala:461
+#, fuzzy
+msgid "Failed to create repository"
+msgstr "No s'ha pogut clonar el dipòsit"
+
+#: ../gitg/gitg-dash-view.vala:531
+#, c-format
+msgid "Scanning for repositories in %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-checkout.vala:53
+#, fuzzy
+msgid "Checkout the selected reference"
+msgstr "Suprimeix la referència seleccionada"
+
+#: ../gitg/gitg-ref-action-checkout.vala:72
+#, c-format
+msgid "Checkout %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-checkout.vala:101
+#, fuzzy, c-format
+msgid "Failed to checkout branch: %s"
+msgstr "No s'ha pogut suprimir la branca %s"
+
+#: ../gitg/gitg-ref-action-checkout.vala:111
+#, fuzzy, c-format
+msgid "Failed to update HEAD: %s"
+msgstr "No s'ha pogut suprimir l'etiqueta %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 "Copia el nom"
+
+#: ../gitg/gitg-ref-action-copy-name.vala:53
+msgid "Copy the name of the reference to the clipboard"
+msgstr "Copia el nom de la referència al porta-retalls"
+
#: ../gitg/gitg-ref-action-delete.vala:48
-#: ../gitg/gitg-ref-action-delete.vala:88
+#: ../gitg/gitg-ref-action-delete.vala:89
msgid "Delete"
-msgstr ""
+msgstr "Suprimeix"
#: ../gitg/gitg-ref-action-delete.vala:53
msgid "Delete the selected reference"
-msgstr ""
+msgstr "Suprimeix la referència seleccionada"
#: ../gitg/gitg-ref-action-delete.vala:73
#, c-format
msgid "Delete branch %s"
-msgstr ""
+msgstr "Suprimeix la branca %s"
#: ../gitg/gitg-ref-action-delete.vala:74
#, c-format
msgid "Are you sure that you want to permanently delete the branch %s?"
-msgstr ""
+msgstr "Esteu segur que voleu suprimir permanentment la branca %s?"
#: ../gitg/gitg-ref-action-delete.vala:78
#, c-format
msgid "Delete tag %s"
-msgstr ""
+msgstr "Suprimeix l'etiqueta %s"
#: ../gitg/gitg-ref-action-delete.vala:79
#, c-format
msgid "Are you sure that you want to permanently delete the tag %s?"
-msgstr ""
+msgstr "Esteu segur que voleu suprimir permanentment l'etiqueta %s?"
#: ../gitg/gitg-ref-action-delete.vala:83
#, c-format
msgid "Delete remote branch %s"
-msgstr ""
+msgstr "Suprimeix la branca remota %s"
#: ../gitg/gitg-ref-action-delete.vala:84
#, c-format
msgid "Are you sure that you want to permanently delete the remote branch %s?"
-msgstr ""
-
-#: ../gitg/gitg-ref-action-delete.vala:89
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:9
-msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Esteu segur que voleu suprimir permanentment la branca remota %s?"
#. Translators: %s is the name of the tag
#: ../gitg/gitg-ref-action-delete.vala:119
-#, fuzzy, c-format
+#, c-format
msgid "Failed to delete tag %s"
-msgstr "No s'ha pogut guardar temporalment el fitxer «%s»"
+msgstr "No s'ha pogut suprimir l'etiqueta %s"
#. Translators: the first %s is the name of the tag, the second is an error message
#: ../gitg/gitg-ref-action-delete.vala:122
#, c-format
msgid "The tag %s could not be deleted: %s"
-msgstr ""
+msgstr "L'etiqueta %s no s'ha pogut esborrar: %s"
#. Translators: %s is the name of the branch
#: ../gitg/gitg-ref-action-delete.vala:127
-#, fuzzy, c-format
+#, c-format
msgid "Failed to delete branch %s"
-msgstr "No s'ha pogut guardar temporalment el fitxer «%s»"
+msgstr "No s'ha pogut suprimir la branca %s"
#. Translators: the first %s is the name of the branch, the second is an error message
#: ../gitg/gitg-ref-action-delete.vala:130
#, c-format
msgid "The branch %s could not be deleted: %s"
+msgstr "La branca %s no s'ha pogut esborrar: %s"
+
+#: ../gitg/gitg-ref-action-fetch.vala:74
+#, c-format
+msgid "Fetch from %s"
+msgstr "Obté des de %s"
+
+#: ../gitg/gitg-ref-action-fetch.vala:85
+#, c-format
+msgid "Fetch remote objects from %s"
+msgstr "Obté els objectes remots des de %s"
+
+#: ../gitg/gitg-ref-action-fetch.vala:98
+#, c-format
+msgid "Fetching from %s"
+msgstr "S'està obtenint des de %s"
+
+#. Translators: new refers to a new remote reference having been fetched,
+#: ../gitg/gitg-ref-action-fetch.vala:106
+msgid "new"
+msgstr "nou"
+
+#. Translators: updated refers to a remote reference having been updated,
+#: ../gitg/gitg-ref-action-fetch.vala:111
+msgid "updated"
+msgstr "actualitzat"
+
+#: ../gitg/gitg-ref-action-fetch.vala:121
+#, c-format
+msgid "Failed to fetch from %s: %s"
+msgstr "No s'ha pogut obtindre des de %s: %s"
+
+#. Translators: the %s will get replaced with the remote url,
+#: ../gitg/gitg-ref-action-fetch.vala:134
+#, c-format
+msgid "Fetched from %s: everything is up to date"
+msgstr "S'ha obtingut des de %s: tot està actualitzat"
+
+#. 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:140
+#, c-format
+msgid "Fetched from %s: %s"
+msgstr "S'ha obtingut des de %s: %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:63
+#, c-format
+msgid "Merge into %s"
+msgstr ""
+
+#. TODO
+#: ../gitg/gitg-ref-action-merge.vala:69
+#, c-format
+msgid "Merge another branch into branch %s"
+msgstr ""
+
+#: ../gitg/gitg-ref-action-merge.vala:106
+#, fuzzy, c-format
+msgid "Failed to merge commits: %s"
+msgstr "No s'ha pogut publicar"
+
+#: ../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 "No s'ha visualitzar l'etiqueta"
+
+#: ../gitg/gitg-ref-action-merge.vala:241
+#, fuzzy, c-format
+msgid "Failed to lookup their commit: %s"
+msgstr "No s'ha visualitzar l'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 "Suprimeix la branca %s"
+
+#: ../gitg/gitg-ref-action-merge.vala:482
+#: ../gitg/history/gitg-history-refs-list.vala:1176
+msgid "Tags"
+msgstr "Etiquetes"
+
#: ../gitg/gitg-ref-action-rename.vala:48
msgid "Rename"
-msgstr ""
+msgstr "Reanomena"
#: ../gitg/gitg-ref-action-rename.vala:53
msgid "Rename the selected reference"
-msgstr ""
+msgstr "Reanomena la referència seleccionada"
#: ../gitg/gitg-ref-action-rename.vala:100
#, c-format
msgid "The specified name ‘%s’ contains invalid characters"
-msgstr ""
+msgstr "El nom especificat «%s» conté caràcters invàlids"
#: ../gitg/gitg-ref-action-rename.vala:102
msgid "Invalid name"
-msgstr ""
+msgstr "Nom invàlid"
-#: ../gitg/gitg-ref-action-rename.vala:141
-#, fuzzy
+#: ../gitg/gitg-ref-action-rename.vala:131
msgid "Failed to rename"
-msgstr "No s'ha pogut publicar"
+msgstr "No s'ha pogut reanomenar"
-#: ../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."
-msgstr ""
-"gitg requereix la libgit2 (una biblioteca de la qual depèn el gitg) "
-"compilada amb compatibilitat de fils.\n"
-"\n"
-"Si heu compilat manualment la libgit2, configureu-a amb -DTHREADSAFE:"
-"BOOL=ON.\n"
-"\n"
-"Si no és el cas, llavors envieu un informe d'errada a l'eina d'informació "
-"d'errades de la vostra distribució per tal que es proporcioni la libgit2 amb "
-"compatibilitat de fils."
+#: ../gitg/gitg-remote-notification.vala:90
+#: ../gitg/gitg-simple-notification.vala:99
+#: ../gitg/resources/ui/gitg-window.ui.h:10
+msgid "Close"
+msgstr "Tanca"
+
+#: ../gitg/gitg-window.vala:187
+msgid "Add Repository"
+msgstr "Afig un dipòsit"
+
+#: ../gitg/gitg-window.vala:191
+msgid "_Add"
+msgstr "_Afig"
-#: ../gitg/gitg-window.vala:389
+#: ../gitg/gitg-window.vala:193
+#, fuzzy
+msgid "_Scan for all git repositories from this directory"
+msgstr "No proves de carregar un dipòsit des del directori de treball actual"
+
+#: ../gitg/gitg-window.vala:501
msgid "Projects"
msgstr "Projectes"
-#: ../gitg/gitg-window.vala:430
-msgid "Open Repository"
-msgstr "Obri el dipòsit"
-
-#: ../gitg/gitg-window.vala:433
-msgid "_Open"
-msgstr "_Obri"
+#: ../gitg/gitg-window.vala:751
+msgid "Select items"
+msgstr ""
-#: ../gitg/gitg-window.vala:707
+#: ../gitg/gitg-window.vala:958
#, c-format
msgid "'%s' is not a Git repository."
msgstr "«%s» no és un dipòsit Git."
-#: ../gitg/history/gitg-history-refs-list.vala:136
+#: ../gitg/gitg-window.vala:1107
+msgid ""
+"Your user name and email are not configured yet. Please go to the user "
+"configuration and provide your name and email."
+msgstr ""
+"No heu configurat el vostre nom d'usuari ni el correu electrònic. Aneu a la "
+"configuració d'usuari i afegiu-hi el vostre nom i correu."
+
+#: ../gitg/gitg-window.vala:1111
+msgid ""
+"Your user name is not configured yet. Please go to the user configuration "
+"and provide your name."
+msgstr ""
+"No heu configurat el vostre nom d'usuari. Aneu a la configuració d'usuari i "
+"afegiu-li."
+
+#: ../gitg/gitg-window.vala:1115
+msgid ""
+"Your email is not configured yet. Please go to the user configuration and "
+"provide your email."
+msgstr ""
+"No heu configurat el vostre correu electrònic. Aneu a la configuració "
+"d'usuari i afegiu-li."
+
+#: ../gitg/gitg-window.vala:1118
+#, fuzzy
+msgid "Missing author details"
+msgstr "Dades de l'autor"
+
+#: ../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 "%zu ahead, %zu behind"
+msgstr ""
+
+#: ../gitg/history/gitg-history-refs-list.vala:169
+#, c-format
+msgid "%zu ahead"
+msgstr ""
+
+#: ../gitg/history/gitg-history-refs-list.vala:173
+#, c-format
+msgid "%zu behind"
+msgstr ""
+
+#: ../gitg/history/gitg-history-refs-list.vala:207
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
msgid "All commits"
msgstr "Totes les publicacions"
-#: ../gitg/history/gitg-history-refs-list.vala:674
+#: ../gitg/history/gitg-history-refs-list.vala:1174
msgid "Branches"
msgstr "Branques"
-#: ../gitg/history/gitg-history-refs-list.vala:675
+#: ../gitg/history/gitg-history-refs-list.vala:1175
msgid "Remotes"
msgstr "Ubicacions remotes"
-#: ../gitg/history/gitg-history-refs-list.vala:676
-msgid "Tags"
-msgstr "Etiquetes"
-
-#: ../gitg/history/gitg-history.vala:219
-#: ../gitg/preferences/gitg-preferences-history.vala:144
+#: ../gitg/history/gitg-history.vala:342
+#: ../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:224
+#: ../gitg/history/gitg-history.vala:347
msgid "Examine the history of the repository"
-msgstr ""
+msgstr "Examina la història del dipòsit"
+
+#: ../gitg/history/gitg-history.vala:909
+msgid "Mainline"
+msgstr "Línia principal"
-#: ../gitg/preferences/gitg-preferences-interface.vala:73
+#: ../gitg/preferences/gitg-preferences-commit.vala:119
+msgctxt "Preferences"
+msgid "Commit"
+msgstr "Publicació"
+
+#: ../gitg/preferences/gitg-preferences-interface.vala:120
msgid "Interface"
msgstr "Interfície"
+#. Translators: %s will be replaced with a URL indicating the resource
+#. for which the authentication is required.
+#: ../libgitg/gitg-authentication-dialog.vala:69
+#, c-format
+msgid "Password required for %s"
+msgstr ""
+
#: ../libgitg/gitg-date.vala:346
msgid "Now"
msgstr "Ara"
@@ -717,55 +1310,120 @@ msgstr[1] "Fa %d dies"
#. clock.
#: ../libgitg/gitg-date.vala:374
msgid "%b %e, %H:%M"
-msgstr ""
+msgstr "%b %e, %H:%M"
#. Translators: this is a strftime type date format which is
#. used when the date is in the current year and uses a 12 hour
#. clock.
#: ../libgitg/gitg-date.vala:381
msgid "%b %e, %I:%M %p"
-msgstr ""
+msgstr "%b %e, %I:%M %p"
#. Translators: this is a strftime type date format which is
#. used when the date is not in the current year and uses a 24
#. hour clock.
#: ../libgitg/gitg-date.vala:391
msgid "%b %e %Y, %H:%M"
-msgstr ""
+msgstr "%b %e %Y, %H:%M"
#. Translators: this is a strftime type date format which is
#. used when the date is not in the current year and uses a 12
#. hour clock.
#: ../libgitg/gitg-date.vala:398
msgid "%b %e %Y, %I:%M %p"
+msgstr "%b %e %Y, %I:%M %p"
+
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: ../libgitg/gitg-diff-image-side-by-side.vala:39
+#, c-format
+msgid "before (%s)"
msgstr ""
-#: ../libgitg/gitg-diff-view.vala:229
-msgid "stage"
-msgstr "guarda temporalment"
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: ../libgitg/gitg-diff-image-side-by-side.vala:45
+#, c-format
+msgid "removed (%s)"
+msgstr ""
-#: ../libgitg/gitg-diff-view.vala:230
-msgid "unstage"
-msgstr "trau del guardat temporal"
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: ../libgitg/gitg-diff-image-side-by-side.vala:67
+#, c-format
+msgid "after (%s)"
+msgstr ""
-#: ../libgitg/gitg-diff-view.vala:231
-msgid "Loading diff…"
-msgstr "S'està carregant les diferències…"
+#. Translators: this label is displayed below the image diff, %s
+#. is substituted with the size of the image
+#: ../libgitg/gitg-diff-image-side-by-side.vala:73
+#, c-format
+msgid "added (%s)"
+msgstr ""
+
+#: ../libgitg/gitg-diff-view-commit-details.vala:145
+#, fuzzy
+msgid "Collapse all"
+msgstr "Contrau els carrils inactius"
+
+#: ../libgitg/gitg-diff-view-commit-details.vala:149
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2
+msgid "Expand all"
+msgstr ""
-#: ../libgitg/gitg-stage.vala:335
+#: ../libgitg/gitg-diff-view-commit-details.vala:202
+#, fuzzy, c-format
+#| msgid "Committed by:"
+msgid "Committed by %s"
+msgstr "Publicat per:"
+
+#: ../libgitg/gitg-diff-view-file.vala:177
+#, fuzzy
+#| msgid "_Open"
+msgid "_Open file"
+msgstr "_Obri"
+
+#: ../libgitg/gitg-diff-view-file.vala:209
+msgid "Open containing _folder"
+msgstr ""
+
+#: ../libgitg/gitg-diff-view-file.vala:229
+msgid "_Copy file path"
+msgstr ""
+
+#. 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 ""
+
+#. 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-repository-list-box.vala:541
+#, fuzzy
+#| msgid "Cloning..."
+msgid "Cloning…"
+msgstr "S'està clonant..."
+
+#: ../libgitg/gitg-stage.vala:334
#, c-format
msgid "Could not read commit message after running commit-msg hook: %s"
msgstr ""
"No s'ha pogut llegir el missatge de publicació després de l'execució del "
"lligam commit-msg: %s"
-#: ../plugins/diff/gitg-diff.vala:89
+#: ../plugins/diff/gitg-diff.vala:115
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11
msgid "Diff"
msgstr "Diferència"
-#: ../plugins/diff/gitg-diff.vala:94
+#: ../plugins/diff/gitg-diff.vala:120
msgid "Show the changes introduced by the selected commit"
-msgstr ""
+msgstr "Mostra els canvis introduïts per la publicació seleccionada"
#: ../plugins/files/gitg-files.vala:63
msgid "Files"
@@ -773,40 +1431,28 @@ msgstr "Fitxers"
#: ../plugins/files/gitg-files.vala:68
msgid "Show the files in the tree of the selected commit"
-msgstr ""
-
-#. ex: ts=4 noet
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1
-msgid "Author Details"
-msgstr "Dades de l'autor"
+msgstr "Mostra els fitxers a l'arbre per la publicació seleccionada"
#: ../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: no existeix el fitxer de configuració Git «%s»."
+msgid "_Save"
+msgstr "Al_ça"
#: ../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 ""
"Introduïu les dades que s'utilitzaran per defecte per a tots els dipòsits:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:6
-#, no-c-format
-msgid "Enter details for repository '%s':"
-msgstr "Introduïu les dades per al dipòsit «%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 "Correu electrònic:"
-#: ../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 "Nom:"
-#: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:10
-msgid "Save"
-msgstr "Guarda"
-
#: ../gitg/resources/ui/gitg-clone-dialog.ui.h:1
msgid "Clone Repository"
msgstr "Clona el dipòsit"
@@ -831,6 +1477,11 @@ msgstr "Selecciona la ubicació…"
msgid "Bare repository"
msgstr "Dipòsit buit"
+#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:1
+msgctxt "Create Dialog"
+msgid "Commit"
+msgstr "Publicació"
+
#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:3
#: ../gitg/resources/ui/gitg-commit-paned.ui.h:2
msgid "C_ommit"
@@ -844,11 +1495,6 @@ msgstr "Afig la _signatura «signed-off-by»"
msgid "_Amend previous commit"
msgstr "_Corregeix la publicació anterior"
-#: ../gitg/resources/ui/gitg-commit-dialog.ui.h:6
-#: ../gitg/resources/ui/gitg-window.ui.h:6
-msgid "Close"
-msgstr "Tanca"
-
#: ../gitg/resources/ui/gitg-commit-paned.ui.h:1
msgid "Skip commit _hooks"
msgstr "Omet els _lligams de publicació"
@@ -858,69 +1504,96 @@ msgid "S_tage selection"
msgstr "Al_ça temporalment la selecció"
#: ../gitg/resources/ui/gitg-commit-paned.ui.h:4
-#, fuzzy
msgid "D_iscard selection"
-msgstr "_Trau del guardat temporal la selecció"
+msgstr "Descarta la selecc_ió"
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
-msgid "C_reate"
+#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:1
+msgid ""
+"The submodule is in a dirty state and has staged and/or unstaged changes "
+"that are not yet committed as shown below."
msgstr ""
+"El submòdul està en un estat brut i té canvis (guardats temporalment o no) que "
+"no s'han publicat encara tal com es mostra més avall."
-#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:4
-#, fuzzy
-msgid "Branch _name:"
-msgstr "Branques"
+#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:2
+msgid "Staged:"
+msgstr "En el guardat temporal:"
-#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
-msgid "Tag _name:"
-msgstr ""
+#: ../gitg/resources/ui/gitg-commit-submodule-diff-view.ui.h:3
+msgid "Unstaged:"
+msgstr "Fora del guardat temporal:"
+#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:1
#: ../gitg/resources/ui/gitg-history-paned.ui.h:1
msgid "Subject"
msgstr "Assumpte"
+#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:2
#: ../gitg/resources/ui/gitg-history-paned.ui.h:2
msgid "Author"
msgstr "Autor"
+#: ../gitg/resources/ui/gitg-commit-submodule-history-view.ui.h:3
#: ../gitg/resources/ui/gitg-history-paned.ui.h:3
msgid "Date"
msgstr "Data"
+#: ../gitg/resources/ui/gitg-commit-submodule-info.ui.h:1
+msgid "Open"
+msgstr "_Obri"
+
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:1
+msgid "Create Branch"
+msgstr "Crea una branca"
+
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:3
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:3
+msgid "C_reate"
+msgstr "C_rea"
+
+#: ../gitg/resources/ui/gitg-create-branch-dialog.ui.h:4
+msgid "Branch _name:"
+msgstr "Nom de la bra_nca:"
+
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:1
+msgid "Create Tag"
+msgstr "Crea una etiqueta"
+
+#: ../gitg/resources/ui/gitg-create-tag-dialog.ui.h:4
+msgid "Tag _name:"
+msgstr "_Nom de l'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 "Finestra _nova"
#: ../gitg/resources/ui/gitg-menus.ui.h:2
-msgid "_Preferences"
-msgstr "_Preferències"
+msgid "_Author Details"
+msgstr "Dades de l'_autor"
#: ../gitg/resources/ui/gitg-menus.ui.h:3
-msgid "_Help"
-msgstr "A_juda"
+msgid "_Preferences"
+msgstr "_Preferències"
#: ../gitg/resources/ui/gitg-menus.ui.h:4
+msgid "_Keyboard Shortcuts"
+msgstr ""
+
+#: ../gitg/resources/ui/gitg-menus.ui.h:5
msgid "_About"
msgstr "_Quant a"
-#: ../gitg/resources/ui/gitg-menus.ui.h:5
+#: ../gitg/resources/ui/gitg-menus.ui.h:6
msgid "_Quit"
msgstr "I_x"
-#: ../gitg/resources/ui/gitg-menus.ui.h:6
-msgid "_Open Repository…"
-msgstr "_Obri el dipòsit…"
-
#: ../gitg/resources/ui/gitg-menus.ui.h:7
-msgid "_Clone Repository…"
-msgstr "_Clona el dipòsit…"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:8
-msgid "_Author Details"
-msgstr "Dades de l'_autor"
-
-#: ../gitg/resources/ui/gitg-menus.ui.h:9
msgid "_Reload"
msgstr "To_rna a carregar"
@@ -945,93 +1618,313 @@ msgid "Commit Message"
msgstr "Missatge de publicació"
#: ../gitg/resources/ui/gitg-preferences-history.ui.h:1
-msgid "Commits"
-msgstr "Publicacions"
+#, fuzzy
+msgid "Default selection"
+msgstr "Descarta la selecc_ió"
#: ../gitg/resources/ui/gitg-preferences-history.ui.h:2
-msgid "Collapse inactive lanes"
-msgstr "Contrau els carrils inactius"
+#, fuzzy
+msgid "Current branch"
+msgstr "Crea una branca"
#: ../gitg/resources/ui/gitg-preferences-history.ui.h:3
-msgid "Show stash in history"
-msgstr "Mostra el guardat temporal a l'historial"
-
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:4
-msgid "Show staged changes in history"
-msgstr "Mostra els guardats temporals a l'historial"
+#, fuzzy
+msgid "All branches"
+msgstr "Branques"
#: ../gitg/resources/ui/gitg-preferences-history.ui.h:5
-msgid "Show unstaged changes in history"
-msgstr ""
-"Mostra els canvis que encara no estan en el guardat temporal a l'historial"
+#, fuzzy
+msgid "References"
+msgstr "Preferències"
#: ../gitg/resources/ui/gitg-preferences-history.ui.h:6
-msgid "Show history in topological order"
-msgstr "Mostra l'historial en orde topològic"
+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 "Publicacions"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:9
+msgid "Collapse inactive lanes"
+msgstr "Contrau els carrils inactius"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:10
msgid "Early"
msgstr "Prompte"
-#: ../gitg/resources/ui/gitg-preferences-history.ui.h:8
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:11
msgid "Late"
msgstr "Tard"
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:12
+msgid "Show history in topological order"
+msgstr "Mostra l'historial en orde topològic"
+
+#: ../gitg/resources/ui/gitg-preferences-history.ui.h:13
+msgid "Preserve mainline for currently checked out branch"
+msgstr ""
+"Preserva la línia principal per a la branca que s'està utilitzant actualment"
+
#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:1
+msgid "Startup"
+msgstr "Inici:"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:2
+msgid "Start with activity:"
+msgstr "Inicieu el gitg la següent activitat:"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:4
+msgid "Commit"
+msgstr "Publicació"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:5
msgid "Layout"
msgstr "Disposició"
-#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:2
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:6
msgid "Use horizontal layout"
msgstr "Utilitza la disposició horitzontal"
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:7
+msgid "Avatars"
+msgstr "Avatars"
+
+#: ../gitg/resources/ui/gitg-preferences-interface.ui.h:8
+msgid "Use gravatar service to provide user avatars"
+msgstr "Utilitza el servei gravatar per a proporcionar avatars d'usuaris"
+
+#: ../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 "Preferències"
+#: ../gitg/resources/ui/gitg-shortcuts.ui.h:1
+#, fuzzy
+#| msgid "_New Window"
+msgctxt "shortcut window"
+msgid "Windows"
+msgstr "Finestra _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
+#| msgid "_Open Repository…"
+msgctxt "shortcut window"
+msgid "Open a repository"
+msgstr "_Obri el dipòsit…"
+
+#: ../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
+#| msgid "Show the application's version"
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Mostra la versió de l'aplicació"
+
#: ../gitg/resources/ui/gitg-window.ui.h:2
msgid "Show the list of recently used repositories"
-msgstr ""
+msgstr "Mostra la llista de dipòsits utilitzats recentment."
#: ../gitg/resources/ui/gitg-window.ui.h:3
-msgid "Find a word or phrase"
+msgid "Clone"
msgstr ""
#: ../gitg/resources/ui/gitg-window.ui.h:4
+#, fuzzy
+msgid "Clone repository"
+msgstr "Clona el dipòsit"
+
+#: ../gitg/resources/ui/gitg-window.ui.h:5
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "_Afig"
+
+#: ../gitg/resources/ui/gitg-window.ui.h:6
+#, fuzzy
+msgid "Add repository"
+msgstr "Afig un dipòsit"
+
+#: ../gitg/resources/ui/gitg-window.ui.h:7
+msgid "Find a word or phrase"
+msgstr "Busca una paraula o frase"
+
+#: ../gitg/resources/ui/gitg-window.ui.h:8
msgid "General settings and options"
-msgstr ""
+msgstr "Paràmetres i opcions generals"
+
+#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:2
+msgid "_Authenticate"
+msgstr "_Autentica"
-#: ../libgitg/resources/diff-view-options.ui.h:1
-msgid "Ignore whitespace changes"
+#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:3
+msgid ""
+"The previous attempt to authenticate has failed, please provide your user "
+"name and password and try again."
msgstr ""
+"L'intent anterior per autenticar-vos ha fallat, torneu a proporcionar el "
+"vostre nom i contrasenya i proveu de nou."
+
+#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:4
+msgid "_Username:"
+msgstr "Nom d'_usuari:"
+
+#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:5
+msgid "_Password:"
+msgstr "Contrasen_ya:"
-#: ../libgitg/resources/diff-view-options.ui.h:2
+#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:6
+msgid "Forget password _immediately"
+msgstr "Oblida la contrasenya immediatament"
+
+#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:7
+msgid "Remember password until you _logout"
+msgstr "Recorda la contrasenya fins que isca de la sessió"
+
+#: ../libgitg/resources/ui/gitg-authentication-dialog.ui.h:8
+msgid "Remember _forever"
+msgstr "Recorda _permanentment"
+
+#: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1
#, fuzzy
-msgid "Show changes inline"
-msgstr "Mostra els guardats temporals a l'historial"
+#| msgid "Parents:"
+msgid "Parents"
+msgstr "Pares:"
-#: ../libgitg/resources/diff-view-options.ui.h:3
-msgid "Developer tools"
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1
+msgid "Unable to display changes for binary file"
msgstr ""
-#: ../libgitg/resources/diff-view-options.ui.h:4
-msgid "Tab width"
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1
+msgid "Side by side"
msgstr ""
-#: ../libgitg/resources/diff-view-options.ui.h:5
-msgid "Context"
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2
+msgid "Slider"
msgstr ""
-#: ../libgitg/resources/gitg-repository-list-box-row.ui.h:1
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3
+msgid "Overlay"
+msgstr ""
+
+#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4
+#, fuzzy
+msgid "Difference"
+msgstr "Preferències"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1
+#, fuzzy
+#| msgid "Tab width"
+msgid "Tab width:"
+msgstr "Amplària de la tabulació"
+
+#: ../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 changes"
+msgid "Ignore whitespace:"
+msgstr "Ignora els canvis d'espais en blanc"
+
+#: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1
+#, fuzzy
+#| msgid "Context"
+msgid "Context:"
+msgstr "Context"
+
+#: ../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 "
"disk)"
msgstr ""
"Suprimeix el dipòsit de la llista (no se suprimeix el dipòsit del disc dur)"
-#: ../plugins/files/resources/view-files.ui.h:1
-msgid "column"
-msgstr "columna"
+#~ msgid "_Delete"
+#~ msgstr "_Suprimeix"
+
+#, fuzzy
+#~ msgid "Failed to obtain HEAD tree: %s"
+#~ msgstr "No s'ha pogut desar temporalment el fitxer «%s»"
+
+#~ msgid "stage"
+#~ msgstr "desa temporalment"
+
+#~ msgid "unstage"
+#~ msgstr "treu del desat temporal"
+
+#~ msgid "Loading diff…"
+#~ msgstr "S'està carregant les diferències…"
+
+#~ msgid "Notes:"
+#~ msgstr "Notes:"
+
+#~ msgid "Diff against:"
+#~ msgstr "Calcula les diferències front a:"
+
+#~ msgid "_Help"
+#~ msgstr "A_juda"
+
+#~ msgid "Show changes inline"
+#~ msgstr "Mostra els canvis en línia"
+
+#~ msgid "Developer tools"
+#~ msgstr "Eines de desenvolupament"
+
+#~ msgid "column"
+#~ msgstr "columna"
+
+#~ msgid "Unable to open the .gitconfig file."
+#~ msgstr "No s'ha pogut obrir el fitxer .gitconfig."
+
+#~ msgid "Note: The Git config file '%s' does not exist."
+#~ msgstr "Nota: no existeix el fitxer de configuració Git «%s»."
+
+#~ msgid "Save"
+#~ msgstr "Desa"
+
+#~ msgid "_Clone Repository…"
+#~ msgstr "_Clona el dipòsit…"
-#~ msgid "_Save"
-#~ msgstr "De_sa"
+#~ msgid "Show stash in history"
+#~ msgstr "Mostra el desat temporal a l'historial"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
