l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
This commit is contained in:
parent
89f80d72c1
commit
62c9705d75
235
po/ca.po
235
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"
|
||||
"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"
|
||||
@ -76,7 +76,7 @@ msgstr "format"
|
||||
msgid "archive format"
|
||||
msgstr "format d'arxiu"
|
||||
|
||||
#: archive.c:430 builtin/log.c:1228
|
||||
#: archive.c:430 builtin/log.c:1229
|
||||
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
|
||||
#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358
|
||||
#: builtin/log.c:849 builtin/log.c:1461 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"
|
||||
@ -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'"
|
||||
|
||||
#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261
|
||||
#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
|
||||
#, 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"
|
||||
|
||||
#: revision.c:2191
|
||||
#: revision.c:2193
|
||||
msgid "your current branch appears to be broken"
|
||||
msgstr "la vostra branca actual sembla trencada"
|
||||
|
||||
#: revision.c:2194
|
||||
#: revision.c:2196
|
||||
#, 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:2388
|
||||
#: revision.c:2390
|
||||
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'"
|
||||
|
||||
#: 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"
|
||||
|
||||
#: wrapper.c:647
|
||||
#: wrapper.c:635
|
||||
#, c-format
|
||||
msgid "could not open %s for writing"
|
||||
msgstr "no s'ha pogut obrir '%s' per a escriptura"
|
||||
|
||||
#: wrapper.c:658 builtin/am.c:425
|
||||
#: wrapper.c:646 builtin/am.c:425
|
||||
#, c-format
|
||||
msgid "could not write to %s"
|
||||
msgstr "no s'ha pogut escriure a %s"
|
||||
|
||||
#: wrapper.c:664
|
||||
#: wrapper.c:652
|
||||
#, 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
|
||||
#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
|
||||
#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
|
||||
#: 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:1640 builtin/mv.c:109 builtin/read-tree.c:114
|
||||
#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
|
||||
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?"
|
||||
|
||||
#: builtin/am.c:1417 builtin/log.c:1344
|
||||
#: builtin/am.c:1417 builtin/log.c:1347
|
||||
#, 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)"
|
||||
|
||||
#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
|
||||
#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
|
||||
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
|
||||
#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
|
||||
#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
|
||||
#: 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"
|
||||
|
||||
#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
|
||||
#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
|
||||
#: 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)"
|
||||
|
||||
#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
|
||||
#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
|
||||
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"
|
||||
|
||||
#: builtin/fetch.c:118 builtin/log.c:1232
|
||||
#: builtin/fetch.c:118 builtin/log.c:1233
|
||||
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?"
|
||||
|
||||
#: builtin/log.c:1210
|
||||
#: builtin/log.c:1211
|
||||
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:1213
|
||||
#: builtin/log.c:1214
|
||||
msgid "use [PATCH] even with multiple patches"
|
||||
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
|
||||
|
||||
#: builtin/log.c:1217
|
||||
#: builtin/log.c:1218
|
||||
msgid "print patches to standard out"
|
||||
msgstr "imprimeix els pedaços a la sortida estàndard"
|
||||
|
||||
#: builtin/log.c:1219
|
||||
#: builtin/log.c:1220
|
||||
msgid "generate a cover letter"
|
||||
msgstr "genera una carta de presentació"
|
||||
|
||||
#: builtin/log.c:1221
|
||||
#: builtin/log.c:1222
|
||||
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:1222
|
||||
#: builtin/log.c:1223
|
||||
msgid "sfx"
|
||||
msgstr "sufix"
|
||||
|
||||
#: builtin/log.c:1223
|
||||
#: builtin/log.c:1224
|
||||
msgid "use <sfx> instead of '.patch'"
|
||||
msgstr "usa <sufix> en lloc de '.patch'"
|
||||
|
||||
#: builtin/log.c:1225
|
||||
#: builtin/log.c:1226
|
||||
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:1227
|
||||
#: builtin/log.c:1228
|
||||
msgid "mark the series as Nth re-roll"
|
||||
msgstr "marca la sèrie com a l'enèsima llançada"
|
||||
|
||||
#: builtin/log.c:1229
|
||||
#: builtin/log.c:1230
|
||||
msgid "Use [<prefix>] instead of [PATCH]"
|
||||
msgstr "Usa [<prefix>] en lloc de [PATCH]"
|
||||
|
||||
#: builtin/log.c:1232
|
||||
#: builtin/log.c:1233
|
||||
msgid "store resulting files in <dir>"
|
||||
msgstr "emmagatzema els fitxers resultants a <directori>"
|
||||
|
||||
#: builtin/log.c:1235
|
||||
#: builtin/log.c:1236
|
||||
msgid "don't strip/add [PATCH]"
|
||||
msgstr "no despullis/afegeixis [PATCH]"
|
||||
|
||||
#: builtin/log.c:1238
|
||||
#: builtin/log.c:1239
|
||||
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"
|
||||
|
||||
#: builtin/log.c:1242
|
||||
#: builtin/log.c:1245
|
||||
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:1244
|
||||
#: builtin/log.c:1247
|
||||
msgid "Messaging"
|
||||
msgstr "Missatgeria"
|
||||
|
||||
#: builtin/log.c:1245
|
||||
#: builtin/log.c:1248
|
||||
msgid "header"
|
||||
msgstr "capçalera"
|
||||
|
||||
#: builtin/log.c:1246
|
||||
#: builtin/log.c:1249
|
||||
msgid "add email header"
|
||||
msgstr "afegeix una capçalera de correu electrònic"
|
||||
|
||||
#: builtin/log.c:1247 builtin/log.c:1249
|
||||
#: builtin/log.c:1250 builtin/log.c:1252
|
||||
msgid "email"
|
||||
msgstr "correu electrònic"
|
||||
|
||||
#: builtin/log.c:1247
|
||||
#: builtin/log.c:1250
|
||||
msgid "add To: header"
|
||||
msgstr "afegeix la capçalera To:"
|
||||
|
||||
#: builtin/log.c:1249
|
||||
#: builtin/log.c:1252
|
||||
msgid "add Cc: header"
|
||||
msgstr "afegeix la capçalera Cc:"
|
||||
|
||||
#: builtin/log.c:1251
|
||||
#: builtin/log.c:1254
|
||||
msgid "ident"
|
||||
msgstr "identitat"
|
||||
|
||||
#: builtin/log.c:1252
|
||||
#: builtin/log.c:1255
|
||||
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:1254
|
||||
#: builtin/log.c:1257
|
||||
msgid "message-id"
|
||||
msgstr "ID de missatge"
|
||||
|
||||
#: builtin/log.c:1255
|
||||
#: builtin/log.c:1258
|
||||
msgid "make first mail a reply to <message-id>"
|
||||
msgstr "fes del primer missatge una resposta a <ID de missatge>"
|
||||
|
||||
#: builtin/log.c:1256 builtin/log.c:1259
|
||||
#: builtin/log.c:1259 builtin/log.c:1262
|
||||
msgid "boundary"
|
||||
msgstr "límit"
|
||||
|
||||
#: builtin/log.c:1257
|
||||
#: builtin/log.c:1260
|
||||
msgid "attach the patch"
|
||||
msgstr "ajunta el pedaç"
|
||||
|
||||
#: builtin/log.c:1260
|
||||
#: builtin/log.c:1263
|
||||
msgid "inline the patch"
|
||||
msgstr "posa el pedaç en el cos"
|
||||
|
||||
#: builtin/log.c:1264
|
||||
#: builtin/log.c:1267
|
||||
msgid "enable message threading, styles: shallow, deep"
|
||||
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
|
||||
|
||||
#: builtin/log.c:1266
|
||||
#: builtin/log.c:1269
|
||||
msgid "signature"
|
||||
msgstr "firma"
|
||||
|
||||
#: builtin/log.c:1267
|
||||
#: builtin/log.c:1270
|
||||
msgid "add a signature"
|
||||
msgstr "afegeix una firma"
|
||||
|
||||
#: builtin/log.c:1269
|
||||
#: builtin/log.c:1272
|
||||
msgid "add a signature from a file"
|
||||
msgstr "afegeix una firma des d'un fitxer"
|
||||
|
||||
#: builtin/log.c:1270
|
||||
#: builtin/log.c:1273
|
||||
msgid "don't print the patch filenames"
|
||||
msgstr "no imprimeixis els noms de fitxer del pedaç"
|
||||
|
||||
#: builtin/log.c:1359
|
||||
#: builtin/log.c:1362
|
||||
msgid "-n and -k are mutually exclusive."
|
||||
msgstr "-n i -k són mutualment exclusius."
|
||||
|
||||
#: builtin/log.c:1361
|
||||
#: builtin/log.c:1364
|
||||
msgid "--subject-prefix and -k are mutually exclusive."
|
||||
msgstr "--subject-prefix i -k són mutualment exclusius."
|
||||
|
||||
#: builtin/log.c:1369
|
||||
#: builtin/log.c:1372
|
||||
msgid "--name-only does not make sense"
|
||||
msgstr "--name-only no té sentit"
|
||||
|
||||
#: builtin/log.c:1371
|
||||
#: builtin/log.c:1374
|
||||
msgid "--name-status does not make sense"
|
||||
msgstr "--name-status no té sentit"
|
||||
|
||||
#: builtin/log.c:1373
|
||||
#: builtin/log.c:1376
|
||||
msgid "--check does not make sense"
|
||||
msgstr "--check no té sentit"
|
||||
|
||||
#: builtin/log.c:1396
|
||||
#: builtin/log.c:1401
|
||||
msgid "standard output, or directory, which one?"
|
||||
msgstr "sortida estàndard o directori, quin dels dos?"
|
||||
|
||||
#: builtin/log.c:1398
|
||||
#: builtin/log.c:1403
|
||||
#, c-format
|
||||
msgid "Could not create directory '%s'"
|
||||
msgstr "No s'ha pogut crear el directori '%s'"
|
||||
|
||||
#: builtin/log.c:1495
|
||||
#: builtin/log.c:1500
|
||||
#, c-format
|
||||
msgid "unable to read signature file '%s'"
|
||||
msgstr "no s'ha pogut llegir el fitxer de firma '%s'"
|
||||
|
||||
#: builtin/log.c:1558
|
||||
#: builtin/log.c:1563
|
||||
msgid "Failed to create output files"
|
||||
msgstr "S'ha fallat en crear els fitxers de sortida"
|
||||
|
||||
#: builtin/log.c:1606
|
||||
#: builtin/log.c:1611
|
||||
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
|
||||
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
|
||||
|
||||
#: builtin/log.c:1660
|
||||
#: builtin/log.c:1665
|
||||
#, 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"
|
||||
|
||||
#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
|
||||
#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
|
||||
#, 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."
|
||||
|
||||
#: builtin/push.c:15
|
||||
#: builtin/push.c:16
|
||||
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
||||
msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
|
||||
|
||||
#: builtin/push.c:86
|
||||
#: builtin/push.c:88
|
||||
msgid "tag shorthand without <tag>"
|
||||
msgstr "abreviatura d'etiqueta sense <tag>"
|
||||
|
||||
#: builtin/push.c:96
|
||||
#: builtin/push.c:98
|
||||
msgid "--delete only accepts plain target ref names"
|
||||
msgstr "--delete només accepta noms de referència de destí senzills"
|
||||
|
||||
#: builtin/push.c:140
|
||||
#: builtin/push.c:142
|
||||
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'."
|
||||
|
||||
#: builtin/push.c:143
|
||||
#: builtin/push.c:145
|
||||
#, 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"
|
||||
|
||||
#: builtin/push.c:158
|
||||
#: builtin/push.c:160
|
||||
#, 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"
|
||||
|
||||
#: builtin/push.c:172
|
||||
#: builtin/push.c:174
|
||||
#, 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"
|
||||
|
||||
#: builtin/push.c:180
|
||||
#: builtin/push.c:182
|
||||
#, 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:183
|
||||
#: builtin/push.c:185
|
||||
#, 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."
|
||||
|
||||
#: builtin/push.c:206
|
||||
#: builtin/push.c:208
|
||||
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)"
|
||||
|
||||
#: builtin/push.c:273
|
||||
#: builtin/push.c:275
|
||||
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:280
|
||||
#: builtin/push.c:282
|
||||
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."
|
||||
|
||||
#: builtin/push.c:286
|
||||
#: builtin/push.c:288
|
||||
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."
|
||||
|
||||
#: builtin/push.c:292
|
||||
#: builtin/push.c:294
|
||||
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."
|
||||
|
||||
#: 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."
|
||||
|
||||
#: builtin/push.c:302
|
||||
#: builtin/push.c:304
|
||||
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"
|
||||
|
||||
#: builtin/push.c:361
|
||||
#: builtin/push.c:363
|
||||
#, c-format
|
||||
msgid "Pushing to %s\n"
|
||||
msgstr "Pujant a %s\n"
|
||||
|
||||
#: builtin/push.c:365
|
||||
#: builtin/push.c:367
|
||||
#, c-format
|
||||
msgid "failed to push some refs to '%s'"
|
||||
msgstr "s'ha fallat en pujar algunes referències a '%s'"
|
||||
|
||||
#: builtin/push.c:395
|
||||
#: builtin/push.c:397
|
||||
#, c-format
|
||||
msgid "bad repository '%s'"
|
||||
msgstr "dipòsit dolent '%s'"
|
||||
|
||||
#: builtin/push.c:396
|
||||
#: builtin/push.c:398
|
||||
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"
|
||||
|
||||
#: builtin/push.c:411
|
||||
#: builtin/push.c:413
|
||||
msgid "--all and --tags are incompatible"
|
||||
msgstr "--all i --tags són incompatibles"
|
||||
|
||||
#: builtin/push.c:412
|
||||
#: builtin/push.c:414
|
||||
msgid "--all can't be combined with refspecs"
|
||||
msgstr "--all no es pot combinar amb especificacions de referència"
|
||||
|
||||
#: builtin/push.c:417
|
||||
#: builtin/push.c:419
|
||||
msgid "--mirror and --tags are incompatible"
|
||||
msgstr "--mirror i --tags són incompatibles"
|
||||
|
||||
#: builtin/push.c:418
|
||||
#: builtin/push.c:420
|
||||
msgid "--mirror can't be combined with refspecs"
|
||||
msgstr "--mirror no es pot combinar amb especificacions de referència"
|
||||
|
||||
#: builtin/push.c:423
|
||||
#: builtin/push.c:425
|
||||
msgid "--all and --mirror are incompatible"
|
||||
msgstr "--all i --mirror són incompatibles"
|
||||
|
||||
#: builtin/push.c:539
|
||||
#: builtin/push.c:537
|
||||
msgid "repository"
|
||||
msgstr "dipòsit"
|
||||
|
||||
#: builtin/push.c:540 builtin/send-pack.c:161
|
||||
#: builtin/push.c:538 builtin/send-pack.c:161
|
||||
msgid "push all refs"
|
||||
msgstr "puja totes les referències"
|
||||
|
||||
#: builtin/push.c:541 builtin/send-pack.c:163
|
||||
#: builtin/push.c:539 builtin/send-pack.c:163
|
||||
msgid "mirror all refs"
|
||||
msgstr "reflecteix totes les referències"
|
||||
|
||||
#: builtin/push.c:543
|
||||
#: builtin/push.c:541
|
||||
msgid "delete refs"
|
||||
msgstr "suprimeix les referències"
|
||||
|
||||
#: builtin/push.c:544
|
||||
#: builtin/push.c:542
|
||||
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:547 builtin/send-pack.c:164
|
||||
#: builtin/push.c:545 builtin/send-pack.c:164
|
||||
msgid "force updates"
|
||||
msgstr "força les actualitzacions"
|
||||
|
||||
#: builtin/push.c:549 builtin/send-pack.c:175
|
||||
#: builtin/push.c:547 builtin/send-pack.c:175
|
||||
msgid "refname>:<expect"
|
||||
msgstr "nom-de-referència>:<esperat"
|
||||
|
||||
#: builtin/push.c:550 builtin/send-pack.c:176
|
||||
#: builtin/push.c:548 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"
|
||||
|
||||
#: 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"
|
||||
|
||||
#: builtin/push.c:555 builtin/send-pack.c:169
|
||||
#: builtin/push.c:553 builtin/send-pack.c:169
|
||||
msgid "use thin pack"
|
||||
msgstr "usa el paquet prim"
|
||||
|
||||
#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
|
||||
#: builtin/push.c:554 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/push.c:558
|
||||
#: builtin/push.c:556
|
||||
msgid "set upstream for git pull/status"
|
||||
msgstr "estableix la font per a git pull/status"
|
||||
|
||||
#: builtin/push.c:561
|
||||
#: builtin/push.c:559
|
||||
msgid "prune locally removed refs"
|
||||
msgstr "poda les referències eliminades localment"
|
||||
|
||||
#: builtin/push.c:563
|
||||
#: builtin/push.c:561
|
||||
msgid "bypass pre-push hook"
|
||||
msgstr "evita el ganxo de prepujada"
|
||||
|
||||
#: builtin/push.c:564
|
||||
#: builtin/push.c:562
|
||||
msgid "push missing but relevant tags"
|
||||
msgstr "puja les etiquetes absents però rellevants"
|
||||
|
||||
#: builtin/push.c:567 builtin/send-pack.c:166
|
||||
#: builtin/push.c:565 builtin/send-pack.c:166
|
||||
msgid "GPG sign the push"
|
||||
msgstr "firma la pujada amb GPG"
|
||||
|
||||
#: builtin/push.c:569 builtin/send-pack.c:170
|
||||
#: builtin/push.c:567 builtin/send-pack.c:170
|
||||
msgid "request atomic transaction on remote side"
|
||||
msgstr "demana una transacció atòmica al costat remot"
|
||||
|
||||
#: builtin/push.c:579
|
||||
#: builtin/push.c:577
|
||||
msgid "--delete is incompatible with --all, --mirror and --tags"
|
||||
msgstr "--delete és incompatible amb --all, --mirror i --tags"
|
||||
|
||||
#: builtin/push.c:581
|
||||
#: builtin/push.c:579
|
||||
msgid "--delete doesn't make sense without any refs"
|
||||
msgstr "--delete no té sentit sense referències"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user