Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: ca.po: update translation
author
Alex Henrie
<alexhenrie24@gmail.com>
Mon, 28 Dec 2015 04:42:59 +0000
(21:42 -0700)
committer
Alex Henrie
<alexhenrie24@gmail.com>
Mon, 28 Dec 2015 04:42:59 +0000
(21:42 -0700)
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
po/ca.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
89f80d7
)
diff --git
a/po/ca.po
b/po/ca.po
index 66b1f501e7d13171667024c1eee186f9045f6df1..d364141a8d5bbd39179ff4e384f5c31657cf8f43 100644
(file)
--- a/
po/ca.po
+++ b/
po/ca.po
@@
-7,8
+7,8
@@
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-12-
11 23:36
+0800\n"
-"PO-Revision-Date: 2015-12-
18 23:36
-0700\n"
+"POT-Creation-Date: 2015-12-
22 22:50
+0800\n"
+"PO-Revision-Date: 2015-12-
27 21:42
-0700\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@
-76,7
+76,7
@@
msgstr "format"
msgid "archive format"
msgstr "format d'arxiu"
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:430 builtin/log.c:122
8
+#: archive.c:430 builtin/log.c:122
9
msgid "prefix"
msgstr "prefix"
msgid "prefix"
msgstr "prefix"
@@
-289,7
+289,7
@@
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:849 builtin/log.c:14
56 builtin/log.c:1689
builtin/merge.c:358
+#: builtin/log.c:849 builtin/log.c:14
61 builtin/log.c:1694
builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
@@
-329,7
+329,7
@@
msgstr "El rev-list s'ha mort"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:136
6
builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:136
9
builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
@@
-1278,16
+1278,16
@@
msgstr[1] ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
-#: revision.c:219
1
+#: revision.c:219
3
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla trencada"
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla trencada"
-#: revision.c:219
4
+#: revision.c:219
6
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la vostra branca actual '%s' encara no té cap comissió"
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la vostra branca actual '%s' encara no té cap comissió"
-#: revision.c:23
88
+#: revision.c:23
90
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
@@
-1704,30
+1704,21
@@
msgstr "no s'ha pogut accedir a '%s': %s"
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a '%s'"
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a '%s'"
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr "no s'ha pogut trobar l'usuari actual en el fitxer passwd: %s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "no hi ha tal usuari"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
-#: wrapper.c:6
47
+#: wrapper.c:6
35
#, c-format
msgid "could not open %s for writing"
msgstr "no s'ha pogut obrir '%s' per a escriptura"
#, c-format
msgid "could not open %s for writing"
msgstr "no s'ha pogut obrir '%s' per a escriptura"
-#: wrapper.c:6
58
builtin/am.c:425
+#: wrapper.c:6
46
builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "no s'ha pogut escriure a %s"
#, c-format
msgid "could not write to %s"
msgstr "no s'ha pogut escriure a %s"
-#: wrapper.c:6
64
+#: wrapper.c:6
52
#, c-format
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
#, c-format
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
@@
-2262,14
+2253,14
@@
msgstr ""
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:54
5
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:54
3
#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "marxa en sec"
#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "marxa en sec"
#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:164
0
builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/log.c:164
5
builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "sigues detallat"
msgid "be verbose"
msgstr "sigues detallat"
@@
-2458,7
+2449,7
@@
msgstr ""
msgid "Patch is empty. Was it split wrong?"
msgstr "El pedaç és buit. S'ha dividit malament?"
msgid "Patch is empty. Was it split wrong?"
msgstr "El pedaç és buit. S'ha dividit malament?"
-#: builtin/am.c:1417 builtin/log.c:134
4
+#: builtin/am.c:1417 builtin/log.c:134
7
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
@@
-4288,7
+4279,7
@@
msgstr "realitza una fusió de 3 vies amb la branca nova"
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1151 builtin/log.c:126
3
parse-options.h:250
+#: builtin/checkout.c:1151 builtin/log.c:126
6
parse-options.h:250
msgid "style"
msgstr "estil"
msgid "style"
msgstr "estil"
@@
-4309,7
+4300,7
@@
msgid "do not check if another worktree is holding the given ref"
msgstr "no comprovis si altre arbre de treball té la referència donada"
#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
msgstr "no comprovis si altre arbre de treball té la referència donada"
#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
-#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:5
60
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:5
58
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "força l'informe de progrés"
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "força l'informe de progrés"
@@
-5200,7
+5191,7
@@
msgstr "mostra l'estat concisament"
msgid "show branch information"
msgstr "mostra la informació de branca"
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:54
6
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:54
4
#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
@@
-5330,7
+5321,7
@@
msgstr ""
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1588 builtin/log.c:121
5
builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:121
6
builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
@@
-5900,7
+5891,7
@@
msgstr "aprofundeix la història d'un clon superficial"
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:118 builtin/log.c:123
2
+#: builtin/fetch.c:118 builtin/log.c:123
3
msgid "dir"
msgstr "directori"
msgid "dir"
msgstr "directori"
@@
-7224,183
+7215,187
@@
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
msgid "Two output directories?"
msgstr "Dos directoris de sortida?"
msgid "Two output directories?"
msgstr "Dos directoris de sortida?"
-#: builtin/log.c:121
0
+#: builtin/log.c:121
1
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
-#: builtin/log.c:121
3
+#: builtin/log.c:121
4
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:121
7
+#: builtin/log.c:121
8
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:12
19
+#: builtin/log.c:12
20
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:122
1
+#: builtin/log.c:122
2
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
-#: builtin/log.c:122
2
+#: builtin/log.c:122
3
msgid "sfx"
msgstr "sufix"
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:122
3
+#: builtin/log.c:122
4
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:122
5
+#: builtin/log.c:122
6
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
-#: builtin/log.c:122
7
+#: builtin/log.c:122
8
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:12
29
+#: builtin/log.c:12
30
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:123
2
+#: builtin/log.c:123
3
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:123
5
+#: builtin/log.c:123
6
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:123
8
+#: builtin/log.c:123
9
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1240
+#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "emet un hash de tots zeros en la capçalera From"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
-#: builtin/log.c:124
2
+#: builtin/log.c:124
5
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
-#: builtin/log.c:124
4
+#: builtin/log.c:124
7
msgid "Messaging"
msgstr "Missatgeria"
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:124
5
+#: builtin/log.c:124
8
msgid "header"
msgstr "capçalera"
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:124
6
+#: builtin/log.c:124
9
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:12
47 builtin/log.c:1249
+#: builtin/log.c:12
50 builtin/log.c:1252
msgid "email"
msgstr "correu electrònic"
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:12
47
+#: builtin/log.c:12
50
msgid "add To: header"
msgstr "afegeix la capçalera To:"
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:12
49
+#: builtin/log.c:12
52
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:125
1
+#: builtin/log.c:125
4
msgid "ident"
msgstr "identitat"
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:125
2
+#: builtin/log.c:125
5
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
-#: builtin/log.c:125
4
+#: builtin/log.c:125
7
msgid "message-id"
msgstr "ID de missatge"
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:125
5
+#: builtin/log.c:125
8
msgid "make first mail a reply to <message-id>"
msgstr "fes del primer missatge una resposta a <ID de missatge>"
msgid "make first mail a reply to <message-id>"
msgstr "fes del primer missatge una resposta a <ID de missatge>"
-#: builtin/log.c:125
6 builtin/log.c:1259
+#: builtin/log.c:125
9 builtin/log.c:1262
msgid "boundary"
msgstr "límit"
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:12
57
+#: builtin/log.c:12
60
msgid "attach the patch"
msgstr "ajunta el pedaç"
msgid "attach the patch"
msgstr "ajunta el pedaç"
-#: builtin/log.c:126
0
+#: builtin/log.c:126
3
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:126
4
+#: builtin/log.c:126
7
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:126
6
+#: builtin/log.c:126
9
msgid "signature"
msgstr "firma"
msgid "signature"
msgstr "firma"
-#: builtin/log.c:12
67
+#: builtin/log.c:12
70
msgid "add a signature"
msgstr "afegeix una firma"
msgid "add a signature"
msgstr "afegeix una firma"
-#: builtin/log.c:12
69
+#: builtin/log.c:12
72
msgid "add a signature from a file"
msgstr "afegeix una firma des d'un fitxer"
msgid "add a signature from a file"
msgstr "afegeix una firma des d'un fitxer"
-#: builtin/log.c:127
0
+#: builtin/log.c:127
3
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:13
59
+#: builtin/log.c:13
62
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:136
1
+#: builtin/log.c:136
4
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix i -k són mutualment exclusius."
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix i -k són mutualment exclusius."
-#: builtin/log.c:13
69
+#: builtin/log.c:13
72
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:137
1
+#: builtin/log.c:137
4
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:137
3
+#: builtin/log.c:137
6
msgid "--check does not make sense"
msgstr "--check no té sentit"
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1
396
+#: builtin/log.c:1
401
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1
398
+#: builtin/log.c:1
403
#, c-format
msgid "Could not create directory '%s'"
msgstr "No s'ha pogut crear el directori '%s'"
#, c-format
msgid "Could not create directory '%s'"
msgstr "No s'ha pogut crear el directori '%s'"
-#: builtin/log.c:1
495
+#: builtin/log.c:1
500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de firma '%s'"
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de firma '%s'"
-#: builtin/log.c:15
58
+#: builtin/log.c:15
63
msgid "Failed to create output files"
msgstr "S'ha fallat en crear els fitxers de sortida"
msgid "Failed to create output files"
msgstr "S'ha fallat en crear els fitxers de sortida"
-#: builtin/log.c:16
06
+#: builtin/log.c:16
11
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:166
0
+#: builtin/log.c:166
5
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@
-7408,7
+7403,7
@@
msgstr ""
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
"<font> manualment.\n"
-#: builtin/log.c:167
1 builtin/log.c:1673 builtin/log.c:1685
+#: builtin/log.c:167
6 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
@@
-8851,19
+8846,19
@@
msgstr "No es pot fusionar múltiples branques a un cap buit."
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot rebasar sobre múltiples branques."
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot rebasar sobre múltiples branques."
-#: builtin/push.c:1
5
+#: builtin/push.c:1
6
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/push.c:8
6
+#: builtin/push.c:8
8
msgid "tag shorthand without <tag>"
msgstr "abreviatura d'etiqueta sense <tag>"
msgid "tag shorthand without <tag>"
msgstr "abreviatura d'etiqueta sense <tag>"
-#: builtin/push.c:9
6
+#: builtin/push.c:9
8
msgid "--delete only accepts plain target ref names"
msgstr "--delete només accepta noms de referència de destí senzills"
msgid "--delete only accepts plain target ref names"
msgstr "--delete només accepta noms de referència de destí senzills"
-#: builtin/push.c:14
0
+#: builtin/push.c:14
2
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@
-8872,7
+8867,7
@@
msgstr ""
"Per a triar qualsevulla opció permanentment, vegeu push.default a 'git help "
"config'."
"Per a triar qualsevulla opció permanentment, vegeu push.default a 'git help "
"config'."
-#: builtin/push.c:14
3
+#: builtin/push.c:14
5
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@
-8897,7
+8892,7
@@
msgstr ""
" git push %s %s\n"
"%s"
" git push %s %s\n"
"%s"
-#: builtin/push.c:1
58
+#: builtin/push.c:1
60
#, c-format
msgid ""
"You are not currently on a branch.\n"
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@
-8912,7
+8907,7
@@
msgstr ""
"\n"
" git push %s HEAD:<nom-de-branca-remota>\n"
"\n"
" git push %s HEAD:<nom-de-branca-remota>\n"
-#: builtin/push.c:17
2
+#: builtin/push.c:17
4
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@
-8925,12
+8920,12
@@
msgstr ""
"\n"
" git push --set-upstream %s %s\n"
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:18
0
+#: builtin/push.c:18
2
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "La branca actual %s té múltiples branques fonts, refusant pujar."
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "La branca actual %s té múltiples branques fonts, refusant pujar."
-#: builtin/push.c:18
3
+#: builtin/push.c:18
5
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@
-8941,7
+8936,7
@@
msgstr ""
"branca actual '%s', sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
"branca actual '%s', sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
-#: builtin/push.c:20
6
+#: builtin/push.c:20
8
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@
-8988,14
+8983,14
@@
msgstr ""
"'current' en lloc de 'simple' si a vegades useu versions més antigues\n"
"del Git)"
"'current' en lloc de 'simple' si a vegades useu versions més antigues\n"
"del Git)"
-#: builtin/push.c:27
3
+#: builtin/push.c:27
5
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"No heu especificat cap especificació de referència a pujar, i push.default "
"és \"nothing\"."
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"No heu especificat cap especificació de referència a pujar, i push.default "
"és \"nothing\"."
-#: builtin/push.c:28
0
+#: builtin/push.c:28
2
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@
-9007,7
+9002,7
@@
msgstr ""
"els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
"els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:28
6
+#: builtin/push.c:28
8
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@
-9020,7
+9015,7
@@
msgstr ""
"abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
"abans de pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:29
2
+#: builtin/push.c:29
4
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@
-9035,12
+9030,12
@@
msgstr ""
"pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
"pujar de nou.\n"
"Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
-#: builtin/push.c:
299
+#: builtin/push.c:
301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
-#: builtin/push.c:30
2
+#: builtin/push.c:30
4
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@
-9051,22
+9046,22
@@
msgstr ""
"fer que assenyali un objecte no de comissió, sense usar l'opció\n"
"'--force'.\n"
"fer que assenyali un objecte no de comissió, sense usar l'opció\n"
"'--force'.\n"
-#: builtin/push.c:36
1
+#: builtin/push.c:36
3
#, c-format
msgid "Pushing to %s\n"
msgstr "Pujant a %s\n"
#, c-format
msgid "Pushing to %s\n"
msgstr "Pujant a %s\n"
-#: builtin/push.c:36
5
+#: builtin/push.c:36
7
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha fallat en pujar algunes referències a '%s'"
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha fallat en pujar algunes referències a '%s'"
-#: builtin/push.c:39
5
+#: builtin/push.c:39
7
#, c-format
msgid "bad repository '%s'"
msgstr "dipòsit dolent '%s'"
#, c-format
msgid "bad repository '%s'"
msgstr "dipòsit dolent '%s'"
-#: builtin/push.c:39
6
+#: builtin/push.c:39
8
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@
-9088,100
+9083,104
@@
msgstr ""
"\n"
" git push <nom>\n"
"\n"
" git push <nom>\n"
-#: builtin/push.c:41
1
+#: builtin/push.c:41
3
msgid "--all and --tags are incompatible"
msgstr "--all i --tags són incompatibles"
msgid "--all and --tags are incompatible"
msgstr "--all i --tags són incompatibles"
-#: builtin/push.c:41
2
+#: builtin/push.c:41
4
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
-#: builtin/push.c:41
7
+#: builtin/push.c:41
9
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags són incompatibles"
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags són incompatibles"
-#: builtin/push.c:4
18
+#: builtin/push.c:4
20
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
-#: builtin/push.c:42
3
+#: builtin/push.c:42
5
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror són incompatibles"
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror són incompatibles"
-#: builtin/push.c:53
9
+#: builtin/push.c:53
7
msgid "repository"
msgstr "dipòsit"
msgid "repository"
msgstr "dipòsit"
-#: builtin/push.c:5
40
builtin/send-pack.c:161
+#: builtin/push.c:5
38
builtin/send-pack.c:161
msgid "push all refs"
msgstr "puja totes les referències"
msgid "push all refs"
msgstr "puja totes les referències"
-#: builtin/push.c:5
41
builtin/send-pack.c:163
+#: builtin/push.c:5
39
builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
-#: builtin/push.c:54
3
+#: builtin/push.c:54
1
msgid "delete refs"
msgstr "suprimeix les referències"
msgid "delete refs"
msgstr "suprimeix les referències"
-#: builtin/push.c:54
4
+#: builtin/push.c:54
2
msgid "push tags (can't be used with --all or --mirror)"
msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
msgid "push tags (can't be used with --all or --mirror)"
msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
-#: builtin/push.c:54
7
builtin/send-pack.c:164
+#: builtin/push.c:54
5
builtin/send-pack.c:164
msgid "force updates"
msgstr "força les actualitzacions"
msgid "force updates"
msgstr "força les actualitzacions"
-#: builtin/push.c:54
9
builtin/send-pack.c:175
+#: builtin/push.c:54
7
builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "nom-de-referència>:<esperat"
msgid "refname>:<expect"
msgstr "nom-de-referència>:<esperat"
-#: builtin/push.c:5
50
builtin/send-pack.c:176
+#: builtin/push.c:5
48
builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
msgid "require old value of ref to be at this value"
msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "comprova|sota demanda|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
-#: builtin/push.c:55
5
builtin/send-pack.c:169
+#: builtin/push.c:55
3
builtin/send-pack.c:169
msgid "use thin pack"
msgstr "usa el paquet prim"
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:55
6 builtin/push.c:557
builtin/send-pack.c:158
+#: builtin/push.c:55
4 builtin/push.c:555
builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "programa que rep els paquets"
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "programa que rep els paquets"
-#: builtin/push.c:55
8
+#: builtin/push.c:55
6
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
-#: builtin/push.c:5
61
+#: builtin/push.c:5
59
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
-#: builtin/push.c:56
3
+#: builtin/push.c:56
1
msgid "bypass pre-push hook"
msgstr "evita el ganxo de prepujada"
msgid "bypass pre-push hook"
msgstr "evita el ganxo de prepujada"
-#: builtin/push.c:56
4
+#: builtin/push.c:56
2
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
-#: builtin/push.c:56
7
builtin/send-pack.c:166
+#: builtin/push.c:56
5
builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "firma la pujada amb GPG"
msgid "GPG sign the push"
msgstr "firma la pujada amb GPG"
-#: builtin/push.c:56
9
builtin/send-pack.c:170
+#: builtin/push.c:56
7
builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
-#: builtin/push.c:57
9
+#: builtin/push.c:57
7
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete és incompatible amb --all, --mirror i --tags"
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete és incompatible amb --all, --mirror i --tags"
-#: builtin/push.c:5
81
+#: builtin/push.c:5
79
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"