gitk: commit translation files without file information

File information in the translation files is only helpful for the translators, but is not needed to compile the message catalogs. On top of that, file information is rather volatile and leads to large patches that do not carry essential information. For this reason, Git project has opted to remove the file information from its translation files. Let's do that in this project, too. Rewrite the update-po target to generate *.po files that do contain file information for the benefit of translators. Configure a clean filter under the name "gettext-no-location", which is the same that the Git project uses. It is expected that translators have already configured their repository suitably. Nevertheless, write a reminder as part of the update-po target. Apply the clean-filter to the translation files. Signed-off-by: Johannes Sixt <j6t@kdbg.org>

Johannes Sixt committed Mar 2, 2026 at 09:14 UTC e7db0670ee0f66f7c975cd1ec3bd0f6898287b0c
16 files changed +155 -4487
Makefile
+4 -1
@@ -70,7 +70,10 @@ gitk-wish: gitk GIT-TCLTK-VARS
70 $(PO_TEMPLATE): gitk
71 $(XGETTEXT) -kmc -LTcl -o $@ gitk
72 update-po:: $(PO_TEMPLATE)
73 - $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
73 + $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U --add-location $p $(PO_TEMPLATE) ; )
74 + @echo "Before committing changes, ensure that a clean-filter is installed:"; \
75 + echo; \
76 + echo " git config filter.gettext-no-location.clean \"msgcat --no-location -\""
77 $(ALL_MSGFILES): %.msg : %.po
78 @echo Generating catalog $@
79 $(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $<
po/.gitattributes new
+1
@@ -0,0 +1 @@
1 +/*.po filter=gettext-no-location
po/ca.po
-310
@@ -19,33 +19,26 @@ msgstr ""
19 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
20 "X-Generator: Poedit 1.8.5\n"
21
22 -#: gitk:140
22 msgid "Couldn't get list of unmerged files:"
23 msgstr "No s'ha pogut obtenir la llista de fitxers no fusionats:"
24
26 -#: gitk:212 gitk:2381
25 msgid "Color words"
26 msgstr "Colora les paraules"
27
30 -#: gitk:217 gitk:2381 gitk:8220 gitk:8253
28 msgid "Markup words"
29 msgstr "Marca les paraules"
30
34 -#: gitk:324
31 msgid "Error parsing revisions:"
32 msgstr "Error en analitzar les revisions:"
33
38 -#: gitk:380
34 msgid "Error executing --argscmd command:"
35 msgstr "Error en executar l'ordre --argscmd:"
36
42 -#: gitk:393
37 msgid "No files selected: --merge specified but no files are unmerged."
38 msgstr ""
39 "No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer està "
40 "sense fusionar."
41
48 -#: gitk:396
42 msgid ""
43 "No files selected: --merge specified but no unmerged files are within file "
44 "limit."
@@ -53,314 +46,234 @@ msgstr ""
46 "No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer "
47 "sense fusionar està dins del límit de fitxers."
48
56 -#: gitk:418 gitk:566
49 msgid "Error executing git log:"
50 msgstr "Error en executar git log:"
51
60 -#: gitk:436 gitk:582
52 msgid "Reading"
53 msgstr "Llegint"
54
64 -#: gitk:496 gitk:4525
55 msgid "Reading commits..."
56 msgstr "Llegint les revisions..."
57
68 -#: gitk:499 gitk:1637 gitk:4528
58 msgid "No commits selected"
59 msgstr "Cap comissió seleccionada"
60
72 -#: gitk:1445 gitk:4045 gitk:12432
61 msgid "Command line"
62 msgstr "Línia d'ordres"
63
76 -#: gitk:1511
64 msgid "Can't parse git log output:"
65 msgstr "No es pot analitzar la sortida del git log:"
66
80 -#: gitk:1740
67 msgid "No commit information available"
68 msgstr "Cap informació de comissió disponible"
69
84 -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
70 msgid "OK"
71 msgstr "D'acord"
72
88 -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
89 -#: gitk:11242 gitk:11522
73 msgid "Cancel"
74 msgstr "Cancel·la"
75
93 -#: gitk:2069
76 msgid "&Update"
77 msgstr "Actualitza"
78
97 -#: gitk:2070
79 msgid "&Reload"
80 msgstr "Recarrega"
81
101 -#: gitk:2071
82 msgid "Reread re&ferences"
83 msgstr "Rellegeix les referències"
84
105 -#: gitk:2072
85 msgid "&List references"
86 msgstr "Llista les referències"
87
109 -#: gitk:2074
88 msgid "Start git &gui"
89 msgstr "Inicia el git gui"
90
113 -#: gitk:2076
91 msgid "&Quit"
92 msgstr "Surt"
93
117 -#: gitk:2068
94 msgid "&File"
95 msgstr "Fitxer"
96
121 -#: gitk:2080
97 msgid "&Preferences"
98 msgstr "Preferències"
99
125 -#: gitk:2079
100 msgid "&Edit"
101 msgstr "Edita"
102
129 -#: gitk:2084
103 msgid "&New view..."
104 msgstr "Vista nova..."
105
133 -#: gitk:2085
106 msgid "&Edit view..."
107 msgstr "Edita la vista..."
108
137 -#: gitk:2086
109 msgid "&Delete view"
110 msgstr "Suprimeix la vista"
111
141 -#: gitk:2088 gitk:4043
112 msgid "&All files"
113 msgstr "Tots els fitxers"
114
145 -#: gitk:2083 gitk:4067
115 msgid "&View"
116 msgstr "Vista"
117
149 -#: gitk:2093 gitk:2103 gitk:3012
118 msgid "&About gitk"
119 msgstr "Quant al gitk"
120
153 -#: gitk:2094 gitk:2108
121 msgid "&Key bindings"
122 msgstr "Associacions de tecles"
123
157 -#: gitk:2092 gitk:2107
124 msgid "&Help"
125 msgstr "Ajuda"
126
161 -#: gitk:2185 gitk:8652
127 msgid "SHA1 ID:"
128 msgstr "ID SHA1:"
129
165 -#: gitk:2229
130 msgid "Row"
131 msgstr "Fila"
132
169 -#: gitk:2267
133 msgid "Find"
134 msgstr "Cerca"
135
173 -#: gitk:2295
136 msgid "commit"
137 msgstr "comissió"
138
177 -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
178 -#: gitk:6912
139 msgid "containing:"
140 msgstr "que contingui:"
141
182 -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
142 msgid "touching paths:"
143 msgstr "que toqui els camins:"
144
186 -#: gitk:2303 gitk:4777
145 msgid "adding/removing string:"
146 msgstr "que afegeixi/elimini la cadena:"
147
190 -#: gitk:2304 gitk:4779
148 msgid "changing lines matching:"
149 msgstr "que tingui línies canviades coincidents amb:"
150
194 -#: gitk:2313 gitk:2315 gitk:4766
151 msgid "Exact"
152 msgstr "Exacte"
153
198 -#: gitk:2315 gitk:4854 gitk:6723
154 msgid "IgnCase"
155 msgstr "Ignora majúscula i minúscula"
156
202 -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
157 msgid "Regexp"
158 msgstr "Regexp"
159
206 -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
160 msgid "All fields"
161 msgstr "Tots els camps"
162
210 -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
163 msgid "Headline"
164 msgstr "Titular"
165
214 -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
166 msgid "Comments"
167 msgstr "Comentaris"
168
218 -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
219 -#: gitk:8845
169 msgid "Author"
170 msgstr "Autor"
171
223 -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
172 msgid "Committer"
173 msgstr "Comitent"
174
227 -#: gitk:2350
175 msgid "Search"
176 msgstr "Cerca"
177
231 -#: gitk:2358
178 msgid "Diff"
179 msgstr "Diferència"
180
235 -#: gitk:2360
181 msgid "Old version"
182 msgstr "Versió antiga"
183
239 -#: gitk:2362
184 msgid "New version"
185 msgstr "Versió nova"
186
243 -#: gitk:2364
187 msgid "Lines of context"
188 msgstr "Línies de context"
189
247 -#: gitk:2374
190 msgid "Ignore space change"
191 msgstr "Ignora canvis d'espai"
192
251 -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
193 msgid "Line diff"
194 msgstr "Diferència de línies"
195
255 -#: gitk:2445
196 msgid "Patch"
197 msgstr "Pedaç"
198
259 -#: gitk:2447
199 msgid "Tree"
200 msgstr "Arbre"
201
263 -#: gitk:2617 gitk:2637
202 msgid "Diff this -> selected"
203 msgstr "Diferencia aquesta -> la seleccionada"
204
267 -#: gitk:2618 gitk:2638
205 msgid "Diff selected -> this"
206 msgstr "Diferencia la seleccionada -> aquesta"
207
271 -#: gitk:2619 gitk:2639
208 msgid "Make patch"
209 msgstr "Fes pedaç"
210
275 -#: gitk:2620 gitk:9254
211 msgid "Create tag"
212 msgstr "Crea etiqueta"
213
279 -#: gitk:2621 gitk:9371
214 msgid "Write commit to file"
215 msgstr "Escriu la comissió a un fitxer"
216
283 -#: gitk:2622 gitk:9428
217 msgid "Create new branch"
218 msgstr "Crea una branca nova"
219
287 -#: gitk:2623
220 msgid "Cherry-pick this commit"
221 msgstr "Recull aquesta comissió com a cirera"
222
291 -#: gitk:2624
223 msgid "Reset HEAD branch to here"
224 msgstr "Restableix la branca HEAD aquí"
225
295 -#: gitk:2625
226 msgid "Mark this commit"
227 msgstr "Marca aquesta comissió"
228
299 -#: gitk:2626
229 msgid "Return to mark"
230 msgstr "Torna a la marca"
231
303 -#: gitk:2627
232 msgid "Find descendant of this and mark"
233 msgstr "Troba la descendent d'aquesta i marca-la"
234
307 -#: gitk:2628
235 msgid "Compare with marked commit"
236 msgstr "Compara amb la comissió marcada"
237
311 -#: gitk:2629 gitk:2640
238 msgid "Diff this -> marked commit"
239 msgstr "Diferencia aquesta -> la comissió marcada"
240
315 -#: gitk:2630 gitk:2641
241 msgid "Diff marked commit -> this"
242 msgstr "Diferencia la comissió seleccionada -> aquesta"
243
319 -#: gitk:2631
244 msgid "Revert this commit"
245 msgstr "Reverteix aquesta comissió"
246
323 -#: gitk:2647
247 msgid "Check out this branch"
248 msgstr "Agafa aquesta branca"
249
327 -#: gitk:2648
250 msgid "Remove this branch"
251 msgstr "Elimina aquesta branca"
252
331 -#: gitk:2649
253 msgid "Copy branch name"
254 msgstr "Copia el nom de branca"
255
335 -#: gitk:2656
256 msgid "Highlight this too"
257 msgstr "Ressalta aquest també"
258
339 -#: gitk:2657
259 msgid "Highlight this only"
260 msgstr "Ressalta només aquest"
261
343 -#: gitk:2658
262 msgid "External diff"
263 msgstr "Diferència externa"
264
347 -#: gitk:2659
265 msgid "Blame parent commit"
266 msgstr "Culpabilitat de la comissió mare"
267
351 -#: gitk:2660
268 msgid "Copy path"
269 msgstr "Copia el camí"
270
355 -#: gitk:2667
271 msgid "Show origin of this line"
272 msgstr "Mostra l'origen d'aquesta línia"
273
359 -#: gitk:2668
274 msgid "Run git gui blame on this line"
275 msgstr "Executa git gui blame en aquesta línia"
276
363 -#: gitk:3014
277 msgid ""
278 "\n"
279 "Gitk - a commit viewer for git\n"
@@ -376,317 +289,245 @@ msgstr ""
289 "\n"
290 "Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU"
291
379 -#: gitk:3022 gitk:3089 gitk:9857
292 msgid "Close"
293 msgstr "Tanca"
294
383 -#: gitk:3043
295 msgid "Gitk key bindings"
296 msgstr "Associacions de tecles del Gitk"
297
387 -#: gitk:3046
298 msgid "Gitk key bindings:"
299 msgstr "Associacions de tecles del Gitk:"
300
391 -#: gitk:3048
301 #, tcl-format
302 msgid "<%s-Q>\t\tQuit"
303 msgstr "<%s-Q>\t\tSurt"
304
396 -#: gitk:3049
305 #, tcl-format
306 msgid "<%s-W>\t\tClose window"
307 msgstr "<%s-W>\t\tTanca la finestra"
308
401 -#: gitk:3050
309 msgid "<Home>\t\tMove to first commit"
310 msgstr "<Inici>\t\tVés a la primera comissió"
311
405 -#: gitk:3051
312 msgid "<End>\t\tMove to last commit"
313 msgstr "<Fi>\t\tVés a l'última comissió"
314
409 -#: gitk:3052
315 msgid "<Up>, p, k\tMove up one commit"
316 msgstr "<Amunt>, p, k\tMou-te cap amunt per una comissió"
317
413 -#: gitk:3053
318 msgid "<Down>, n, j\tMove down one commit"
319 msgstr "<Avall>, n, j\tMou-te cap avall per una comissió"
320
417 -#: gitk:3054
321 msgid "<Left>, z, h\tGo back in history list"
322 msgstr "<Esquerra>, z, h\tRetrocedeix en la llista d'història"
323
421 -#: gitk:3055
324 msgid "<Right>, x, l\tGo forward in history list"
325 msgstr "<Dreta>, x, l\tAvança en la llista d'història"
326
425 -#: gitk:3056
327 #, tcl-format
328 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
329 msgstr ""
330 "<%s-n>\tVés a l'enèsima mare de la comissió actual en la llista d'història"
331
431 -#: gitk:3057
332 msgid "<PageUp>\tMove up one page in commit list"
333 msgstr "<RePàg>\tMou-te cap amunt per una pàgina en la llista de comissions"
334
435 -#: gitk:3058
335 msgid "<PageDown>\tMove down one page in commit list"
336 msgstr "<AvPàg>\tMou-te cap avall per una pàgina en la llista de comissions"
337
439 -#: gitk:3059
338 #, tcl-format
339 msgid "<%s-Home>\tScroll to top of commit list"
340 msgstr "<%s-Inici>\tDesplaça't a la part superior de la llista de comissions"
341
444 -#: gitk:3060
342 #, tcl-format
343 msgid "<%s-End>\tScroll to bottom of commit list"
344 msgstr "<%s-Fi>\tDesplaça't a la part inferior de la llista de comissions"
345
449 -#: gitk:3061
346 #, tcl-format
347 msgid "<%s-Up>\tScroll commit list up one line"
348 msgstr "<%s-Amunt>\tDesplaça la llista de comissions cap amunt per una línia"
349
454 -#: gitk:3062
350 #, tcl-format
351 msgid "<%s-Down>\tScroll commit list down one line"
352 msgstr "<%s-Avall>\tDesplaça la llista de comissions cap avall per una línia"
353
459 -#: gitk:3063
354 #, tcl-format
355 msgid "<%s-PageUp>\tScroll commit list up one page"
356 msgstr "<%s-RePàg>\tDesplaça la llista de comissions cap amunt per una pàgina"
357
464 -#: gitk:3064
358 #, tcl-format
359 msgid "<%s-PageDown>\tScroll commit list down one page"
360 msgstr "<%s-AvPàg>\tDesplaça la llista de comissions cap avall per una pàgina"
361
469 -#: gitk:3065
362 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
363 msgstr "<Maj-Amunt>\tCerca cap enrere (cap amunt, les comissions més noves)"
364
473 -#: gitk:3066
365 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
366 msgstr "<Maj-Avall>\tCerca cap endavant (cap avall, les comissions més velles)"
367
477 -#: gitk:3067
368 msgid "<Delete>, b\tScroll diff view up one page"
369 msgstr "<Supr>, b\tDesplaça la vista de diferència cap amunt per una pàgina"
370
481 -#: gitk:3068
371 msgid "<Backspace>\tScroll diff view up one page"
372 msgstr "<Retrocés>\tDesplaça la vista de diferència cap amunt per una pàgina"
373
485 -#: gitk:3069
374 msgid "<Space>\t\tScroll diff view down one page"
375 msgstr "<Espai>\t\tDesplaça la vista de diferència cap avall per una pàgina"
376
489 -#: gitk:3070
377 msgid "u\t\tScroll diff view up 18 lines"
378 msgstr "u\t\tDesplaça la vista de diferència cap amunt per 18 línies"
379
493 -#: gitk:3071
380 msgid "d\t\tScroll diff view down 18 lines"
381 msgstr "d\t\tDesplaça la vista de diferència cap avall per 18 línies"
382
497 -#: gitk:3072
383 #, tcl-format
384 msgid "<%s-F>\t\tFind"
385 msgstr "<%s-F>\t\tCerca"
386
502 -#: gitk:3073
387 #, tcl-format
388 msgid "<%s-G>\t\tMove to next find hit"
389 msgstr "<%s-G>\t\tMou-te a la propera coincidència de la cerca"
390
507 -#: gitk:3074
391 msgid "<Return>\tMove to next find hit"
392 msgstr "<Retorn>\tMou-te a la propera coincidència de la cerca"
393
511 -#: gitk:3075
394 msgid "g\t\tGo to commit"
395 msgstr "g\t\tVés a l'última comissió"
396
515 -#: gitk:3076
397 msgid "/\t\tFocus the search box"
398 msgstr "/\t\tPosa el focus a la caixa de cerca"
399
519 -#: gitk:3077
400 msgid "?\t\tMove to previous find hit"
401 msgstr "?\t\tMou a la coincidència prèvia de la cerca"
402
523 -#: gitk:3078
403 msgid "f\t\tScroll diff view to next file"
404 msgstr "f\t\tDesplaça la vista de diferència al proper fitxer"
405
527 -#: gitk:3079
406 #, tcl-format
407 msgid "<%s-S>\t\tSearch for next hit in diff view"
408 msgstr "<%s-S>\t\tCerca la propera coincidència en la vista de diferència"
409
532 -#: gitk:3080
410 #, tcl-format
411 msgid "<%s-R>\t\tSearch for previous hit in diff view"
412 msgstr "<%s-R>\t\tCerca la coincidència prèvia en la vista de diferència"
413
537 -#: gitk:3081
414 #, tcl-format
415 msgid "<%s-KP+>\tIncrease font size"
416 msgstr "<%s-KP+>\tAugmenta la mida de lletra"
417
542 -#: gitk:3082
418 #, tcl-format
419 msgid "<%s-plus>\tIncrease font size"
420 msgstr "<%s-més>\tAugmenta la mida de lletra"
421
547 -#: gitk:3083
422 #, tcl-format
423 msgid "<%s-KP->\tDecrease font size"
424 msgstr "<%s-KP->\tDisminueix la mida de lletra"
425
552 -#: gitk:3084
426 #, tcl-format
427 msgid "<%s-minus>\tDecrease font size"
428 msgstr "<%s-menys>\tDisminueix la mida de lletra"
429
557 -#: gitk:3085
430 msgid "<F5>\t\tUpdate"
431 msgstr "<F5>\t\tActualitza"
432
561 -#: gitk:3550 gitk:3559
433 #, tcl-format
434 msgid "Error creating temporary directory %s:"
435 msgstr "Error en crear el directori temporal %s:"
436
566 -#: gitk:3572
437 #, tcl-format
438 msgid "Error getting \"%s\" from %s:"
439 msgstr "Error en obtenir \"%s\" de %s:"
440
571 -#: gitk:3635
441 msgid "command failed:"
442 msgstr "l'ordre ha fallat:"
443
575 -#: gitk:3784
444 msgid "No such commit"
445 msgstr "Cap comissió així"
446
579 -#: gitk:3798
447 msgid "git gui blame: command failed:"
448 msgstr "git gui blame: l'ordre ha fallat:"
449
583 -#: gitk:3829
450 #, tcl-format
451 msgid "Couldn't read merge head: %s"
452 msgstr "No s'ha pogut llegir el cap de fusió: %s"
453
588 -#: gitk:3837
454 #, tcl-format
455 msgid "Error reading index: %s"
456 msgstr "Error en llegir l'índex: %s"
457
593 -#: gitk:3862
458 #, tcl-format
459 msgid "Couldn't start git blame: %s"
460 msgstr "No s'ha pogut iniciar el git blame: %s"
461
598 -#: gitk:3865 gitk:6754
462 msgid "Searching"
463 msgstr "Cercant"
464
602 -#: gitk:3897
465 #, tcl-format
466 msgid "Error running git blame: %s"
467 msgstr "Error en executar el git blame: %s"
468
607 -#: gitk:3925
469 #, tcl-format
470 msgid "That line comes from commit %s, which is not in this view"
471 msgstr ""
472 "Aquella línia ve de la comissió %s, la qual no és en aquesta visualització"
473
613 -#: gitk:3939
474 msgid "External diff viewer failed:"
475 msgstr "El visualitzador de diferència extern ha fallat:"
476
617 -#: gitk:4070
477 msgid "Gitk view definition"
478 msgstr "Definició de vista del Gitk"
479
621 -#: gitk:4074
480 msgid "Remember this view"
481 msgstr "Recorda aquesta vista"
482
625 -#: gitk:4075
483 msgid "References (space separated list):"
484 msgstr "Referències (llista separada per espais)"
485
629 -#: gitk:4076
486 msgid "Branches & tags:"
487 msgstr "Branques i etiquetes:"
488
633 -#: gitk:4077
489 msgid "All refs"
490 msgstr "Totes les referències"
491
637 -#: gitk:4078
492 msgid "All (local) branches"
493 msgstr "Totes les branques (locals)"
494
641 -#: gitk:4079
495 msgid "All tags"
496 msgstr "Totes les etiquetes"
497
645 -#: gitk:4080
498 msgid "All remote-tracking branches"
499 msgstr "Totes les branques amb seguiment remot"
500
649 -#: gitk:4081
501 msgid "Commit Info (regular expressions):"
502 msgstr "Informació de comissió (expressions regulars):"
503
653 -#: gitk:4082
504 msgid "Author:"
505 msgstr "Autor:"
506
657 -#: gitk:4083
507 msgid "Committer:"
508 msgstr "Comitent:"
509
661 -#: gitk:4084
510 msgid "Commit Message:"
511 msgstr "Missatge de comissió:"
512
665 -#: gitk:4085
513 msgid "Matches all Commit Info criteria"
514 msgstr "Coincideix amb tots els criteris d'informació de comissió"
515
669 -#: gitk:4086
516 msgid "Matches no Commit Info criteria"
517 msgstr "No coincideix amb cap criteri d'informació de comissió"
518
673 -#: gitk:4087
519 msgid "Changes to Files:"
520 msgstr "Canvis als fitxers:"
521
677 -#: gitk:4088
522 msgid "Fixed String"
523 msgstr "Cadena fixa"
524
681 -#: gitk:4089
525 msgid "Regular Expression"
526 msgstr "Expressió regular"
527
685 -#: gitk:4090
528 msgid "Search string:"
529 msgstr "Cadena de cerca:"
530
689 -#: gitk:4091
531 msgid ""
532 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
533 "15:27:38\"):"
@@ -694,201 +535,153 @@ msgstr ""
535 "Dates de comissió (\"fa 2 setmanes\", \"2009-03-17 15:27:38\", \"17 abr 2009 "
536 "15:27:38\"):"
537
697 -#: gitk:4092
538 msgid "Since:"
539 msgstr "Des de:"
540
701 -#: gitk:4093
541 msgid "Until:"
542 msgstr "Fins:"
543
705 -#: gitk:4094
544 msgid "Limit and/or skip a number of revisions (positive integer):"
545 msgstr "Limita o salta un nombre de revisions (nombre enter positiu)"
546
709 -#: gitk:4095
547 msgid "Number to show:"
548 msgstr "Nombre a mostrar:"
549
713 -#: gitk:4096
550 msgid "Number to skip:"
551 msgstr "Nombre a saltar:"
552
717 -#: gitk:4097
553 msgid "Miscellaneous options:"
554 msgstr "Opcions miscel·lànies:"
555
721 -#: gitk:4098
556 msgid "Strictly sort by date"
557 msgstr "Ordena estrictament per data"
558
725 -#: gitk:4099
559 msgid "Mark branch sides"
560 msgstr "Marca els costats de les branques"
561
729 -#: gitk:4100
562 msgid "Limit to first parent"
563 msgstr "Limita a la primera mare"
564
733 -#: gitk:4101
565 msgid "Simple history"
566 msgstr "Història senzilla"
567
737 -#: gitk:4102
568 msgid "Additional arguments to git log:"
569 msgstr "Paràmetres addicionals al git log:"
570
741 -#: gitk:4103
571 msgid "Enter files and directories to include, one per line:"
572 msgstr "Introduïu els fitxers i directoris a incloure, un per línia:"
573
745 -#: gitk:4104
574 msgid "Command to generate more commits to include:"
575 msgstr "Ordre per a generar més comissions a incloure:"
576
749 -#: gitk:4228
577 msgid "Gitk: edit view"
578 msgstr "Gitk: vista d'edició"
579
753 -#: gitk:4236
580 msgid "-- criteria for selecting revisions"
581 msgstr "-- criteris per a seleccionar les revisions"
582
757 -#: gitk:4241
583 msgid "View Name"
584 msgstr "Nom de vista"
585
761 -#: gitk:4316
586 msgid "Apply (F5)"
587 msgstr "Aplica (F5)"
588
765 -#: gitk:4354
589 msgid "Error in commit selection arguments:"
590 msgstr "Error en els paràmetres de selecció de comissions:"
591
769 -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
592 msgid "None"
593 msgstr "Cap"
594
773 -#: gitk:5021 gitk:5026
595 msgid "Descendant"
596 msgstr "Descendent"
597
777 -#: gitk:5022
598 msgid "Not descendant"
599 msgstr "No descendent"
600
781 -#: gitk:5029 gitk:5034
601 msgid "Ancestor"
602 msgstr "Avantpassat"
603
785 -#: gitk:5030
604 msgid "Not ancestor"
605 msgstr "No avantpassat"
606
789 -#: gitk:5324
607 msgid "Local changes checked in to index but not committed"
608 msgstr "Canvis locals registrats en l'índex però no comesos"
609
793 -#: gitk:5360
610 msgid "Local uncommitted changes, not checked in to index"
611 msgstr "Canvis locals sense cometre, no registrats en l'índex"
612
797 -#: gitk:7134
613 msgid "and many more"
614 msgstr "i moltes més"
615
801 -#: gitk:7137
616 msgid "many"
617 msgstr "moltes"
618
805 -#: gitk:7328
619 msgid "Tags:"
620 msgstr "Etiquetes:"
621
809 -#: gitk:7345 gitk:7351 gitk:8825
622 msgid "Parent"
623 msgstr "Mare"
624
813 -#: gitk:7356
625 msgid "Child"
626 msgstr "Filla"
627
817 -#: gitk:7365
628 msgid "Branch"
629 msgstr "Branca"
630
821 -#: gitk:7368
631 msgid "Follows"
632 msgstr "Segueix"
633
825 -#: gitk:7371
634 msgid "Precedes"
635 msgstr "Precedeix"
636
829 -#: gitk:7966
637 #, tcl-format
638 msgid "Error getting diffs: %s"
639 msgstr "Error en obtenir les diferències: %s"
640
834 -#: gitk:8650
641 msgid "Goto:"
642 msgstr "Vés a:"
643
838 -#: gitk:8671
644 #, tcl-format
645 msgid "Short SHA1 id %s is ambiguous"
646 msgstr "L'id SHA1 curta %s és ambigua"
647
843 -#: gitk:8678
648 #, tcl-format
649 msgid "Revision %s is not known"
650 msgstr "La revisió %s és desconeguda"
651
848 -#: gitk:8688
652 #, tcl-format
653 msgid "SHA1 id %s is not known"
654 msgstr "L'id SHA1 %s és desconeguda"
655
853 -#: gitk:8690
656 #, tcl-format
657 msgid "Revision %s is not in the current view"
658 msgstr "La revisió %s no és en la vista actual"
659
858 -#: gitk:8832 gitk:8847
660 msgid "Date"
661 msgstr "Data"
662
862 -#: gitk:8835
663 msgid "Children"
664 msgstr "Filles"
665
866 -#: gitk:8898
666 #, tcl-format
667 msgid "Reset %s branch to here"
668 msgstr "Restableix la branca %s aquí"
669
871 -#: gitk:8900
670 msgid "Detached head: can't reset"
671 msgstr "Cap separat: no es pot restablir"
672
875 -#: gitk:9005 gitk:9011
673 msgid "Skipping merge commit "
674 msgstr "Saltant la comissió de fusió "
675
879 -#: gitk:9020 gitk:9025
676 msgid "Error getting patch ID for "
677 msgstr "Error en obtenir l'ID de pedaç de "
678
883 -#: gitk:9021 gitk:9026
679 msgid " - stopping\n"
680 msgstr " - aturant\n"
681
887 -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
682 msgid "Commit "
683 msgstr "Comissió "
684
891 -#: gitk:9035
685 msgid ""
686 " is the same patch as\n"
687 " "
@@ -896,7 +689,6 @@ msgstr ""
689 " és el mateix pedaç que\n"
690 " "
691
899 -#: gitk:9043
692 msgid ""
693 " differs from\n"
694 " "
@@ -904,7 +696,6 @@ msgstr ""
696 " difereix de\n"
697 " "
698
907 -#: gitk:9045
699 msgid ""
700 "Diff of commits:\n"
701 "\n"
@@ -912,131 +703,101 @@ msgstr ""
703 "Diferència entre comissions:\n"
704 "\n"
705
915 -#: gitk:9057 gitk:9066
706 #, tcl-format
707 msgid " has %s children - stopping\n"
708 msgstr " té %s filles - aturant\n"
709
920 -#: gitk:9085
710 #, tcl-format
711 msgid "Error writing commit to file: %s"
712 msgstr "Error en escriure la comissió al fitxer: %s"
713
925 -#: gitk:9091
714 #, tcl-format
715 msgid "Error diffing commits: %s"
716 msgstr "Error en diferenciar les comissions: %s"
717
930 -#: gitk:9137
718 msgid "Top"
719 msgstr "Part superior"
720
934 -#: gitk:9138
721 msgid "From"
722 msgstr "De"
723
938 -#: gitk:9143
724 msgid "To"
725 msgstr "A"
726
942 -#: gitk:9167
727 msgid "Generate patch"
728 msgstr "Genera pedaç"
729
946 -#: gitk:9169
730 msgid "From:"
731 msgstr "De:"
732
950 -#: gitk:9178
733 msgid "To:"
734 msgstr "A:"
735
954 -#: gitk:9187
736 msgid "Reverse"
737 msgstr "Inverteix"
738
958 -#: gitk:9189 gitk:9385
739 msgid "Output file:"
740 msgstr "Fitxer de sortida:"
741
962 -#: gitk:9195
742 msgid "Generate"
743 msgstr "Genera"
744
966 -#: gitk:9233
745 msgid "Error creating patch:"
746 msgstr "Error en crear el pedaç:"
747
970 -#: gitk:9256 gitk:9373 gitk:9430
748 msgid "ID:"
749 msgstr "ID:"
750
974 -#: gitk:9265
751 msgid "Tag name:"
752 msgstr "Nom d'etiqueta:"
753
978 -#: gitk:9268
754 msgid "Tag message is optional"
755 msgstr "El missatge d'etiqueta és opcional"
756
982 -#: gitk:9270
757 msgid "Tag message:"
758 msgstr "Missatge d'etiqueta:"
759
986 -#: gitk:9274 gitk:9439
760 msgid "Create"
761 msgstr "Crea"
762
990 -#: gitk:9292
763 msgid "No tag name specified"
764 msgstr "No s'ha especificat cap nom d'etiqueta"
765
994 -#: gitk:9296
766 #, tcl-format
767 msgid "Tag \"%s\" already exists"
768 msgstr "L'etiqueta \"%s\" ja existeix"
769
999 -#: gitk:9306
770 msgid "Error creating tag:"
771 msgstr "Error en crear l'etiqueta:"
772
1003 -#: gitk:9382
773 msgid "Command:"
774 msgstr "Ordre:"
775
1007 -#: gitk:9390
776 msgid "Write"
777 msgstr "Escriu"
778
1011 -#: gitk:9408
779 msgid "Error writing commit:"
780 msgstr "Error en escriure la comissió:"
781
1015 -#: gitk:9435
782 msgid "Name:"
783 msgstr "Nom:"
784
1019 -#: gitk:9458
785 msgid "Please specify a name for the new branch"
786 msgstr "Si us plau, especifiqueu un nom per a la branca nova"
787
1023 -#: gitk:9463
788 #, tcl-format
789 msgid "Branch '%s' already exists. Overwrite?"
790 msgstr "La branca '%s' ja existeix. Voleu sobreescriure?"
791
1028 -#: gitk:9530
792 #, tcl-format
793 msgid "Commit %s is already included in branch %s -- really re-apply it?"
794 msgstr ""
795 "La comissió %s ja està inclosa en la branca %s -- realment voleu tornar a "
796 "aplicar-la?"
797
1035 -#: gitk:9535
798 msgid "Cherry-picking"
799 msgstr "Recollint cireres"
800
1039 -#: gitk:9544
801 #, tcl-format
802 msgid ""
803 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1046,7 +807,6 @@ msgstr ""
807 "Si us plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu a "
808 "intentar."
809
1049 -#: gitk:9550
810 msgid ""
811 "Cherry-pick failed because of merge conflict.\n"
812 "Do you wish to run git citool to resolve it?"
@@ -1054,21 +814,17 @@ msgstr ""
814 "El recull de cireres ha fallat a causa d'un conflicte de fusió.\n"
815 "Voleu executar el git citool per a resoldre'l?"
816
1057 -#: gitk:9566 gitk:9624
817 msgid "No changes committed"
818 msgstr "Cap canvi comès"
819
1061 -#: gitk:9593
820 #, tcl-format
821 msgid "Commit %s is not included in branch %s -- really revert it?"
822 msgstr ""
823 "La comissió %s no s'inclou en la branca %s -- realment voleu revertir-la?"
824
1067 -#: gitk:9598
825 msgid "Reverting"
826 msgstr "Revertint"
827
1071 -#: gitk:9606
828 #, tcl-format
829 msgid ""
830 "Revert failed because of local changes to the following files:%s Please "
@@ -1078,7 +834,6 @@ msgstr ""
834 "plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu-ho a "
835 "intentar."
836
1081 -#: gitk:9610
837 msgid ""
838 "Revert failed because of merge conflict.\n"
839 " Do you wish to run git citool to resolve it?"
@@ -1086,28 +841,22 @@ msgstr ""
841 "La reversió ha fallat a causa d'un conflicte de fusió.\n"
842 " Voleu executar el git citool per a resoldre'l?"
843
1089 -#: gitk:9653
844 msgid "Confirm reset"
845 msgstr "Confirma el restabliment"
846
1093 -#: gitk:9655
847 #, tcl-format
848 msgid "Reset branch %s to %s?"
849 msgstr "Voleu restablir la branca %s a %s?"
850
1098 -#: gitk:9657
851 msgid "Reset type:"
852 msgstr "Tipus de restabliment:"
853
1102 -#: gitk:9660
854 msgid "Soft: Leave working tree and index untouched"
855 msgstr "Suau: Deixa l'arbre de treball i l'índex sense tocar"
856
1106 -#: gitk:9663
857 msgid "Mixed: Leave working tree untouched, reset index"
858 msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'índex"
859
1110 -#: gitk:9666
860 msgid ""
861 "Hard: Reset working tree and index\n"
862 "(discard ALL local changes)"
@@ -1115,19 +864,15 @@ msgstr ""
864 "Dur: Restableix l'arbre de treball i l'índex\n"
865 "(descarta TOTS els canvis locals)"
866
1118 -#: gitk:9683
867 msgid "Resetting"
868 msgstr "Restablint"
869
1122 -#: gitk:9743
870 msgid "Checking out"
871 msgstr "Agafant"
872
1126 -#: gitk:9796
873 msgid "Cannot delete the currently checked-out branch"
874 msgstr "No es pot suprimir la branca actualment agafada"
875
1130 -#: gitk:9802
876 #, tcl-format
877 msgid ""
878 "The commits on branch %s aren't on any other branch.\n"
@@ -1136,16 +881,13 @@ msgstr ""
881 "Les comissions en la branca %s no són en cap altra branca.\n"
882 "Realment voleu suprimir la branca %s?"
883
1139 -#: gitk:9833
884 #, tcl-format
885 msgid "Tags and heads: %s"
886 msgstr "Etiquetes i caps: %s"
887
1144 -#: gitk:9850
888 msgid "Filter"
889 msgstr "Filtre"
890
1148 -#: gitk:10146
891 msgid ""
892 "Error reading commit topology information; branch and preceding/following "
893 "tag information will be incomplete."
@@ -1153,201 +895,152 @@ msgstr ""
895 "Error en llegir la informació de topologia de comissió; la informació sobre "
896 "branques i etiquetes precedents/següents serà incompleta."
897
1156 -#: gitk:11123
898 msgid "Tag"
899 msgstr "Etiqueta"
900
1160 -#: gitk:11127
901 msgid "Id"
902 msgstr "Id"
903
1164 -#: gitk:11210
904 msgid "Gitk font chooser"
905 msgstr "Selector de tipus de lletra del Gitk"
906
1168 -#: gitk:11227
907 msgid "B"
908 msgstr "B"
909
1172 -#: gitk:11230
910 msgid "I"
911 msgstr "I"
912
1176 -#: gitk:11348
913 msgid "Commit list display options"
914 msgstr "Opcions de visualització de la llista de comissions"
915
1180 -#: gitk:11351
916 msgid "Maximum graph width (lines)"
917 msgstr "Amplada màxima del gràfic (línies)"
918
1184 -#: gitk:11355
919 #, no-tcl-format
920 msgid "Maximum graph width (% of pane)"
921 msgstr "Amplada màxima del gràfic (% del panell)"
922
1189 -#: gitk:11358
923 msgid "Show local changes"
924 msgstr "Mostra els canvis locals"
925
1193 -#: gitk:11361
926 msgid "Auto-select SHA1 (length)"
927 msgstr "Selecciona automàticament l'SHA1 (longitud)"
928
1197 -#: gitk:11365
929 msgid "Hide remote refs"
930 msgstr "Amaga les referències remotes"
931
1201 -#: gitk:11369
932 msgid "Diff display options"
933 msgstr "Opcions de visualització de diferència"
934
1205 -#: gitk:11371
935 msgid "Tab spacing"
936 msgstr "Espaiat de tabulació"
937
1209 -#: gitk:11374
938 msgid "Display nearby tags/heads"
939 msgstr "Mostra etiquetes/caps propers"
940
1213 -#: gitk:11377
941 msgid "Maximum # tags/heads to show"
942 msgstr "Nombre màxim d'etiquetes/caps a mostrar"
943
1217 -#: gitk:11380
944 msgid "Limit diffs to listed paths"
945 msgstr "Limita les diferències als camins llistats"
946
1221 -#: gitk:11383
947 msgid "Support per-file encodings"
948 msgstr "Admet codificacions específiques per a cada fitxer"
949
1225 -#: gitk:11389 gitk:11536
950 msgid "External diff tool"
951 msgstr "Eina de diferència externa"
952
1229 -#: gitk:11390
953 msgid "Choose..."
954 msgstr "Trieu..."
955
1233 -#: gitk:11395
956 msgid "General options"
957 msgstr "Opcions generals"
958
1237 -#: gitk:11398
959 msgid "Use themed widgets"
960 msgstr "Usa els ginys tematitzats"
961
1241 -#: gitk:11400
962 msgid "(change requires restart)"
963 msgstr "(el canvi requereix reiniciar)"
964
1245 -#: gitk:11402
965 msgid "(currently unavailable)"
966 msgstr "(actualment no disponible)"
967
1249 -#: gitk:11413
968 msgid "Colors: press to choose"
969 msgstr "Colors: pressiona per a triar"
970
1253 -#: gitk:11416
971 msgid "Interface"
972 msgstr "Interfície"
973
1257 -#: gitk:11417
974 msgid "interface"
975 msgstr "interfície"
976
1261 -#: gitk:11420
977 msgid "Background"
978 msgstr "Fons"
979
1265 -#: gitk:11421 gitk:11451
980 msgid "background"
981 msgstr "fons"
982
1269 -#: gitk:11424
983 msgid "Foreground"
984 msgstr "Primer pla"
985
1273 -#: gitk:11425
986 msgid "foreground"
987 msgstr "primer pla"
988
1277 -#: gitk:11428
989 msgid "Diff: old lines"
990 msgstr "Diferència: línies velles"
991
1281 -#: gitk:11429
992 msgid "diff old lines"
993 msgstr "diferencia les línies velles"
994
1285 -#: gitk:11433
995 msgid "Diff: new lines"
996 msgstr "Diferència: línies noves"
997
1289 -#: gitk:11434
998 msgid "diff new lines"
999 msgstr "diferencia les línies noves"
1000
1293 -#: gitk:11438
1001 msgid "Diff: hunk header"
1002 msgstr "Diferència: capçalera de tros"
1003
1297 -#: gitk:11440
1004 msgid "diff hunk header"
1005 msgstr "diferencia la capçalera de tros"
1006
1301 -#: gitk:11444
1007 msgid "Marked line bg"
1008 msgstr "Fons de la línia marcada"
1009
1305 -#: gitk:11446
1010 msgid "marked line background"
1011 msgstr "fons de la línia marcada"
1012
1309 -#: gitk:11450
1013 msgid "Select bg"
1014 msgstr "Fons de la selecció"
1015
1313 -#: gitk:11459
1016 msgid "Fonts: press to choose"
1017 msgstr "Tipus de lletra: pressiona per a triar"
1018
1317 -#: gitk:11461
1019 msgid "Main font"
1020 msgstr "Tipus de lletra principal"
1021
1321 -#: gitk:11462
1022 msgid "Diff display font"
1023 msgstr "Tipus de lletra de visualització de diferència"
1024
1325 -#: gitk:11463
1025 msgid "User interface font"
1026 msgstr "Tipus de lletra de la interfície d'usuari"
1027
1329 -#: gitk:11485
1028 msgid "Gitk preferences"
1029 msgstr "Preferències del Gitk"
1030
1333 -#: gitk:11494
1031 msgid "General"
1032 msgstr "General"
1033
1337 -#: gitk:11495
1034 msgid "Colors"
1035 msgstr "Colors"
1036
1341 -#: gitk:11496
1037 msgid "Fonts"
1038 msgstr "Tipus de lletra"
1039
1345 -#: gitk:11546
1040 #, tcl-format
1041 msgid "Gitk: choose color for %s"
1042 msgstr "Gitk: tria el color per a %s"
1043
1350 -#: gitk:12059
1044 msgid ""
1045 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1046 " Gitk requires at least Tcl/Tk 8.4."
@@ -1355,15 +1048,12 @@ msgstr ""
1048 "Perdó, el gitk no pot executar-se amb aquesta versió de Tcl/Tk.\n"
1049 " El Gitk requereix com a mínim el Tcl/Tk 8.4."
1050
1358 -#: gitk:12269
1051 msgid "Cannot find a git repository here."
1052 msgstr "No es pot trobar cap dipòsit de git aquí."
1053
1362 -#: gitk:12316
1054 #, tcl-format
1055 msgid "Ambiguous argument '%s': both revision and filename"
1056 msgstr "Paràmetre ambigu '%s': és tant revisió com nom de fitxer"
1057
1367 -#: gitk:12328
1058 msgid "Bad arguments to gitk:"
1059 msgstr "Paràmetres dolents al gitk:"
po/de.po
+3 -313
@@ -17,33 +17,26 @@ msgstr ""
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
20 -#: gitk:140
20 msgid "Couldn't get list of unmerged files:"
21 msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"
22
24 -#: gitk:212 gitk:2381
23 msgid "Color words"
24 msgstr "Wörter einfärben"
25
28 -#: gitk:217 gitk:2381 gitk:8220 gitk:8253
26 msgid "Markup words"
27 msgstr "Wörter kennzeichnen"
28
32 -#: gitk:324
29 msgid "Error parsing revisions:"
30 msgstr "Fehler beim Laden der Versionen:"
31
36 -#: gitk:380
32 msgid "Error executing --argscmd command:"
33 msgstr "Fehler beim Ausführen des --argscmd-Kommandos:"
34
40 -#: gitk:393
35 msgid "No files selected: --merge specified but no files are unmerged."
36 msgstr ""
37 "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren "
38 "keine nicht zusammengeführten Dateien."
39
46 -#: gitk:396
40 msgid ""
41 "No files selected: --merge specified but no unmerged files are within file "
42 "limit."
@@ -51,314 +44,234 @@ msgstr ""
44 "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine "
45 "nicht zusammengeführten Dateien in der Dateiauswahl."
46
54 -#: gitk:418 gitk:566
47 msgid "Error executing git log:"
48 msgstr "Fehler beim Ausführen von »git log«:"
49
58 -#: gitk:436 gitk:582
50 msgid "Reading"
51 msgstr "Lesen"
52
62 -#: gitk:496 gitk:4525
53 msgid "Reading commits..."
54 msgstr "Versionen werden gelesen ..."
55
66 -#: gitk:499 gitk:1637 gitk:4528
56 msgid "No commits selected"
57 msgstr "Keine Versionen ausgewählt"
58
70 -#: gitk:1445 gitk:4045 gitk:12432
59 msgid "Command line"
60 msgstr "Kommandozeile"
61
74 -#: gitk:1511
62 msgid "Can't parse git log output:"
63 msgstr "Ausgabe von »git log« kann nicht erkannt werden:"
64
78 -#: gitk:1740
65 msgid "No commit information available"
66 msgstr "Keine Versionsinformation verfügbar"
67
82 -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
68 msgid "OK"
69 msgstr "Ok"
70
86 -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
87 -#: gitk:11242 gitk:11522
71 msgid "Cancel"
72 msgstr "Abbrechen"
73
91 -#: gitk:2069
74 msgid "&Update"
75 msgstr "&Aktualisieren"
76
95 -#: gitk:2070
77 msgid "&Reload"
78 msgstr "&Neu laden"
79
99 -#: gitk:2071
80 msgid "Reread re&ferences"
81 msgstr "&Zweige neu laden"
82
103 -#: gitk:2072
83 msgid "&List references"
84 msgstr "Zweige/Markierungen auf&listen"
85
107 -#: gitk:2074
86 msgid "Start git &gui"
87 msgstr "»git &gui« starten"
88
111 -#: gitk:2076
89 msgid "&Quit"
90 msgstr "&Beenden"
91
115 -#: gitk:2068
92 msgid "&File"
93 msgstr "&Datei"
94
119 -#: gitk:2080
95 msgid "&Preferences"
96 msgstr "&Einstellungen"
97
123 -#: gitk:2079
98 msgid "&Edit"
99 msgstr "&Bearbeiten"
100
127 -#: gitk:2084
101 msgid "&New view..."
102 msgstr "&Neue Ansicht ..."
103
131 -#: gitk:2085
104 msgid "&Edit view..."
105 msgstr "Ansicht &bearbeiten ..."
106
135 -#: gitk:2086
107 msgid "&Delete view"
108 msgstr "Ansicht &entfernen"
109
139 -#: gitk:2088 gitk:4043
110 msgid "&All files"
111 msgstr "&Alle Dateien"
112
143 -#: gitk:2083 gitk:4067
113 msgid "&View"
114 msgstr "&Ansicht"
115
147 -#: gitk:2093 gitk:2103 gitk:3012
116 msgid "&About gitk"
117 msgstr "Über &gitk"
118
151 -#: gitk:2094 gitk:2108
119 msgid "&Key bindings"
120 msgstr "&Tastenkürzel"
121
155 -#: gitk:2092 gitk:2107
122 msgid "&Help"
123 msgstr "&Hilfe"
124
159 -#: gitk:2185 gitk:8652
125 msgid "SHA1 ID:"
126 msgstr "SHA1 ID:"
127
163 -#: gitk:2229
128 msgid "Row"
129 msgstr "Zeile"
130
167 -#: gitk:2267
131 msgid "Find"
132 msgstr "Suche"
133
171 -#: gitk:2295
134 msgid "commit"
135 msgstr "Version nach"
136
175 -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
176 -#: gitk:6912
137 msgid "containing:"
138 msgstr "Beschreibung:"
139
180 -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
140 msgid "touching paths:"
141 msgstr "Dateien:"
142
184 -#: gitk:2303 gitk:4777
143 msgid "adding/removing string:"
144 msgstr "Änderungen:"
145
188 -#: gitk:2304 gitk:4779
146 msgid "changing lines matching:"
147 msgstr "Geänderte Zeilen entsprechen:"
148
192 -#: gitk:2313 gitk:2315 gitk:4766
149 msgid "Exact"
150 msgstr "Exakt"
151
196 -#: gitk:2315 gitk:4854 gitk:6723
152 msgid "IgnCase"
153 msgstr "Kein Groß/Klein"
154
200 -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
155 msgid "Regexp"
156 msgstr "Regexp"
157
204 -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
158 msgid "All fields"
159 msgstr "Alle Felder"
160
208 -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
161 msgid "Headline"
162 msgstr "Überschrift"
163
212 -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
164 msgid "Comments"
165 msgstr "Beschreibung"
166
216 -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
217 -#: gitk:8845
167 msgid "Author"
168 msgstr "Autor"
169
221 -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
170 msgid "Committer"
171 msgstr "Eintragender"
172
225 -#: gitk:2350
173 msgid "Search"
174 msgstr "Suchen"
175
229 -#: gitk:2358
176 msgid "Diff"
177 msgstr "Vergleich"
178
233 -#: gitk:2360
179 msgid "Old version"
180 msgstr "Alte Version"
181
237 -#: gitk:2362
182 msgid "New version"
183 msgstr "Neue Version"
184
241 -#: gitk:2364
185 msgid "Lines of context"
186 msgstr "Kontextzeilen"
187
245 -#: gitk:2374
188 msgid "Ignore space change"
189 msgstr "Leerzeichenänderungen ignorieren"
190
249 -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
191 msgid "Line diff"
192 msgstr "Zeilenunterschied"
193
253 -#: gitk:2445
194 msgid "Patch"
195 msgstr "Patch"
196
257 -#: gitk:2447
197 msgid "Tree"
198 msgstr "Baum"
199
261 -#: gitk:2617 gitk:2637
200 msgid "Diff this -> selected"
201 msgstr "Vergleich: diese -> gewählte"
202
265 -#: gitk:2618 gitk:2638
203 msgid "Diff selected -> this"
204 msgstr "Vergleich: gewählte -> diese"
205
269 -#: gitk:2619 gitk:2639
206 msgid "Make patch"
207 msgstr "Patch erstellen"
208
273 -#: gitk:2620 gitk:9254
209 msgid "Create tag"
210 msgstr "Markierung erstellen"
211
277 -#: gitk:2621 gitk:9371
212 msgid "Write commit to file"
213 msgstr "Version in Datei schreiben"
214
281 -#: gitk:2622 gitk:9428
215 msgid "Create new branch"
216 msgstr "Neuen Zweig erstellen"
217
285 -#: gitk:2623
218 msgid "Cherry-pick this commit"
219 msgstr "Diese Version pflücken"
220
289 -#: gitk:2624
221 msgid "Reset HEAD branch to here"
222 msgstr "HEAD-Zweig auf diese Version zurücksetzen"
223
293 -#: gitk:2625
224 msgid "Mark this commit"
225 msgstr "Lesezeichen setzen"
226
297 -#: gitk:2626
227 msgid "Return to mark"
228 msgstr "Zum Lesezeichen"
229
301 -#: gitk:2627
230 msgid "Find descendant of this and mark"
231 msgstr "Abkömmling von Lesezeichen und dieser Version finden"
232
305 -#: gitk:2628
233 msgid "Compare with marked commit"
234 msgstr "Mit Lesezeichen vergleichen"
235
309 -#: gitk:2629 gitk:2640
236 msgid "Diff this -> marked commit"
237 msgstr "Vergleich: diese -> gewählte Version"
238
313 -#: gitk:2630 gitk:2641
239 msgid "Diff marked commit -> this"
240 msgstr "Vergleich: gewählte -> diese Version"
241
317 -#: gitk:2631
242 msgid "Revert this commit"
243 msgstr "Version umkehren"
244
321 -#: gitk:2647
245 msgid "Check out this branch"
246 msgstr "Auf diesen Zweig umstellen"
247
325 -#: gitk:2648
248 msgid "Remove this branch"
249 msgstr "Zweig löschen"
250
329 -#: gitk:2649
251 msgid "Copy branch name"
252 msgstr "Zweigname kopieren"
253
333 -#: gitk:2656
254 msgid "Highlight this too"
255 msgstr "Diesen auch hervorheben"
256
337 -#: gitk:2657
257 msgid "Highlight this only"
258 msgstr "Nur diesen hervorheben"
259
341 -#: gitk:2658
260 msgid "External diff"
261 msgstr "Externes Diff-Programm"
262
345 -#: gitk:2659
263 msgid "Blame parent commit"
264 msgstr "Annotieren der Elternversion"
265
349 -#: gitk:2660
266 msgid "Copy path"
267 msgstr "Pfad kopieren"
268
353 -#: gitk:2667
269 msgid "Show origin of this line"
270 msgstr "Herkunft dieser Zeile anzeigen"
271
357 -#: gitk:2668
272 msgid "Run git gui blame on this line"
273 msgstr "Diese Zeile annotieren (»git gui blame«)"
274
361 -#: gitk:3014
275 msgid ""
276 "\n"
277 "Gitk - a commit viewer for git\n"
@@ -375,517 +288,397 @@ msgstr ""
288 "Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
289 "License"
290
378 -#: gitk:3022 gitk:3089 gitk:9857
291 msgid "Close"
292 msgstr "Schließen"
293
382 -#: gitk:3043
294 msgid "Gitk key bindings"
295 msgstr "Gitk-Tastaturbelegung"
296
386 -#: gitk:3046
297 msgid "Gitk key bindings:"
298 msgstr "Gitk-Tastaturbelegung:"
299
390 -#: gitk:3048
300 #, tcl-format
301 msgid "<%s-Q>\t\tQuit"
302 msgstr "<%s-Q>\t\tBeenden"
303
395 -#: gitk:3049
304 #, tcl-format
305 msgid "<%s-W>\t\tClose window"
306 msgstr "<%s-F>\t\tFenster schließen"
307
400 -#: gitk:3050
308 msgid "<Home>\t\tMove to first commit"
309 msgstr "<Pos1>\t\tZur neuesten Version springen"
310
404 -#: gitk:3051
311 msgid "<End>\t\tMove to last commit"
312 msgstr "<Ende>\t\tZur ältesten Version springen"
313
408 -#: gitk:3052
314 msgid "<Up>, p, k\tMove up one commit"
315 msgstr "<Hoch>, p, k\tNächste neuere Version"
316
412 -#: gitk:3053
317 msgid "<Down>, n, j\tMove down one commit"
318 msgstr "<Runter>, n, j\tNächste ältere Version"
319
416 -#: gitk:3054
320 msgid "<Left>, z, h\tGo back in history list"
321 msgstr "<Links>, z, h\tEine Version zurückgehen"
322
420 -#: gitk:3055
323 msgid "<Right>, x, l\tGo forward in history list"
324 msgstr "<Rechts>, x, l\tEine Version weitergehen"
325
424 -#: gitk:3056
326 #, tcl-format
327 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
328 msgstr "<%s-n>\tZu n-ter Elternversion in Versionshistorie springen"
329
429 -#: gitk:3057
330 msgid "<PageUp>\tMove up one page in commit list"
331 msgstr "<BildHoch>\tEine Seite nach oben blättern"
332
433 -#: gitk:3058
333 msgid "<PageDown>\tMove down one page in commit list"
334 msgstr "<BildRunter>\tEine Seite nach unten blättern"
335
437 -#: gitk:3059
336 #, tcl-format
337 msgid "<%s-Home>\tScroll to top of commit list"
338 msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
339
442 -#: gitk:3060
340 #, tcl-format
341 msgid "<%s-End>\tScroll to bottom of commit list"
342 msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
343
447 -#: gitk:3061
344 #, tcl-format
345 msgid "<%s-Up>\tScroll commit list up one line"
346 msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
347
452 -#: gitk:3062
348 #, tcl-format
349 msgid "<%s-Down>\tScroll commit list down one line"
350 msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
351
457 -#: gitk:3063
352 #, tcl-format
353 msgid "<%s-PageUp>\tScroll commit list up one page"
354 msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern"
355
462 -#: gitk:3064
356 #, tcl-format
357 msgid "<%s-PageDown>\tScroll commit list down one page"
358 msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
359
467 -#: gitk:3065
360 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
361 msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
362
471 -#: gitk:3066
363 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
364 msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
365
475 -#: gitk:3067
366 msgid "<Delete>, b\tScroll diff view up one page"
367 msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
368
479 -#: gitk:3068
369 msgid "<Backspace>\tScroll diff view up one page"
370 msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
371
483 -#: gitk:3069
372 msgid "<Space>\t\tScroll diff view down one page"
373 msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
374
487 -#: gitk:3070
375 msgid "u\t\tScroll diff view up 18 lines"
376 msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern"
377
491 -#: gitk:3071
378 msgid "d\t\tScroll diff view down 18 lines"
379 msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern"
380
495 -#: gitk:3072
381 #, tcl-format
382 msgid "<%s-F>\t\tFind"
383 msgstr "<%s-F>\t\tSuchen"
384
500 -#: gitk:3073
385 #, tcl-format
386 msgid "<%s-G>\t\tMove to next find hit"
387 msgstr "<%s-G>\t\tWeitersuchen"
388
505 -#: gitk:3074
389 msgid "<Return>\tMove to next find hit"
390 msgstr "<Eingabetaste>\tWeitersuchen"
391
509 -#: gitk:3075
392 msgid "g\t\tGo to commit"
393 msgstr "g\t\tZu Version springen"
394
513 -#: gitk:3076
395 msgid "/\t\tFocus the search box"
396 msgstr "/\t\tTastaturfokus ins Suchfeld"
397
517 -#: gitk:3077
398 msgid "?\t\tMove to previous find hit"
399 msgstr "?\t\tRückwärts weitersuchen"
400
521 -#: gitk:3078
401 msgid "f\t\tScroll diff view to next file"
402 msgstr "f\t\tVergleich zur nächsten Datei blättern"
403
525 -#: gitk:3079
404 #, tcl-format
405 msgid "<%s-S>\t\tSearch for next hit in diff view"
406 msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
407
530 -#: gitk:3080
408 #, tcl-format
409 msgid "<%s-R>\t\tSearch for previous hit in diff view"
410 msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
411
535 -#: gitk:3081
412 #, tcl-format
413 msgid "<%s-KP+>\tIncrease font size"
414 msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern"
415
540 -#: gitk:3082
416 #, tcl-format
417 msgid "<%s-plus>\tIncrease font size"
418 msgstr "<%s-Plus>\tSchrift vergrößern"
419
545 -#: gitk:3083
420 #, tcl-format
421 msgid "<%s-KP->\tDecrease font size"
422 msgstr "<%s-Nummernblock-Minus> Schrift verkleinern"
423
550 -#: gitk:3084
424 #, tcl-format
425 msgid "<%s-minus>\tDecrease font size"
426 msgstr "<%s-Minus>\tSchrift verkleinern"
427
555 -#: gitk:3085
428 msgid "<F5>\t\tUpdate"
429 msgstr "<F5>\t\tAktualisieren"
430
559 -#: gitk:3550 gitk:3559
431 #, tcl-format
432 msgid "Error creating temporary directory %s:"
433 msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:"
434
564 -#: gitk:3572
435 #, tcl-format
436 msgid "Error getting \"%s\" from %s:"
437 msgstr "Fehler beim Holen von »%s« von »%s«:"
438
569 -#: gitk:3635
439 msgid "command failed:"
440 msgstr "Kommando fehlgeschlagen:"
441
573 -#: gitk:3784
442 msgid "No such commit"
443 msgstr "Version nicht gefunden"
444
577 -#: gitk:3798
445 msgid "git gui blame: command failed:"
446 msgstr "git gui blame: Kommando fehlgeschlagen:"
447
581 -#: gitk:3829
448 #, tcl-format
449 msgid "Couldn't read merge head: %s"
450 msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s"
451
586 -#: gitk:3837
452 #, tcl-format
453 msgid "Error reading index: %s"
454 msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s"
455
591 -#: gitk:3862
456 #, tcl-format
457 msgid "Couldn't start git blame: %s"
458 msgstr "»git blame« konnte nicht gestartet werden: %s"
459
596 -#: gitk:3865 gitk:6754
460 msgid "Searching"
461 msgstr "Suchen"
462
600 -#: gitk:3897
463 #, tcl-format
464 msgid "Error running git blame: %s"
465 msgstr "Fehler beim Ausführen von »git blame«: %s"
466
605 -#: gitk:3925
467 #, tcl-format
468 msgid "That line comes from commit %s, which is not in this view"
469 msgstr ""
470 "Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird"
471
611 -#: gitk:3939
472 msgid "External diff viewer failed:"
473 msgstr "Externes Diff-Programm fehlgeschlagen:"
474
615 -#: gitk:4070
475 msgid "Gitk view definition"
476 msgstr "Gitk-Ansichten"
477
619 -#: gitk:4074
478 msgid "Remember this view"
479 msgstr "Diese Ansicht speichern"
480
623 -#: gitk:4075
481 msgid "References (space separated list):"
482 msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):"
483
627 -#: gitk:4076
484 msgid "Branches & tags:"
485 msgstr "Zweige/Markierungen:"
486
631 -#: gitk:4077
487 msgid "All refs"
488 msgstr "Alle Markierungen und Zweige"
489
635 -#: gitk:4078
490 msgid "All (local) branches"
491 msgstr "Alle (lokalen) Zweige"
492
639 -#: gitk:4079
493 msgid "All tags"
494 msgstr "Alle Markierungen"
495
643 -#: gitk:4080
496 msgid "All remote-tracking branches"
497 msgstr "Alle Übernahmezweige"
498
647 -#: gitk:4081
499 msgid "Commit Info (regular expressions):"
500 msgstr "Versionsinformationen (reguläre Ausdrücke):"
501
651 -#: gitk:4082
502 msgid "Author:"
503 msgstr "Autor:"
504
655 -#: gitk:4083
505 msgid "Committer:"
506 msgstr "Eintragender:"
507
659 -#: gitk:4084
508 msgid "Commit Message:"
509 msgstr "Versionsbeschreibung:"
510
663 -#: gitk:4085
511 msgid "Matches all Commit Info criteria"
512 msgstr "Alle Versionsinformationen-Kriterien erfüllen"
513
667 -#: gitk:4086
514 msgid "Matches no Commit Info criteria"
515 msgstr "keine Versionsinformationen-Kriterien erfüllen"
516
671 -#: gitk:4087
517 msgid "Changes to Files:"
518 msgstr "Dateien:"
519
675 -#: gitk:4088
520 msgid "Fixed String"
521 msgstr "Zeichenkette"
522
679 -#: gitk:4089
523 msgid "Regular Expression"
524 msgstr "Regulärer Ausdruck"
525
683 -#: gitk:4090
526 msgid "Search string:"
527 msgstr "Suchausdruck:"
528
687 -#: gitk:4091
529 msgid ""
530 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
531 "15:27:38\"):"
532 msgstr ""
533 "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)"
534
694 -#: gitk:4092
535 msgid "Since:"
536 msgstr "Von:"
537
698 -#: gitk:4093
538 msgid "Until:"
539 msgstr "Bis:"
540
702 -#: gitk:4094
541 msgid "Limit and/or skip a number of revisions (positive integer):"
542 msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):"
543
706 -#: gitk:4095
544 msgid "Number to show:"
545 msgstr "Anzeigen:"
546
710 -#: gitk:4096
547 msgid "Number to skip:"
548 msgstr "Überspringen:"
549
714 -#: gitk:4097
550 msgid "Miscellaneous options:"
551 msgstr "Sonstiges:"
552
718 -#: gitk:4098
553 msgid "Strictly sort by date"
554 msgstr "Streng nach Datum sortieren"
555
722 -#: gitk:4099
556 msgid "Mark branch sides"
557 msgstr "Zweig-Seiten markieren"
558
726 -#: gitk:4100
559 msgid "Limit to first parent"
560 msgstr "Auf erste Elternversion beschränken"
561
730 -#: gitk:4101
562 msgid "Simple history"
563 msgstr "Einfache Historie"
564
734 -#: gitk:4102
565 msgid "Additional arguments to git log:"
566 msgstr "Zusätzliche Argumente für »git log«:"
567
738 -#: gitk:4103
568 msgid "Enter files and directories to include, one per line:"
569 msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
570
742 -#: gitk:4104
571 msgid "Command to generate more commits to include:"
572 msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
573
746 -#: gitk:4228
574 msgid "Gitk: edit view"
575 msgstr "Gitk: Ansicht bearbeiten"
576
750 -#: gitk:4236
577 msgid "-- criteria for selecting revisions"
578 msgstr "-- Auswahl der angezeigten Versionen"
579
754 -#: gitk:4241
580 msgid "View Name"
581 msgstr "Ansichtsname"
582
758 -#: gitk:4316
583 msgid "Apply (F5)"
584 msgstr "Anwenden (F5)"
585
762 -#: gitk:4354
586 msgid "Error in commit selection arguments:"
587 msgstr "Fehler in den ausgewählten Versionen:"
588
766 -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
589 msgid "None"
590 msgstr "Keine"
591
770 -#: gitk:5021 gitk:5026
592 msgid "Descendant"
593 msgstr "Abkömmling"
594
774 -#: gitk:5022
595 msgid "Not descendant"
596 msgstr "Kein Abkömmling"
597
778 -#: gitk:5029 gitk:5034
598 msgid "Ancestor"
599 msgstr "Vorgänger"
600
782 -#: gitk:5030
601 msgid "Not ancestor"
602 msgstr "Kein Vorgänger"
603
786 -#: gitk:5324
604 msgid "Local changes checked in to index but not committed"
605 msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
606
790 -#: gitk:5360
607 msgid "Local uncommitted changes, not checked in to index"
608 msgstr "Lokale Änderungen, nicht bereitgestellt"
609
794 -#: gitk:7134
610 msgid "and many more"
611 msgstr "und weitere"
612
798 -#: gitk:7137
613 msgid "many"
614 msgstr "viele"
615
802 -#: gitk:7328
616 msgid "Tags:"
617 msgstr "Markierungen:"
618
806 -#: gitk:7345 gitk:7351 gitk:8825
619 msgid "Parent"
620 msgstr "Eltern"
621
810 -#: gitk:7356
622 msgid "Child"
623 msgstr "Kind"
624
814 -#: gitk:7365
625 msgid "Branch"
626 msgstr "Zweig"
627
818 -#: gitk:7368
628 msgid "Follows"
629 msgstr "Folgt auf"
630
822 -#: gitk:7371
631 msgid "Precedes"
632 msgstr "Vorgänger von"
633
826 -#: gitk:7966
634 #, tcl-format
635 msgid "Error getting diffs: %s"
636 msgstr "Fehler beim Laden des Vergleichs: %s"
637
831 -#: gitk:8650
638 msgid "Goto:"
639 msgstr "Gehe zu:"
640
835 -#: gitk:8671
641 #, tcl-format
642 msgid "Short SHA1 id %s is ambiguous"
643 msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
644
840 -#: gitk:8678
645 #, tcl-format
646 msgid "Revision %s is not known"
647 msgstr "Version »%s« ist unbekannt"
648
845 -#: gitk:8688
649 #, tcl-format
650 msgid "SHA1 id %s is not known"
651 msgstr "SHA1-Hashwert »%s« ist unbekannt"
652
850 -#: gitk:8690
653 #, tcl-format
654 msgid "Revision %s is not in the current view"
655 msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt"
656
855 -#: gitk:8832 gitk:8847
657 msgid "Date"
658 msgstr "Datum"
659
859 -#: gitk:8835
660 msgid "Children"
661 msgstr "Kinder"
662
863 -#: gitk:8898
663 #, tcl-format
664 msgid "Reset %s branch to here"
665 msgstr "Zweig »%s« hierher zurücksetzen"
666
868 -#: gitk:8900
667 msgid "Detached head: can't reset"
668 msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
669
872 -#: gitk:9005 gitk:9011
670 msgid "Skipping merge commit "
671 msgstr "Überspringe Zusammenführungs-Version "
672
876 -#: gitk:9020 gitk:9025
673 msgid "Error getting patch ID for "
674 msgstr "Fehler beim Holen der Patch-ID für "
675
880 -#: gitk:9021 gitk:9026
676 msgid " - stopping\n"
677 msgstr " - Abbruch.\n"
678
884 -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
679 msgid "Commit "
680 msgstr "Version "
681
888 -#: gitk:9035
682 msgid ""
683 " is the same patch as\n"
684 " "
@@ -893,7 +686,6 @@ msgstr ""
686 " ist das gleiche Patch wie\n"
687 " "
688
896 -#: gitk:9043
689 msgid ""
690 " differs from\n"
691 " "
@@ -901,7 +693,6 @@ msgstr ""
693 " ist unterschiedlich von\n"
694 " "
695
904 -#: gitk:9045
696 msgid ""
697 "Diff of commits:\n"
698 "\n"
@@ -909,131 +700,101 @@ msgstr ""
700 "Vergleich der Versionen:\n"
701 "\n"
702
912 -#: gitk:9057 gitk:9066
703 #, tcl-format
704 msgid " has %s children - stopping\n"
705 msgstr " hat %s Kinder. Abbruch\n"
706
917 -#: gitk:9085
707 #, tcl-format
708 msgid "Error writing commit to file: %s"
709 msgstr "Fehler beim Schreiben der Version in Datei: %s"
710
922 -#: gitk:9091
711 #, tcl-format
712 msgid "Error diffing commits: %s"
713 msgstr "Fehler beim Vergleichen der Versionen: %s"
714
927 -#: gitk:9137
715 msgid "Top"
716 msgstr "Oben"
717
931 -#: gitk:9138
718 msgid "From"
719 msgstr "Von"
720
935 -#: gitk:9143
721 msgid "To"
722 msgstr "bis"
723
939 -#: gitk:9167
724 msgid "Generate patch"
725 msgstr "Patch erstellen"
726
943 -#: gitk:9169
727 msgid "From:"
728 msgstr "Von:"
729
947 -#: gitk:9178
730 msgid "To:"
731 msgstr "bis:"
732
951 -#: gitk:9187
733 msgid "Reverse"
734 msgstr "Umgekehrt"
735
955 -#: gitk:9189 gitk:9385
736 msgid "Output file:"
737 msgstr "Ausgabedatei:"
738
959 -#: gitk:9195
739 msgid "Generate"
740 msgstr "Erzeugen"
741
963 -#: gitk:9233
742 msgid "Error creating patch:"
743 msgstr "Fehler beim Erzeugen des Patches:"
744
967 -#: gitk:9256 gitk:9373 gitk:9430
745 msgid "ID:"
746 msgstr "ID:"
747
971 -#: gitk:9265
748 msgid "Tag name:"
749 msgstr "Markierungsname:"
750
975 -#: gitk:9268
751 msgid "Tag message is optional"
752 msgstr "Eine Markierungsbeschreibung ist optional"
753
979 -#: gitk:9270
754 msgid "Tag message:"
755 msgstr "Markierungsbeschreibung:"
756
983 -#: gitk:9274 gitk:9439
757 msgid "Create"
758 msgstr "Erstellen"
759
987 -#: gitk:9292
760 msgid "No tag name specified"
761 msgstr "Kein Markierungsname angegeben"
762
991 -#: gitk:9296
763 #, tcl-format
764 msgid "Tag \"%s\" already exists"
765 msgstr "Markierung »%s« existiert bereits."
766
996 -#: gitk:9306
767 msgid "Error creating tag:"
768 msgstr "Fehler beim Erstellen der Markierung:"
769
1000 -#: gitk:9382
770 msgid "Command:"
771 msgstr "Kommando:"
772
1004 -#: gitk:9390
773 msgid "Write"
774 msgstr "Schreiben"
775
1008 -#: gitk:9408
776 msgid "Error writing commit:"
777 msgstr "Fehler beim Schreiben der Version:"
778
1012 -#: gitk:9435
779 msgid "Name:"
780 msgstr "Name:"
781
1016 -#: gitk:9458
782 msgid "Please specify a name for the new branch"
783 msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
784
1020 -#: gitk:9463
785 #, tcl-format
786 msgid "Branch '%s' already exists. Overwrite?"
787 msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?"
788
1025 -#: gitk:9530
789 #, tcl-format
790 msgid "Commit %s is already included in branch %s -- really re-apply it?"
791 msgstr ""
792 "Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
793 "eintragen?"
794
1032 -#: gitk:9535
795 msgid "Cherry-picking"
796 msgstr "Version pflücken"
797
1036 -#: gitk:9544
798 #, tcl-format
799 msgid ""
800 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1043,7 +804,6 @@ msgstr ""
804 "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
805 "zwischenspeichern (»git stash«) und dann erneut versuchen."
806
1046 -#: gitk:9550
807 msgid ""
808 "Cherry-pick failed because of merge conflict.\n"
809 "Do you wish to run git citool to resolve it?"
@@ -1052,21 +812,16 @@ msgstr ""
812 "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
813 "werden, um diesen Konflikt aufzulösen?"
814
1055 -#: gitk:9566 gitk:9624
815 msgid "No changes committed"
816 msgstr "Keine Änderungen eingetragen"
817
1059 -#: gitk:9593
818 #, tcl-format
819 msgid "Commit %s is not included in branch %s -- really revert it?"
1062 -msgstr ""
1063 -"Version »%s« ist nicht im Zweig »%s« enthalten -- trotzdem umkehren?"
820 +msgstr "Version »%s« ist nicht im Zweig »%s« enthalten -- trotzdem umkehren?"
821
1065 -#: gitk:9598
822 msgid "Reverting"
823 msgstr "Umkehren"
824
1069 -#: gitk:9606
825 #, tcl-format
826 msgid ""
827 "Revert failed because of local changes to the following files:%s Please "
@@ -1076,7 +831,6 @@ msgstr ""
831 "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
832 "zwischenspeichern (»git stash«) und dann erneut versuchen."
833
1079 -#: gitk:9610
834 msgid ""
835 "Revert failed because of merge conflict.\n"
836 " Do you wish to run git citool to resolve it?"
@@ -1085,30 +839,24 @@ msgstr ""
839 "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
840 "werden, um diesen Konflikt aufzulösen?"
841
1088 -#: gitk:9653
842 msgid "Confirm reset"
843 msgstr "Zurücksetzen bestätigen"
844
1092 -#: gitk:9655
845 #, tcl-format
846 msgid "Reset branch %s to %s?"
847 msgstr "Zweig »%s« auf »%s« zurücksetzen?"
848
1097 -#: gitk:9657
849 msgid "Reset type:"
850 msgstr "Art des Zurücksetzens:"
851
1101 -#: gitk:9660
852 msgid "Soft: Leave working tree and index untouched"
853 msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
854
1105 -#: gitk:9663
855 msgid "Mixed: Leave working tree untouched, reset index"
856 msgstr ""
857 "Gemischt: Arbeitskopie unverändert,\n"
858 "Bereitstellung zurückgesetzt"
859
1111 -#: gitk:9666
860 msgid ""
861 "Hard: Reset working tree and index\n"
862 "(discard ALL local changes)"
@@ -1116,21 +864,17 @@ msgstr ""
864 "Hart: Arbeitskopie und Bereitstellung\n"
865 "(Alle lokalen Änderungen werden gelöscht)"
866
1119 -#: gitk:9683
867 msgid "Resetting"
868 msgstr "Zurücksetzen"
869
1123 -#: gitk:9743
870 msgid "Checking out"
871 msgstr "Umstellen"
872
1127 -#: gitk:9796
873 msgid "Cannot delete the currently checked-out branch"
874 msgstr ""
875 "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
876 "gelöscht werden."
877
1133 -#: gitk:9802
878 #, tcl-format
879 msgid ""
880 "The commits on branch %s aren't on any other branch.\n"
@@ -1139,16 +883,13 @@ msgstr ""
883 "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
884 "Zweig »%s« trotzdem löschen?"
885
1142 -#: gitk:9833
886 #, tcl-format
887 msgid "Tags and heads: %s"
888 msgstr "Markierungen und Zweige: %s"
889
1147 -#: gitk:9850
890 msgid "Filter"
891 msgstr "Filtern"
892
1151 -#: gitk:10146
893 msgid ""
894 "Error reading commit topology information; branch and preceding/following "
895 "tag information will be incomplete."
@@ -1156,218 +897,167 @@ msgstr ""
897 "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu "
898 "Vorgänger/Nachfolger werden unvollständig sein."
899
1159 -#: gitk:11123
900 msgid "Tag"
901 msgstr "Markierung"
902
1163 -#: gitk:11127
903 msgid "Id"
904 msgstr "Id"
905
1167 -#: gitk:11210
906 msgid "Gitk font chooser"
907 msgstr "Gitk-Schriften wählen"
908
1171 -#: gitk:11227
909 msgid "B"
910 msgstr "F"
911
1175 -#: gitk:11230
912 msgid "I"
913 msgstr "K"
914
1179 -#: gitk:11348
915 msgid "Commit list display options"
916 msgstr "Anzeige der Versionsliste"
917
1183 -#: gitk:11351
918 msgid "Maximum graph width (lines)"
919 msgstr "Maximale Graphenbreite (Zeilen)"
920
1187 -#: gitk:11355
921 #, no-tcl-format
922 msgid "Maximum graph width (% of pane)"
923 msgstr "Maximale Graphenbreite (% des Fensters)"
924
1192 -#: gitk:11358
925 msgid "Show local changes"
926 msgstr "Lokale Änderungen anzeigen"
927
1196 -#: gitk:11361
928 msgid "Auto-select SHA1 (length)"
929 msgstr "SHA1-Hashwert (Länge) automatisch auswählen"
930
1200 -#: gitk:11365
931 msgid "Hide remote refs"
932 msgstr "Entfernte Zweige/Markierungen ausblenden"
933
1204 -#: gitk:11369
934 msgid "Diff display options"
935 msgstr "Anzeige des Vergleichs"
936
1208 -#: gitk:11371
937 msgid "Tab spacing"
938 msgstr "Tabulatorbreite"
939
1212 -#: gitk:11374
940 msgid "Display nearby tags/heads"
941 msgstr "Naheliegende Markierungen/Zweigspitzen anzeigen"
942
1216 -#: gitk:11377
943 msgid "Maximum # tags/heads to show"
944 msgstr "Maximale Anzahl anzuzeigender Markierungen/Zweigspitzen"
945
1220 -#: gitk:11380
946 msgid "Limit diffs to listed paths"
947 msgstr "Vergleich nur für angezeigte Pfade"
948
1224 -#: gitk:11383
949 msgid "Support per-file encodings"
950 msgstr "Zeichenkodierung pro Datei ermitteln"
951
1228 -#: gitk:11389 gitk:11536
952 msgid "External diff tool"
953 msgstr "Externes Diff-Programm"
954
1232 -#: gitk:11390
955 msgid "Choose..."
956 msgstr "Wählen ..."
957
1236 -#: gitk:11395
958 msgid "General options"
959 msgstr "Allgemeine Optionen"
960
1240 -#: gitk:11398
961 msgid "Use themed widgets"
962 msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen"
963
1244 -#: gitk:11400
964 msgid "(change requires restart)"
965 msgstr "(Änderungen werden erst nach Neustart wirksam)"
966
1248 -#: gitk:11402
967 msgid "(currently unavailable)"
968 msgstr "(Momentan nicht verfügbar)"
969
1252 -#: gitk:11413
970 msgid "Colors: press to choose"
971 msgstr "Farben: Klicken zum Wählen"
972
1256 -#: gitk:11416
973 msgid "Interface"
974 msgstr "Benutzeroberfläche"
975
1260 -#: gitk:11417
976 msgid "interface"
977 msgstr "Benutzeroberfläche"
978
1264 -#: gitk:11420
979 msgid "Background"
980 msgstr "Hintergrund"
981
1268 -#: gitk:11421 gitk:11451
982 msgid "background"
983 msgstr "Hintergrund"
984
1272 -#: gitk:11424
985 msgid "Foreground"
986 msgstr "Vordergrund"
987
1276 -#: gitk:11425
988 msgid "foreground"
989 msgstr "Vordergrund"
990
1280 -#: gitk:11428
991 msgid "Diff: old lines"
992 msgstr "Vergleich: Alte Zeilen"
993
1284 -#: gitk:11429
994 msgid "diff old lines"
995 msgstr "Vergleich - Alte Zeilen"
996
1288 -#: gitk:11433
997 msgid "Diff: new lines"
998 msgstr "Vergleich: Neue Zeilen"
999
1292 -#: gitk:11434
1000 msgid "diff new lines"
1001 msgstr "Vergleich - Neue Zeilen"
1002
1296 -#: gitk:11438
1003 msgid "Diff: hunk header"
1004 msgstr "Vergleich: Änderungstitel"
1005
1300 -#: gitk:11440
1006 msgid "diff hunk header"
1007 msgstr "Vergleich - Änderungstitel"
1008
1304 -#: gitk:11444
1009 msgid "Marked line bg"
1010 msgstr "Hintergrund für markierte Zeile"
1011
1308 -#: gitk:11446
1012 msgid "marked line background"
1013 msgstr "Hintergrund für markierte Zeile"
1014
1312 -#: gitk:11450
1015 msgid "Select bg"
1016 msgstr "Hintergrundfarbe auswählen"
1017
1316 -#: gitk:11459
1018 msgid "Fonts: press to choose"
1019 msgstr "Schriftart: Klicken zum Wählen"
1020
1320 -#: gitk:11461
1021 msgid "Main font"
1022 msgstr "Programmschriftart"
1023
1324 -#: gitk:11462
1024 msgid "Diff display font"
1025 msgstr "Schriftart für Vergleich"
1026
1328 -#: gitk:11463
1027 msgid "User interface font"
1028 msgstr "Beschriftungen"
1029
1332 -#: gitk:11485
1030 msgid "Gitk preferences"
1031 msgstr "Gitk-Einstellungen"
1032
1336 -#: gitk:11494
1033 msgid "General"
1034 msgstr "Allgemein"
1035
1340 -#: gitk:11495
1036 msgid "Colors"
1037 msgstr "Farben"
1038
1344 -#: gitk:11496
1039 msgid "Fonts"
1040 msgstr "Schriftarten"
1041
1348 -#: gitk:11546
1042 #, tcl-format
1043 msgid "Gitk: choose color for %s"
1044 msgstr "Gitk: Farbe wählen für %s"
1045
1353 -#: gitk:12059
1046 msgid ""
1047 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1048 " Gitk requires at least Tcl/Tk 8.4."
1049 msgstr ""
1358 -"Entschuldigung, gitk kann nicht mit dieser Tcl/Tk Version ausgeführt werden.\n"
1050 +"Entschuldigung, gitk kann nicht mit dieser Tcl/Tk Version ausgeführt "
1051 +"werden.\n"
1052 " Gitk erfordert mindestens Tcl/Tk 8.4."
1053
1361 -#: gitk:12269
1054 msgid "Cannot find a git repository here."
1055 msgstr "Kein Git-Projektarchiv gefunden."
1056
1365 -#: gitk:12316
1057 #, tcl-format
1058 msgid "Ambiguous argument '%s': both revision and filename"
1059 msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
1060
1370 -#: gitk:12328
1061 msgid "Bad arguments to gitk:"
1062 msgstr "Falsche Kommandozeilen-Parameter für gitk:"
1063
po/es.po
-310
@@ -17,34 +17,27 @@ msgstr ""
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
20 -#: gitk:140
20 msgid "Couldn't get list of unmerged files:"
21 msgstr "Imposible obtener la lista de archivos pendientes de fusión:"
22
24 -#: gitk:212 gitk:2381
23 msgid "Color words"
24 msgstr ""
25
28 -#: gitk:217 gitk:2381 gitk:8220 gitk:8253
26 msgid "Markup words"
27 msgstr ""
28
32 -#: gitk:324
29 #, fuzzy
30 msgid "Error parsing revisions:"
31 msgstr "Error al leer las diferencias de fusión:"
32
37 -#: gitk:380
33 msgid "Error executing --argscmd command:"
34 msgstr ""
35
41 -#: gitk:393
36 msgid "No files selected: --merge specified but no files are unmerged."
37 msgstr ""
38 "No hay archivos seleccionados: se seleccionó la opción --merge pero no hay "
39 "archivos pendientes de fusión."
40
47 -#: gitk:396
41 msgid ""
42 "No files selected: --merge specified but no unmerged files are within file "
43 "limit."
@@ -52,319 +45,239 @@ msgstr ""
45 "No hay archivos seleccionados: se seleccionó la opción --merge pero los "
46 "archivos especificados no necesitan fusión."
47
55 -#: gitk:418 gitk:566
48 #, fuzzy
49 msgid "Error executing git log:"
50 msgstr "Error al crear la etiqueta:"
51
60 -#: gitk:436 gitk:582
52 msgid "Reading"
53 msgstr "Leyendo"
54
64 -#: gitk:496 gitk:4525
55 msgid "Reading commits..."
56 msgstr "Leyendo revisiones..."
57
68 -#: gitk:499 gitk:1637 gitk:4528
58 msgid "No commits selected"
59 msgstr "No se seleccionaron revisiones"
60
72 -#: gitk:1445 gitk:4045 gitk:12432
61 msgid "Command line"
62 msgstr "Línea de comandos"
63
76 -#: gitk:1511
64 msgid "Can't parse git log output:"
65 msgstr "Error analizando la salida de git log:"
66
80 -#: gitk:1740
67 msgid "No commit information available"
68 msgstr "Falta información sobre las revisiones"
69
84 -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
70 msgid "OK"
71 msgstr "Aceptar"
72
88 -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
89 -#: gitk:11242 gitk:11522
73 msgid "Cancel"
74 msgstr "Cancelar"
75
93 -#: gitk:2069
76 msgid "&Update"
77 msgstr "Actualizar"
78
97 -#: gitk:2070
79 msgid "&Reload"
80 msgstr ""
81
101 -#: gitk:2071
82 msgid "Reread re&ferences"
83 msgstr "Releer referencias"
84
105 -#: gitk:2072
85 msgid "&List references"
86 msgstr "Lista de referencias"
87
109 -#: gitk:2074
88 msgid "Start git &gui"
89 msgstr ""
90
113 -#: gitk:2076
91 msgid "&Quit"
92 msgstr "Salir"
93
117 -#: gitk:2068
94 msgid "&File"
95 msgstr "Archivo"
96
121 -#: gitk:2080
97 msgid "&Preferences"
98 msgstr "Preferencias"
99
125 -#: gitk:2079
100 msgid "&Edit"
101 msgstr "Editar"
102
129 -#: gitk:2084
103 msgid "&New view..."
104 msgstr "Nueva vista..."
105
133 -#: gitk:2085
106 msgid "&Edit view..."
107 msgstr "Modificar vista..."
108
137 -#: gitk:2086
109 msgid "&Delete view"
110 msgstr "Eliminar vista"
111
141 -#: gitk:2088 gitk:4043
112 msgid "&All files"
113 msgstr "Todos los archivos"
114
145 -#: gitk:2083 gitk:4067
115 msgid "&View"
116 msgstr "Vista"
117
149 -#: gitk:2093 gitk:2103 gitk:3012
118 msgid "&About gitk"
119 msgstr "Acerca de gitk"
120
153 -#: gitk:2094 gitk:2108
121 msgid "&Key bindings"
122 msgstr "Combinaciones de teclas"
123
157 -#: gitk:2092 gitk:2107
124 msgid "&Help"
125 msgstr "Ayuda"
126
161 -#: gitk:2185 gitk:8652
127 msgid "SHA1 ID:"
128 msgstr "SHA1 ID:"
129
165 -#: gitk:2229
130 msgid "Row"
131 msgstr ""
132
169 -#: gitk:2267
133 msgid "Find"
134 msgstr "Buscar"
135
173 -#: gitk:2295
136 msgid "commit"
137 msgstr "revisión"
138
177 -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
178 -#: gitk:6912
139 msgid "containing:"
140 msgstr "que contiene:"
141
182 -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
142 msgid "touching paths:"
143 msgstr "que modifica la ruta:"
144
186 -#: gitk:2303 gitk:4777
145 msgid "adding/removing string:"
146 msgstr "que añade/elimina cadena:"
147
190 -#: gitk:2304 gitk:4779
148 msgid "changing lines matching:"
149 msgstr ""
150
194 -#: gitk:2313 gitk:2315 gitk:4766
151 msgid "Exact"
152 msgstr "Exacto"
153
198 -#: gitk:2315 gitk:4854 gitk:6723
154 msgid "IgnCase"
155 msgstr "NoMayús"
156
202 -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
157 msgid "Regexp"
158 msgstr "Regex"
159
206 -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
160 msgid "All fields"
161 msgstr "Todos los campos"
162
210 -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
163 msgid "Headline"
164 msgstr "Título"
165
214 -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
166 msgid "Comments"
167 msgstr "Comentarios"
168
218 -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
219 -#: gitk:8845
169 msgid "Author"
170 msgstr "Autor"
171
223 -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
172 msgid "Committer"
173 msgstr ""
174
227 -#: gitk:2350
175 msgid "Search"
176 msgstr "Buscar"
177
231 -#: gitk:2358
178 msgid "Diff"
179 msgstr "Diferencia"
180
235 -#: gitk:2360
181 msgid "Old version"
182 msgstr "Versión antigua"
183
239 -#: gitk:2362
184 msgid "New version"
185 msgstr "Versión nueva"
186
243 -#: gitk:2364
187 msgid "Lines of context"
188 msgstr "Líneas de contexto"
189
247 -#: gitk:2374
190 msgid "Ignore space change"
191 msgstr "Ignora cambios de espaciado"
192
251 -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
193 msgid "Line diff"
194 msgstr ""
195
255 -#: gitk:2445
196 msgid "Patch"
197 msgstr "Parche"
198
259 -#: gitk:2447
199 msgid "Tree"
200 msgstr "Árbol"
201
263 -#: gitk:2617 gitk:2637
202 msgid "Diff this -> selected"
203 msgstr "Diferencia de esta -> seleccionada"
204
267 -#: gitk:2618 gitk:2638
205 msgid "Diff selected -> this"
206 msgstr "Diferencia de seleccionada -> esta"
207
271 -#: gitk:2619 gitk:2639
208 msgid "Make patch"
209 msgstr "Crear patch"
210
275 -#: gitk:2620 gitk:9254
211 msgid "Create tag"
212 msgstr "Crear etiqueta"
213
279 -#: gitk:2621 gitk:9371
214 msgid "Write commit to file"
215 msgstr "Escribir revisiones a archivo"
216
283 -#: gitk:2622 gitk:9428
217 msgid "Create new branch"
218 msgstr "Crear nueva rama"
219
287 -#: gitk:2623
220 msgid "Cherry-pick this commit"
221 msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
222
291 -#: gitk:2624
223 msgid "Reset HEAD branch to here"
224 msgstr "Traer la rama HEAD aquí"
225
295 -#: gitk:2625
226 #, fuzzy
227 msgid "Mark this commit"
228 msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
229
300 -#: gitk:2626
230 msgid "Return to mark"
231 msgstr ""
232
304 -#: gitk:2627
233 msgid "Find descendant of this and mark"
234 msgstr ""
235
308 -#: gitk:2628
236 msgid "Compare with marked commit"
237 msgstr ""
238
312 -#: gitk:2629 gitk:2640
239 #, fuzzy
240 msgid "Diff this -> marked commit"
241 msgstr "Diferencia de esta -> seleccionada"
242
317 -#: gitk:2630 gitk:2641
243 #, fuzzy
244 msgid "Diff marked commit -> this"
245 msgstr "Diferencia de seleccionada -> esta"
246
322 -#: gitk:2631
247 #, fuzzy
248 msgid "Revert this commit"
249 msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
250
327 -#: gitk:2647
251 msgid "Check out this branch"
252 msgstr "Cambiar a esta rama"
253
331 -#: gitk:2648
254 msgid "Remove this branch"
255 msgstr "Eliminar esta rama"
256
335 -#: gitk:2649
257 msgid "Copy branch name"
258 msgstr ""
259
339 -#: gitk:2656
260 msgid "Highlight this too"
261 msgstr "Seleccionar también"
262
343 -#: gitk:2657
263 msgid "Highlight this only"
264 msgstr "Seleccionar sólo"
265
347 -#: gitk:2658
266 msgid "External diff"
267 msgstr ""
268
351 -#: gitk:2659
269 msgid "Blame parent commit"
270 msgstr ""
271
355 -#: gitk:2660
272 msgid "Copy path"
273 msgstr ""
274
359 -#: gitk:2667
275 msgid "Show origin of this line"
276 msgstr ""
277
363 -#: gitk:2668
278 msgid "Run git gui blame on this line"
279 msgstr ""
280
367 -#: gitk:3014
281 #, fuzzy
282 msgid ""
283 "\n"
@@ -382,733 +295,569 @@ msgstr ""
295 "Uso y redistribución permitidos según los términos de la Licencia Pública "
296 "General de GNU (GNU GPL)"
297
385 -#: gitk:3022 gitk:3089 gitk:9857
298 msgid "Close"
299 msgstr "Cerrar"
300
389 -#: gitk:3043
301 msgid "Gitk key bindings"
302 msgstr "Combinaciones de tecla de Gitk"
303
393 -#: gitk:3046
304 msgid "Gitk key bindings:"
305 msgstr "Combinaciones de tecla de Gitk:"
306
397 -#: gitk:3048
307 #, tcl-format
308 msgid "<%s-Q>\t\tQuit"
309 msgstr "<%s-Q>\t\tSalir"
310
402 -#: gitk:3049
311 #, fuzzy, tcl-format
312 msgid "<%s-W>\t\tClose window"
313 msgstr "<%s-F>\t\tBuscar"
314
407 -#: gitk:3050
315 msgid "<Home>\t\tMove to first commit"
316 msgstr "<Home>\t\tIr a la primera revisión"
317
411 -#: gitk:3051
318 msgid "<End>\t\tMove to last commit"
319 msgstr "<End>\t\tIr a la última revisión"
320
415 -#: gitk:3052
321 #, fuzzy
322 msgid "<Up>, p, k\tMove up one commit"
323 msgstr "<Up>, p, i\tSubir una revisión"
324
420 -#: gitk:3053
325 #, fuzzy
326 msgid "<Down>, n, j\tMove down one commit"
327 msgstr "<Down>, n, k\tBajar una revisión"
328
425 -#: gitk:3054
329 #, fuzzy
330 msgid "<Left>, z, h\tGo back in history list"
331 msgstr "<Left>, z, j\tRetroceder en la historia"
332
430 -#: gitk:3055
333 msgid "<Right>, x, l\tGo forward in history list"
334 msgstr "<Right>, x, l\tAvanzar en la historia"
335
434 -#: gitk:3056
336 #, tcl-format
337 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
338 msgstr ""
339
439 -#: gitk:3057
340 msgid "<PageUp>\tMove up one page in commit list"
341 msgstr "<PageUp>\tSubir una página en la lista de revisiones"
342
443 -#: gitk:3058
343 msgid "<PageDown>\tMove down one page in commit list"
344 msgstr "<PageDown>\tBajar una página en la lista de revisiones"
345
447 -#: gitk:3059
346 #, tcl-format
347 msgid "<%s-Home>\tScroll to top of commit list"
348 msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones"
349
452 -#: gitk:3060
350 #, tcl-format
351 msgid "<%s-End>\tScroll to bottom of commit list"
352 msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones"
353
457 -#: gitk:3061
354 #, tcl-format
355 msgid "<%s-Up>\tScroll commit list up one line"
356 msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones"
357
462 -#: gitk:3062
358 #, tcl-format
359 msgid "<%s-Down>\tScroll commit list down one line"
360 msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones"
361
467 -#: gitk:3063
362 #, tcl-format
363 msgid "<%s-PageUp>\tScroll commit list up one page"
364 msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones"
365
472 -#: gitk:3064
366 #, tcl-format
367 msgid "<%s-PageDown>\tScroll commit list down one page"
368 msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones"
369
477 -#: gitk:3065
370 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
371 msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)"
372
481 -#: gitk:3066
373 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
374 msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)"
375
485 -#: gitk:3067
376 msgid "<Delete>, b\tScroll diff view up one page"
377 msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias"
378
489 -#: gitk:3068
379 msgid "<Backspace>\tScroll diff view up one page"
380 msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias"
381
493 -#: gitk:3069
382 msgid "<Space>\t\tScroll diff view down one page"
383 msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias"
384
497 -#: gitk:3070
385 msgid "u\t\tScroll diff view up 18 lines"
386 msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias"
387
501 -#: gitk:3071
388 msgid "d\t\tScroll diff view down 18 lines"
389 msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias"
390
505 -#: gitk:3072
391 #, tcl-format
392 msgid "<%s-F>\t\tFind"
393 msgstr "<%s-F>\t\tBuscar"
394
510 -#: gitk:3073
395 #, tcl-format
396 msgid "<%s-G>\t\tMove to next find hit"
397 msgstr "<%s-G>\t\tBuscar el siguiente"
398
515 -#: gitk:3074
399 msgid "<Return>\tMove to next find hit"
400 msgstr "<Return>\tBuscar el siguiente"
401
519 -#: gitk:3075
402 #, fuzzy
403 msgid "g\t\tGo to commit"
404 msgstr "<End>\t\tIr a la última revisión"
405
524 -#: gitk:3076
406 msgid "/\t\tFocus the search box"
407 msgstr ""
408
528 -#: gitk:3077
409 msgid "?\t\tMove to previous find hit"
410 msgstr "?\t\tBuscar el anterior"
411
532 -#: gitk:3078
412 msgid "f\t\tScroll diff view to next file"
413 msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
414
536 -#: gitk:3079
415 #, tcl-format
416 msgid "<%s-S>\t\tSearch for next hit in diff view"
417 msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias"
418
541 -#: gitk:3080
419 #, tcl-format
420 msgid "<%s-R>\t\tSearch for previous hit in diff view"
421 msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias"
422
546 -#: gitk:3081
423 #, tcl-format
424 msgid "<%s-KP+>\tIncrease font size"
425 msgstr "<%s-KP+>\tAumentar tamaño del texto"
426
551 -#: gitk:3082
427 #, tcl-format
428 msgid "<%s-plus>\tIncrease font size"
429 msgstr "<%s-plus>\tAumentar tamaño del texto"
430
556 -#: gitk:3083
431 #, tcl-format
432 msgid "<%s-KP->\tDecrease font size"
433 msgstr "<%s-KP->\tDisminuir tamaño del texto"
434
561 -#: gitk:3084
435 #, tcl-format
436 msgid "<%s-minus>\tDecrease font size"
437 msgstr "<%s-minus>\tDisminuir tamaño del texto"
438
566 -#: gitk:3085
439 msgid "<F5>\t\tUpdate"
440 msgstr "<F5>\t\tActualizar"
441
570 -#: gitk:3550 gitk:3559
442 #, fuzzy, tcl-format
443 msgid "Error creating temporary directory %s:"
444 msgstr "Error en la creación del parche:"
445
575 -#: gitk:3572
446 #, fuzzy, tcl-format
447 msgid "Error getting \"%s\" from %s:"
448 msgstr "Error al leer las diferencias de fusión:"
449
580 -#: gitk:3635
450 #, fuzzy
451 msgid "command failed:"
452 msgstr "Línea de comandos"
453
585 -#: gitk:3784
454 #, fuzzy
455 msgid "No such commit"
456 msgstr "No se han guardado cambios"
457
590 -#: gitk:3798
458 msgid "git gui blame: command failed:"
459 msgstr ""
460
594 -#: gitk:3829
461 #, tcl-format
462 msgid "Couldn't read merge head: %s"
463 msgstr ""
464
599 -#: gitk:3837
465 #, fuzzy, tcl-format
466 msgid "Error reading index: %s"
467 msgstr "Error al crear la etiqueta:"
468
604 -#: gitk:3862
469 #, tcl-format
470 msgid "Couldn't start git blame: %s"
471 msgstr ""
472
609 -#: gitk:3865 gitk:6754
473 msgid "Searching"
474 msgstr "Buscando"
475
613 -#: gitk:3897
476 #, fuzzy, tcl-format
477 msgid "Error running git blame: %s"
478 msgstr "Error al crear la etiqueta:"
479
618 -#: gitk:3925
480 #, tcl-format
481 msgid "That line comes from commit %s, which is not in this view"
482 msgstr ""
483
623 -#: gitk:3939
484 #, fuzzy
485 msgid "External diff viewer failed:"
486 msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
487
628 -#: gitk:4070
488 msgid "Gitk view definition"
489 msgstr "Definición de vistas de Gitk"
490
632 -#: gitk:4074
491 msgid "Remember this view"
492 msgstr "Recordar esta vista"
493
636 -#: gitk:4075
494 msgid "References (space separated list):"
495 msgstr ""
496
640 -#: gitk:4076
497 msgid "Branches & tags:"
498 msgstr ""
499
644 -#: gitk:4077
500 #, fuzzy
501 msgid "All refs"
502 msgstr "Todos los archivos"
503
649 -#: gitk:4078
504 msgid "All (local) branches"
505 msgstr ""
506
653 -#: gitk:4079
507 msgid "All tags"
508 msgstr ""
509
657 -#: gitk:4080
510 msgid "All remote-tracking branches"
511 msgstr ""
512
661 -#: gitk:4081
513 msgid "Commit Info (regular expressions):"
514 msgstr ""
515
665 -#: gitk:4082
516 #, fuzzy
517 msgid "Author:"
518 msgstr "Autor"
519
670 -#: gitk:4083
520 #, fuzzy
521 msgid "Committer:"
522 msgstr "revisión"
523
675 -#: gitk:4084
524 msgid "Commit Message:"
525 msgstr ""
526
679 -#: gitk:4085
527 msgid "Matches all Commit Info criteria"
528 msgstr ""
529
683 -#: gitk:4086
530 msgid "Matches no Commit Info criteria"
531 msgstr ""
532
687 -#: gitk:4087
533 msgid "Changes to Files:"
534 msgstr ""
535
691 -#: gitk:4088
536 msgid "Fixed String"
537 msgstr ""
538
695 -#: gitk:4089
539 msgid "Regular Expression"
540 msgstr ""
541
699 -#: gitk:4090
542 #, fuzzy
543 msgid "Search string:"
544 msgstr "Buscando"
545
704 -#: gitk:4091
546 msgid ""
547 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
548 "15:27:38\"):"
549 msgstr ""
550
710 -#: gitk:4092
551 msgid "Since:"
552 msgstr ""
553
714 -#: gitk:4093
554 msgid "Until:"
555 msgstr ""
556
718 -#: gitk:4094
557 msgid "Limit and/or skip a number of revisions (positive integer):"
558 msgstr ""
559
722 -#: gitk:4095
560 msgid "Number to show:"
561 msgstr ""
562
726 -#: gitk:4096
563 msgid "Number to skip:"
564 msgstr ""
565
730 -#: gitk:4097
566 msgid "Miscellaneous options:"
567 msgstr ""
568
734 -#: gitk:4098
569 msgid "Strictly sort by date"
570 msgstr ""
571
738 -#: gitk:4099
572 msgid "Mark branch sides"
573 msgstr ""
574
742 -#: gitk:4100
575 #, fuzzy
576 msgid "Limit to first parent"
577 msgstr "Limitar las diferencias a las rutas seleccionadas"
578
747 -#: gitk:4101
579 msgid "Simple history"
580 msgstr ""
581
751 -#: gitk:4102
582 #, fuzzy
583 msgid "Additional arguments to git log:"
584 msgstr "Revisiones a incluir (argumentos a git log):"
585
756 -#: gitk:4103
586 msgid "Enter files and directories to include, one per line:"
587 msgstr "Introducir archivos y directorios a incluir, uno por línea:"
588
760 -#: gitk:4104
589 msgid "Command to generate more commits to include:"
590 msgstr "Comando que genera más revisiones a incluir:"
591
764 -#: gitk:4228
592 msgid "Gitk: edit view"
593 msgstr ""
594
768 -#: gitk:4236
595 msgid "-- criteria for selecting revisions"
596 msgstr ""
597
772 -#: gitk:4241
598 #, fuzzy
599 msgid "View Name"
600 msgstr "Vista"
601
777 -#: gitk:4316
602 msgid "Apply (F5)"
603 msgstr ""
604
781 -#: gitk:4354
605 msgid "Error in commit selection arguments:"
606 msgstr "Error en los argumentos de selección de las revisiones:"
607
785 -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
608 msgid "None"
609 msgstr "Ninguno"
610
789 -#: gitk:5021 gitk:5026
611 msgid "Descendant"
612 msgstr "Descendiente"
613
793 -#: gitk:5022
614 msgid "Not descendant"
615 msgstr "No descendiente"
616
797 -#: gitk:5029 gitk:5034
617 msgid "Ancestor"
618 msgstr "Antepasado"
619
801 -#: gitk:5030
620 msgid "Not ancestor"
621 msgstr "No antepasado"
622
805 -#: gitk:5324
623 msgid "Local changes checked in to index but not committed"
624 msgstr "Cambios locales añadidos al índice pero sin completar revisión"
625
809 -#: gitk:5360
626 msgid "Local uncommitted changes, not checked in to index"
627 msgstr "Cambios locales sin añadir al índice"
628
813 -#: gitk:7134
629 msgid "and many more"
630 msgstr ""
631
817 -#: gitk:7137
632 msgid "many"
633 msgstr ""
634
821 -#: gitk:7328
635 msgid "Tags:"
636 msgstr "Etiquetas:"
637
825 -#: gitk:7345 gitk:7351 gitk:8825
638 msgid "Parent"
639 msgstr "Padre"
640
829 -#: gitk:7356
641 msgid "Child"
642 msgstr "Hija"
643
833 -#: gitk:7365
644 msgid "Branch"
645 msgstr "Rama"
646
837 -#: gitk:7368
647 msgid "Follows"
648 msgstr "Sigue-a"
649
841 -#: gitk:7371
650 msgid "Precedes"
651 msgstr "Precede-a"
652
845 -#: gitk:7966
653 #, fuzzy, tcl-format
654 msgid "Error getting diffs: %s"
655 msgstr "Error al leer las diferencias de fusión:"
656
850 -#: gitk:8650
657 msgid "Goto:"
658 msgstr "Ir a:"
659
854 -#: gitk:8671
660 #, tcl-format
661 msgid "Short SHA1 id %s is ambiguous"
662 msgstr "La id SHA1 abreviada %s es ambigua"
663
859 -#: gitk:8678
664 #, fuzzy, tcl-format
665 msgid "Revision %s is not known"
666 msgstr "La id SHA1 %s es desconocida"
667
864 -#: gitk:8688
668 #, tcl-format
669 msgid "SHA1 id %s is not known"
670 msgstr "La id SHA1 %s es desconocida"
671
869 -#: gitk:8690
672 #, tcl-format
673 msgid "Revision %s is not in the current view"
674 msgstr ""
675
874 -#: gitk:8832 gitk:8847
676 msgid "Date"
677 msgstr "Fecha"
678
878 -#: gitk:8835
679 msgid "Children"
680 msgstr "Hijas"
681
882 -#: gitk:8898
682 #, tcl-format
683 msgid "Reset %s branch to here"
684 msgstr "Poner la rama %s en esta revisión"
685
887 -#: gitk:8900
686 msgid "Detached head: can't reset"
687 msgstr ""
688
891 -#: gitk:9005 gitk:9011
689 msgid "Skipping merge commit "
690 msgstr ""
691
895 -#: gitk:9020 gitk:9025
692 #, fuzzy
693 msgid "Error getting patch ID for "
694 msgstr "Error en la creación del parche:"
695
900 -#: gitk:9021 gitk:9026
696 msgid " - stopping\n"
697 msgstr ""
698
904 -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
699 #, fuzzy
700 msgid "Commit "
701 msgstr "revisión"
702
909 -#: gitk:9035
703 msgid ""
704 " is the same patch as\n"
705 " "
706 msgstr ""
707
915 -#: gitk:9043
708 msgid ""
709 " differs from\n"
710 " "
711 msgstr ""
712
921 -#: gitk:9045
713 msgid ""
714 "Diff of commits:\n"
715 "\n"
716 msgstr ""
717
927 -#: gitk:9057 gitk:9066
718 #, tcl-format
719 msgid " has %s children - stopping\n"
720 msgstr ""
721
932 -#: gitk:9085
722 #, fuzzy, tcl-format
723 msgid "Error writing commit to file: %s"
724 msgstr "Error al escribir revisión:"
725
937 -#: gitk:9091
726 #, fuzzy, tcl-format
727 msgid "Error diffing commits: %s"
728 msgstr "Error al escribir revisión:"
729
942 -#: gitk:9137
730 msgid "Top"
731 msgstr "Origen"
732
946 -#: gitk:9138
733 msgid "From"
734 msgstr "De"
735
950 -#: gitk:9143
736 msgid "To"
737 msgstr "A"
738
954 -#: gitk:9167
739 msgid "Generate patch"
740 msgstr "Generar parche"
741
958 -#: gitk:9169
742 msgid "From:"
743 msgstr "De:"
744
962 -#: gitk:9178
745 msgid "To:"
746 msgstr "Para:"
747
966 -#: gitk:9187
748 msgid "Reverse"
749 msgstr "Invertir"
750
970 -#: gitk:9189 gitk:9385
751 msgid "Output file:"
752 msgstr "Escribir a archivo:"
753
974 -#: gitk:9195
754 msgid "Generate"
755 msgstr "Generar"
756
978 -#: gitk:9233
757 msgid "Error creating patch:"
758 msgstr "Error en la creación del parche:"
759
982 -#: gitk:9256 gitk:9373 gitk:9430
760 msgid "ID:"
761 msgstr "ID:"
762
986 -#: gitk:9265
763 msgid "Tag name:"
764 msgstr "Nombre de etiqueta:"
765
990 -#: gitk:9268
766 msgid "Tag message is optional"
767 msgstr ""
768
994 -#: gitk:9270
769 #, fuzzy
770 msgid "Tag message:"
771 msgstr "Nombre de etiqueta:"
772
999 -#: gitk:9274 gitk:9439
773 msgid "Create"
774 msgstr "Crear"
775
1003 -#: gitk:9292
776 msgid "No tag name specified"
777 msgstr "No se ha especificado etiqueta"
778
1007 -#: gitk:9296
779 #, tcl-format
780 msgid "Tag \"%s\" already exists"
781 msgstr "La etiqueta \"%s\" ya existe"
782
1012 -#: gitk:9306
783 msgid "Error creating tag:"
784 msgstr "Error al crear la etiqueta:"
785
1016 -#: gitk:9382
786 msgid "Command:"
787 msgstr "Comando:"
788
1020 -#: gitk:9390
789 msgid "Write"
790 msgstr "Escribir"
791
1024 -#: gitk:9408
792 msgid "Error writing commit:"
793 msgstr "Error al escribir revisión:"
794
1028 -#: gitk:9435
795 msgid "Name:"
796 msgstr "Nombre:"
797
1032 -#: gitk:9458
798 msgid "Please specify a name for the new branch"
799 msgstr "Especifique un nombre para la nueva rama"
800
1036 -#: gitk:9463
801 #, fuzzy, tcl-format
802 msgid "Branch '%s' already exists. Overwrite?"
803 msgstr "La etiqueta \"%s\" ya existe"
804
1041 -#: gitk:9530
805 #, tcl-format
806 msgid "Commit %s is already included in branch %s -- really re-apply it?"
807 msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
808
1046 -#: gitk:9535
809 msgid "Cherry-picking"
810 msgstr "Eligiendo revisiones (cherry-picking)"
811
1050 -#: gitk:9544
812 #, tcl-format
813 msgid ""
814 "Cherry-pick failed because of local changes to file '%s'.\n"
815 "Please commit, reset or stash your changes and try again."
816 msgstr ""
817
1057 -#: gitk:9550
818 msgid ""
819 "Cherry-pick failed because of merge conflict.\n"
820 "Do you wish to run git citool to resolve it?"
821 msgstr ""
822
1063 -#: gitk:9566 gitk:9624
823 msgid "No changes committed"
824 msgstr "No se han guardado cambios"
825
1067 -#: gitk:9593
826 #, fuzzy, tcl-format
827 msgid "Commit %s is not included in branch %s -- really revert it?"
828 msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
829
1072 -#: gitk:9598
830 #, fuzzy
831 msgid "Reverting"
832 msgstr "Reponiendo"
833
1077 -#: gitk:9606
834 #, tcl-format
835 msgid ""
836 "Revert failed because of local changes to the following files:%s Please "
837 "commit, reset or stash your changes and try again."
838 msgstr ""
839
1084 -#: gitk:9610
840 msgid ""
841 "Revert failed because of merge conflict.\n"
842 " Do you wish to run git citool to resolve it?"
843 msgstr ""
844
1090 -#: gitk:9653
845 msgid "Confirm reset"
846 msgstr "Confirmar git reset"
847
1094 -#: gitk:9655
848 #, tcl-format
849 msgid "Reset branch %s to %s?"
850 msgstr "¿Reponer la rama %s a %s?"
851
1099 -#: gitk:9657
852 msgid "Reset type:"
853 msgstr "Tipo de reposición:"
854
1103 -#: gitk:9660
855 msgid "Soft: Leave working tree and index untouched"
856 msgstr "Suave: No altera la copia de trabajo ni el índice"
857
1107 -#: gitk:9663
858 msgid "Mixed: Leave working tree untouched, reset index"
859 msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo"
860
1111 -#: gitk:9666
861 msgid ""
862 "Hard: Reset working tree and index\n"
863 "(discard ALL local changes)"
@@ -1116,19 +865,15 @@ msgstr ""
865 "Dura: Actualiza el índice y la copia de trabajo\n"
866 "(abandona TODAS las modificaciones locales)"
867
1119 -#: gitk:9683
868 msgid "Resetting"
869 msgstr "Reponiendo"
870
1123 -#: gitk:9743
871 msgid "Checking out"
872 msgstr "Creando copia de trabajo"
873
1127 -#: gitk:9796
874 msgid "Cannot delete the currently checked-out branch"
875 msgstr "No se puede borrar la rama actual"
876
1131 -#: gitk:9802
877 #, tcl-format
878 msgid ""
879 "The commits on branch %s aren't on any other branch.\n"
@@ -1137,16 +882,13 @@ msgstr ""
882 "Las revisiones de la rama %s no están presentes en otras ramas.\n"
883 "¿Borrar la rama %s?"
884
1140 -#: gitk:9833
885 #, tcl-format
886 msgid "Tags and heads: %s"
887 msgstr "Etiquetas y ramas: %s"
888
1145 -#: gitk:9850
889 msgid "Filter"
890 msgstr "Filtro"
891
1149 -#: gitk:10146
892 msgid ""
893 "Error reading commit topology information; branch and preceding/following "
894 "tag information will be incomplete."
@@ -1154,211 +896,162 @@ msgstr ""
896 "Error al leer la topología de revisiones: la información sobre las ramas y "
897 "etiquetas precedentes y siguientes será incompleta."
898
1157 -#: gitk:11123
899 msgid "Tag"
900 msgstr "Etiqueta"
901
1161 -#: gitk:11127
902 msgid "Id"
903 msgstr "Id"
904
1165 -#: gitk:11210
905 msgid "Gitk font chooser"
906 msgstr "Selector de tipografías gitk"
907
1169 -#: gitk:11227
908 msgid "B"
909 msgstr "B"
910
1173 -#: gitk:11230
911 msgid "I"
912 msgstr "I"
913
1177 -#: gitk:11348
914 msgid "Commit list display options"
915 msgstr "Opciones de visualización de la lista de revisiones"
916
1181 -#: gitk:11351
917 msgid "Maximum graph width (lines)"
918 msgstr "Ancho máximo del gráfico (en líneas)"
919
1185 -#: gitk:11355
920 #, no-tcl-format
921 msgid "Maximum graph width (% of pane)"
922 msgstr "Ancho máximo del gráfico (en % del panel)"
923
1190 -#: gitk:11358
924 msgid "Show local changes"
925 msgstr "Mostrar cambios locales"
926
1194 -#: gitk:11361
927 #, fuzzy
928 msgid "Auto-select SHA1 (length)"
929 msgstr "Seleccionar automáticamente SHA1 hash"
930
1199 -#: gitk:11365
931 msgid "Hide remote refs"
932 msgstr ""
933
1203 -#: gitk:11369
934 msgid "Diff display options"
935 msgstr "Opciones de visualización de diferencias"
936
1207 -#: gitk:11371
937 msgid "Tab spacing"
938 msgstr "Espaciado de tabulador"
939
1211 -#: gitk:11374
940 #, fuzzy
941 msgid "Display nearby tags/heads"
942 msgstr "Mostrar etiquetas cercanas"
943
1216 -#: gitk:11377
944 msgid "Maximum # tags/heads to show"
945 msgstr ""
946
1220 -#: gitk:11380
947 msgid "Limit diffs to listed paths"
948 msgstr "Limitar las diferencias a las rutas seleccionadas"
949
1224 -#: gitk:11383
950 msgid "Support per-file encodings"
951 msgstr ""
952
1228 -#: gitk:11389 gitk:11536
953 msgid "External diff tool"
954 msgstr ""
955
1232 -#: gitk:11390
956 msgid "Choose..."
957 msgstr ""
958
1236 -#: gitk:11395
959 #, fuzzy
960 msgid "General options"
961 msgstr "Generar parche"
962
1241 -#: gitk:11398
963 msgid "Use themed widgets"
964 msgstr ""
965
1245 -#: gitk:11400
966 msgid "(change requires restart)"
967 msgstr ""
968
1249 -#: gitk:11402
969 msgid "(currently unavailable)"
970 msgstr ""
971
1253 -#: gitk:11413
972 msgid "Colors: press to choose"
973 msgstr "Colores: pulse para seleccionar"
974
1257 -#: gitk:11416
975 msgid "Interface"
976 msgstr ""
977
1261 -#: gitk:11417
978 #, fuzzy
979 msgid "interface"
980 msgstr "Tipografía para interfaz de usuario"
981
1266 -#: gitk:11420
982 msgid "Background"
983 msgstr "Fondo"
984
1270 -#: gitk:11421 gitk:11451
985 #, fuzzy
986 msgid "background"
987 msgstr "Fondo"
988
1275 -#: gitk:11424
989 msgid "Foreground"
990 msgstr "Primer plano"
991
1279 -#: gitk:11425
992 #, fuzzy
993 msgid "foreground"
994 msgstr "Primer plano"
995
1284 -#: gitk:11428
996 msgid "Diff: old lines"
997 msgstr "Diff: líneas viejas"
998
1288 -#: gitk:11429
999 #, fuzzy
1000 msgid "diff old lines"
1001 msgstr "Diff: líneas viejas"
1002
1293 -#: gitk:11433
1003 msgid "Diff: new lines"
1004 msgstr "Diff: líneas nuevas"
1005
1297 -#: gitk:11434
1006 #, fuzzy
1007 msgid "diff new lines"
1008 msgstr "Diff: líneas nuevas"
1009
1302 -#: gitk:11438
1010 msgid "Diff: hunk header"
1011 msgstr "Diff: cabecera de fragmento"
1012
1306 -#: gitk:11440
1013 #, fuzzy
1014 msgid "diff hunk header"
1015 msgstr "Diff: cabecera de fragmento"
1016
1311 -#: gitk:11444
1017 msgid "Marked line bg"
1018 msgstr ""
1019
1315 -#: gitk:11446
1020 msgid "marked line background"
1021 msgstr ""
1022
1319 -#: gitk:11450
1023 msgid "Select bg"
1024 msgstr "Color de fondo de la selección"
1025
1323 -#: gitk:11459
1026 msgid "Fonts: press to choose"
1027 msgstr "Tipografías: pulse para elegir"
1028
1327 -#: gitk:11461
1029 msgid "Main font"
1030 msgstr "Tipografía principal"
1031
1331 -#: gitk:11462
1032 msgid "Diff display font"
1033 msgstr "Tipografía para diferencias"
1034
1335 -#: gitk:11463
1035 msgid "User interface font"
1036 msgstr "Tipografía para interfaz de usuario"
1037
1339 -#: gitk:11485
1038 msgid "Gitk preferences"
1039 msgstr "Preferencias de gitk"
1040
1343 -#: gitk:11494
1041 #, fuzzy
1042 msgid "General"
1043 msgstr "Generar"
1044
1348 -#: gitk:11495
1045 msgid "Colors"
1046 msgstr ""
1047
1352 -#: gitk:11496
1048 msgid "Fonts"
1049 msgstr ""
1050
1356 -#: gitk:11546
1051 #, tcl-format
1052 msgid "Gitk: choose color for %s"
1053 msgstr "Gitk: elegir color para %s"
1054
1361 -#: gitk:12059
1055 msgid ""
1056 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1057 " Gitk requires at least Tcl/Tk 8.4."
@@ -1366,17 +1059,14 @@ msgstr ""
1059 "Esta versión de Tcl/Tk es demasiado antigua.\n"
1060 " Gitk requiere Tcl/Tk versión 8.4 o superior."
1061
1369 -#: gitk:12269
1062 msgid "Cannot find a git repository here."
1063 msgstr "No hay un repositorio git aquí."
1064
1373 -#: gitk:12316
1065 #, tcl-format
1066 msgid "Ambiguous argument '%s': both revision and filename"
1067 msgstr ""
1068 "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo"
1069
1379 -#: gitk:12328
1070 msgid "Bad arguments to gitk:"
1071 msgstr "Argumentos incorrectos a Gitk:"
1072
po/fr.po
+18 -321
@@ -19,355 +19,268 @@ msgstr ""
19 "X-Poedit-Language: French\n"
20 "X-Poedit-Country: FRANCE\n"
21
22 -#: gitk:140
22 msgid "Couldn't get list of unmerged files:"
23 msgstr "Impossible de récupérer la liste des fichiers non fusionnés :"
24
26 -#: gitk:212 gitk:2399
25 msgid "Color words"
26 msgstr "Colorier les mots différents"
27
30 -#: gitk:217 gitk:2399 gitk:8239 gitk:8272
28 msgid "Markup words"
29 msgstr "Marquer les mots différents"
30
34 -#: gitk:324
31 msgid "Error parsing revisions:"
32 msgstr "Erreur lors du parcours des révisions :"
33
38 -#: gitk:380
34 msgid "Error executing --argscmd command:"
35 msgstr "Erreur à l'exécution de la commande --argscmd :"
36
42 -#: gitk:393
37 msgid "No files selected: --merge specified but no files are unmerged."
38 msgstr ""
39 "Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont "
40 "fusionnés."
41
42 # FIXME : améliorer la traduction de 'file limite'
49 -#: gitk:396
43 msgid ""
44 "No files selected: --merge specified but no unmerged files are within file "
45 "limit."
53 -msgstr "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné n'est dans la limite des fichiers."
46 +msgstr ""
47 +"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné "
48 +"n'est dans la limite des fichiers."
49
55 -#: gitk:418 gitk:566
50 msgid "Error executing git log:"
51 msgstr "Erreur à l'exécution de git log :"
52
59 -#: gitk:436 gitk:582
53 msgid "Reading"
54 msgstr "Lecture en cours"
55
63 -#: gitk:496 gitk:4544
56 msgid "Reading commits..."
57 msgstr "Lecture des commits..."
58
67 -#: gitk:499 gitk:1637 gitk:4547
59 msgid "No commits selected"
60 msgstr "Aucun commit sélectionné"
61
71 -#: gitk:1445 gitk:4064 gitk:12469
62 msgid "Command line"
63 msgstr "Ligne de commande"
64
75 -#: gitk:1511
65 msgid "Can't parse git log output:"
66 msgstr "Impossible de lire la sortie de git log :"
67
79 -#: gitk:1740
68 msgid "No commit information available"
69 msgstr "Aucune information disponible sur le commit"
70
83 -#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554
71 msgid "OK"
72 msgstr "OK"
73
87 -#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704
88 -#: gitk:11275 gitk:11555
74 msgid "Cancel"
75 msgstr "Annuler"
76
92 -#: gitk:2083
77 msgid "&Update"
78 msgstr "Mise à jour"
79
96 -#: gitk:2084
80 msgid "&Reload"
81 msgstr "&Recharger"
82
100 -#: gitk:2085
83 msgid "Reread re&ferences"
84 msgstr "Relire les ré&férences"
85
104 -#: gitk:2086
86 msgid "&List references"
87 msgstr "&Lister les références"
88
108 -#: gitk:2088
89 msgid "Start git &gui"
90 msgstr "Démarrer git &gui"
91
112 -#: gitk:2090
92 msgid "&Quit"
93 msgstr "&Quitter"
94
116 -#: gitk:2082
95 msgid "&File"
96 msgstr "&Fichier"
97
120 -#: gitk:2094
98 msgid "&Preferences"
99 msgstr "Préférences"
100
124 -#: gitk:2093
101 msgid "&Edit"
102 msgstr "&Éditer"
103
128 -#: gitk:2098
104 msgid "&New view..."
105 msgstr "&Nouvelle vue..."
106
132 -#: gitk:2099
107 msgid "&Edit view..."
108 msgstr "&Éditer la vue..."
109
136 -#: gitk:2100
110 msgid "&Delete view"
111 msgstr "Supprimer la vue"
112
140 -#: gitk:2102
113 msgid "&All files"
114 msgstr "Tous les fichiers"
115
144 -#: gitk:2097
116 msgid "&View"
117 msgstr "&Vue"
118
148 -#: gitk:2107 gitk:2117
119 msgid "&About gitk"
120 msgstr "À propos de gitk"
121
152 -#: gitk:2108 gitk:2122
122 msgid "&Key bindings"
123 msgstr "Raccourcis clavier"
124
156 -#: gitk:2106 gitk:2121
125 msgid "&Help"
126 msgstr "Aide"
127
160 -#: gitk:2199 gitk:8671
128 msgid "SHA1 ID:"
129 msgstr "Id SHA1 :"
130
164 -#: gitk:2243
131 msgid "Row"
132 msgstr "Colonne"
133
168 -#: gitk:2281
134 msgid "Find"
135 msgstr "Recherche"
136
172 -#: gitk:2309
137 msgid "commit"
138 msgstr "commit"
139
176 -#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846
177 -#: gitk:6931
140 msgid "containing:"
141 msgstr "contient :"
142
181 -#: gitk:2316 gitk:3545 gitk:3550 gitk:4782
143 msgid "touching paths:"
144 msgstr "chemins modifiés :"
145
185 -#: gitk:2317 gitk:4796
146 msgid "adding/removing string:"
147 msgstr "ajoute/supprime la chaîne :"
148
189 -#: gitk:2318 gitk:4798
149 msgid "changing lines matching:"
150 msgstr "modifie les lignes vérifiant :"
151
193 -#: gitk:2327 gitk:2329 gitk:4785
152 msgid "Exact"
153 msgstr "Exact"
154
197 -#: gitk:2329 gitk:4873 gitk:6742
155 msgid "IgnCase"
156 msgstr "Ignorer la casse"
157
201 -#: gitk:2329 gitk:4755 gitk:4871 gitk:6738
158 msgid "Regexp"
159 msgstr "Expression régulière"
160
205 -#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935
161 msgid "All fields"
162 msgstr "Tous les champs"
163
209 -#: gitk:2332 gitk:4890 gitk:4923 gitk:6805
164 msgid "Headline"
165 msgstr "Titre"
166
213 -#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408
167 msgid "Comments"
168 msgstr "Commentaires"
169
217 -#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849
218 -#: gitk:8864
170 msgid "Author"
171 msgstr "Auteur"
172
222 -#: gitk:2333 gitk:4890 gitk:6805 gitk:7345
173 msgid "Committer"
174 msgstr "Validateur"
175
226 -#: gitk:2367
176 msgid "Search"
177 msgstr "Rechercher"
178
230 -#: gitk:2375
179 msgid "Diff"
180 msgstr "Diff"
181
234 -#: gitk:2377
182 msgid "Old version"
183 msgstr "Ancienne version"
184
238 -#: gitk:2379
185 msgid "New version"
186 msgstr "Nouvelle version"
187
242 -#: gitk:2382
188 msgid "Lines of context"
189 msgstr "Lignes de contexte"
190
246 -#: gitk:2392
191 msgid "Ignore space change"
192 msgstr "Ignorer les modifications d'espace"
193
250 -#: gitk:2396 gitk:2398 gitk:7978 gitk:8225
194 msgid "Line diff"
195 msgstr "différence par ligne"
196
254 -#: gitk:2463
197 msgid "Patch"
198 msgstr "Patch"
199
258 -#: gitk:2465
200 msgid "Tree"
201 msgstr "Arbre"
202
262 -#: gitk:2635 gitk:2656
203 msgid "Diff this -> selected"
204 msgstr "Diff ceci -> la sélection"
205
266 -#: gitk:2636 gitk:2657
206 msgid "Diff selected -> this"
207 msgstr "Diff sélection -> ceci"
208
270 -#: gitk:2637 gitk:2658
209 msgid "Make patch"
210 msgstr "Créer patch"
211
274 -#: gitk:2638 gitk:9273
212 msgid "Create tag"
213 msgstr "Créer étiquette"
214
278 -#: gitk:2639
215 msgid "Copy commit summary"
216 msgstr "Copié le résumé du commit"
217
282 -#: gitk:2640 gitk:9404
218 msgid "Write commit to file"
219 msgstr "Écrire le commit dans un fichier"
220
286 -#: gitk:2641 gitk:9461
221 msgid "Create new branch"
222 msgstr "Créer une nouvelle branche"
223
290 -#: gitk:2642
224 msgid "Cherry-pick this commit"
225 msgstr "Cueillir (cherry-pick) ce commit"
226
294 -#: gitk:2643
227 msgid "Reset HEAD branch to here"
228 msgstr "Réinitialiser la branche HEAD vers cet état"
229
298 -#: gitk:2644
230 msgid "Mark this commit"
231 msgstr "Marquer ce commit"
232
302 -#: gitk:2645
233 msgid "Return to mark"
234 msgstr "Retourner à la marque"
235
306 -#: gitk:2646
236 msgid "Find descendant of this and mark"
237 msgstr "Chercher le descendant de ceci et le marquer"
238
310 -#: gitk:2647
239 msgid "Compare with marked commit"
240 msgstr "Comparer avec le commit marqué"
241
314 -#: gitk:2648 gitk:2659
242 msgid "Diff this -> marked commit"
243 msgstr "Diff ceci -> sélection"
244
318 -#: gitk:2649 gitk:2660
245 msgid "Diff marked commit -> this"
246 msgstr "Diff entre sélection -> ceci"
247
322 -#: gitk:2650
248 msgid "Revert this commit"
249 msgstr "Défaire ce commit"
250
326 -#: gitk:2666
251 msgid "Check out this branch"
252 msgstr "Récupérer cette branche"
253
330 -#: gitk:2667
254 msgid "Remove this branch"
255 msgstr "Supprimer cette branche"
256
334 -#: gitk:2668
257 msgid "Copy branch name"
258 msgstr "Copier la nom de la branche"
259
338 -#: gitk:2675
260 msgid "Highlight this too"
261 msgstr "Surligner également ceci"
262
342 -#: gitk:2676
263 msgid "Highlight this only"
264 msgstr "Surligner seulement ceci"
265
346 -#: gitk:2677
266 msgid "External diff"
267 msgstr "Diff externe"
268
350 -#: gitk:2678
269 msgid "Blame parent commit"
270 msgstr "Blâmer le commit parent"
271
354 -#: gitk:2679
272 msgid "Copy path"
273 msgstr "Copier le chemin"
274
358 -#: gitk:2686
275 msgid "Show origin of this line"
276 msgstr "Montrer l'origine de cette ligne"
277
362 -#: gitk:2687
278 msgid "Run git gui blame on this line"
279 msgstr "Exécuter git gui blame sur cette ligne"
280
366 -#: gitk:3031
281 msgid "About gitk"
282 msgstr "À propos de gitk"
283
370 -#: gitk:3033
284 msgid ""
285 "\n"
286 "Gitk - a commit viewer for git\n"
@@ -381,327 +294,254 @@ msgstr ""
294 "\n"
295 "Copyright \\u00a9 2005-2016 Paul Mackerras\n"
296 "\n"
384 -"Utilisation et redistribution soumises aux termes de la GNU General Public License"
297 +"Utilisation et redistribution soumises aux termes de la GNU General Public "
298 +"License"
299
386 -#: gitk:3041 gitk:3108 gitk:9890
300 msgid "Close"
301 msgstr "Fermer"
302
390 -#: gitk:3062
303 msgid "Gitk key bindings"
304 msgstr "Raccourcis clavier de Gitk"
305
394 -#: gitk:3065
306 msgid "Gitk key bindings:"
307 msgstr "Raccourcis clavier de Gitk :"
308
398 -#: gitk:3067
309 #, tcl-format
310 msgid "<%s-Q>\t\tQuit"
311 msgstr "<%s-Q>\t\tQuitter"
312
403 -#: gitk:3068
313 #, tcl-format
314 msgid "<%s-W>\t\tClose window"
315 msgstr "<%s-W>\t\tFermer la fenêtre"
316
408 -#: gitk:3069
317 msgid "<Home>\t\tMove to first commit"
318 msgstr "<Début>\t\tAller au premier commit"
319
412 -#: gitk:3070
320 msgid "<End>\t\tMove to last commit"
321 msgstr "<Fin>\t\tAller au dernier commit"
322
416 -#: gitk:3071
323 msgid "<Up>, p, k\tMove up one commit"
324 msgstr "<Haut>, p, k\t Aller au commit précédent"
325
420 -#: gitk:3072
326 msgid "<Down>, n, j\tMove down one commit"
327 msgstr "<Bas>, n, j\t Aller au commit suivant"
328
424 -#: gitk:3073
329 msgid "<Left>, z, h\tGo back in history list"
330 msgstr "<Gauche>, z, h\tReculer dans l'historique"
331
428 -#: gitk:3074
332 msgid "<Right>, x, l\tGo forward in history list"
333 msgstr "<Droite>, x, l\tAvancer dans l'historique"
334
432 -#: gitk:3075
335 #, tcl-format
336 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
337 msgstr "<%s-n>\tAller sur le n-ième parent du commit dans l'historique"
338
437 -#: gitk:3076
339 msgid "<PageUp>\tMove up one page in commit list"
340 msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
341
441 -#: gitk:3077
342 msgid "<PageDown>\tMove down one page in commit list"
343 msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
344
445 -#: gitk:3078
345 #, tcl-format
346 msgid "<%s-Home>\tScroll to top of commit list"
347 msgstr "<%s-Début>\tAller en haut de la liste des commits"
348
450 -#: gitk:3079
349 #, tcl-format
350 msgid "<%s-End>\tScroll to bottom of commit list"
351 msgstr "<%s-End>\tAller en bas de la liste des commits"
352
455 -#: gitk:3080
353 #, tcl-format
354 msgid "<%s-Up>\tScroll commit list up one line"
355 msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits"
356
460 -#: gitk:3081
357 #, tcl-format
358 msgid "<%s-Down>\tScroll commit list down one line"
359 msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits"
360
465 -#: gitk:3082
361 #, tcl-format
362 msgid "<%s-PageUp>\tScroll commit list up one page"
363 msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits"
364
470 -#: gitk:3083
365 #, tcl-format
366 msgid "<%s-PageDown>\tScroll commit list down one page"
367 msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits"
368
475 -#: gitk:3084
369 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
370 msgstr ""
371 "<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)"
372
480 -#: gitk:3085
373 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
374 msgstr ""
375 "<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)"
376
485 -#: gitk:3086
377 msgid "<Delete>, b\tScroll diff view up one page"
378 msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff"
379
489 -#: gitk:3087
380 msgid "<Backspace>\tScroll diff view up one page"
381 msgstr "<Backspace>\tMonter d'une page dans la vue des diff"
382
493 -#: gitk:3088
383 msgid "<Space>\t\tScroll diff view down one page"
384 msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff"
385
497 -#: gitk:3089
386 msgid "u\t\tScroll diff view up 18 lines"
387 msgstr "u\t\tMonter de 18 lignes dans la vue des diff"
388
501 -#: gitk:3090
389 msgid "d\t\tScroll diff view down 18 lines"
390 msgstr "d\t\tDescendre de 18 lignes dans la vue des diff"
391
505 -#: gitk:3091
392 #, tcl-format
393 msgid "<%s-F>\t\tFind"
394 msgstr "<%s-F>\t\tRechercher"
395
510 -#: gitk:3092
396 #, tcl-format
397 msgid "<%s-G>\t\tMove to next find hit"
398 msgstr "<%s-G>\t\tAller au résultat de recherche suivant"
399
515 -#: gitk:3093
400 msgid "<Return>\tMove to next find hit"
401 msgstr "<Return>\t\tAller au résultat de recherche suivant"
402
519 -#: gitk:3094
403 msgid "g\t\tGo to commit"
404 msgstr "g\t\tAller au commit"
405
523 -#: gitk:3095
406 msgid "/\t\tFocus the search box"
407 msgstr "/\t\tFocus sur la zone de recherche"
408
527 -#: gitk:3096
409 msgid "?\t\tMove to previous find hit"
410 msgstr "?\t\tAller au résultat de recherche précédent"
411
531 -#: gitk:3097
412 msgid "f\t\tScroll diff view to next file"
413 msgstr "f\t\tAller au prochain fichier dans la vue des diff"
414
535 -#: gitk:3098
415 #, tcl-format
416 msgid "<%s-S>\t\tSearch for next hit in diff view"
417 msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff"
418
540 -#: gitk:3099
419 #, tcl-format
420 msgid "<%s-R>\t\tSearch for previous hit in diff view"
421 msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff"
422
545 -#: gitk:3100
423 #, tcl-format
424 msgid "<%s-KP+>\tIncrease font size"
425 msgstr "<%s-KP+>\tAugmenter la taille de la police"
426
550 -#: gitk:3101
427 #, tcl-format
428 msgid "<%s-plus>\tIncrease font size"
429 msgstr "<%s-plus>\tAugmenter la taille de la police"
430
555 -#: gitk:3102
431 #, tcl-format
432 msgid "<%s-KP->\tDecrease font size"
433 msgstr "<%s-KP->\tDiminuer la taille de la police"
434
560 -#: gitk:3103
435 #, tcl-format
436 msgid "<%s-minus>\tDecrease font size"
437 msgstr "<%s-minus>\tDiminuer la taille de la police"
438
565 -#: gitk:3104
439 msgid "<F5>\t\tUpdate"
440 msgstr "<F5>\t\tMise à jour"
441
569 -#: gitk:3569 gitk:3578
442 #, tcl-format
443 msgid "Error creating temporary directory %s:"
444 msgstr "Erreur lors de la création du répertoire temporaire %s :"
445
574 -#: gitk:3591
446 #, tcl-format
447 msgid "Error getting \"%s\" from %s:"
448 msgstr "Erreur en obtenant \"%s\" de %s:"
449
579 -#: gitk:3654
450 msgid "command failed:"
451 msgstr "échec de la commande :"
452
583 -#: gitk:3803
453 msgid "No such commit"
454 msgstr "Commit inexistant"
455
587 -#: gitk:3817
456 msgid "git gui blame: command failed:"
457 msgstr "git gui blame : échec de la commande :"
458
591 -#: gitk:3848
459 #, tcl-format
460 msgid "Couldn't read merge head: %s"
461 msgstr "Impossible de lire le head de la fusion : %s"
462
596 -#: gitk:3856
463 #, tcl-format
464 msgid "Error reading index: %s"
465 msgstr "Erreur à la lecture de l'index : %s"
466
601 -#: gitk:3881
467 #, tcl-format
468 msgid "Couldn't start git blame: %s"
469 msgstr "Impossible de démarrer git blame : %s"
470
606 -#: gitk:3884 gitk:6773
471 msgid "Searching"
472 msgstr "Recherche en cours"
473
610 -#: gitk:3916
474 #, tcl-format
475 msgid "Error running git blame: %s"
476 msgstr "Erreur à l'exécution de git blame : %s"
477
615 -#: gitk:3944
478 #, tcl-format
479 msgid "That line comes from commit %s, which is not in this view"
480 msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue"
481
620 -#: gitk:3958
482 msgid "External diff viewer failed:"
483 msgstr "Échec de l'outil externe de visualisation des diff :"
484
624 -#: gitk:4062
485 msgid "All files"
486 msgstr "Tous les fichiers"
487
628 -#: gitk:4086
488 msgid "View"
489 msgstr "Vue"
490
632 -#: gitk:4089
491 msgid "Gitk view definition"
492 msgstr "Définition des vues de Gitk"
493
636 -#: gitk:4093
494 msgid "Remember this view"
495 msgstr "Se souvenir de cette vue"
496
640 -#: gitk:4094
497 msgid "References (space separated list):"
498 msgstr "Références (liste d'éléments séparés par des espaces) :"
499
644 -#: gitk:4095
500 msgid "Branches & tags:"
501 msgstr "Branches & étiquettes :"
502
648 -#: gitk:4096
503 msgid "All refs"
504 msgstr "Toutes les références"
505
652 -#: gitk:4097
506 msgid "All (local) branches"
507 msgstr "Toutes les branches (locales)"
508
656 -#: gitk:4098
509 msgid "All tags"
510 msgstr "Toutes les étiquettes"
511
660 -#: gitk:4099
512 msgid "All remote-tracking branches"
513 msgstr "Toutes les branches de suivi à distance"
514
664 -#: gitk:4100
515 msgid "Commit Info (regular expressions):"
516 msgstr "Info sur les commits (expressions régulières) :"
517
668 -#: gitk:4101
518 msgid "Author:"
519 msgstr "Auteur :"
520
672 -#: gitk:4102
521 msgid "Committer:"
522 msgstr "Validateur :"
523
676 -#: gitk:4103
524 msgid "Commit Message:"
525 msgstr "Message de commit :"
526
680 -#: gitk:4104
527 msgid "Matches all Commit Info criteria"
528 msgstr "Correspond à tous les critères d'Info sur les commits"
529
684 -#: gitk:4105
530 msgid "Matches no Commit Info criteria"
531 msgstr "Ne correspond à aucun des critères d'Info sur les commits"
532
688 -#: gitk:4106
533 msgid "Changes to Files:"
534 msgstr "Changements des fichiers :"
535
692 -#: gitk:4107
536 msgid "Fixed String"
537 msgstr "Chaîne Figée"
538
696 -#: gitk:4108
539 msgid "Regular Expression"
540 msgstr "Expression Régulière"
541
700 -#: gitk:4109
542 msgid "Search string:"
543 msgstr "Recherche de la chaîne :"
544
704 -#: gitk:4110
545 msgid ""
546 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
547 "15:27:38\"):"
@@ -709,201 +549,153 @@ msgstr ""
549 "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
550 "2009 15:27:38\") :"
551
712 -#: gitk:4111
552 msgid "Since:"
553 msgstr "Depuis :"
554
716 -#: gitk:4112
555 msgid "Until:"
556 msgstr "Jusqu'au :"
557
720 -#: gitk:4113
558 msgid "Limit and/or skip a number of revisions (positive integer):"
559 msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :"
560
724 -#: gitk:4114
561 msgid "Number to show:"
562 msgstr "Nombre à afficher :"
563
728 -#: gitk:4115
564 msgid "Number to skip:"
565 msgstr "Nombre à sauter :"
566
732 -#: gitk:4116
567 msgid "Miscellaneous options:"
568 msgstr "Options diverses :"
569
736 -#: gitk:4117
570 msgid "Strictly sort by date"
571 msgstr "Trier par date"
572
740 -#: gitk:4118
573 msgid "Mark branch sides"
574 msgstr "Indiquer les côtés des branches"
575
744 -#: gitk:4119
576 msgid "Limit to first parent"
577 msgstr "Limiter au premier ancêtre"
578
748 -#: gitk:4120
579 msgid "Simple history"
580 msgstr "Historique simple"
581
752 -#: gitk:4121
582 msgid "Additional arguments to git log:"
583 msgstr "Arguments supplémentaires de git log :"
584
756 -#: gitk:4122
585 msgid "Enter files and directories to include, one per line:"
586 msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
587
760 -#: gitk:4123
588 msgid "Command to generate more commits to include:"
589 msgstr "Commande pour générer plus de commits à inclure :"
590
764 -#: gitk:4247
591 msgid "Gitk: edit view"
592 msgstr "Gitk : éditer la vue"
593
768 -#: gitk:4255
594 msgid "-- criteria for selecting revisions"
595 msgstr "-- critère pour la sélection des révisions"
596
772 -#: gitk:4260
597 msgid "View Name"
598 msgstr "Nom de la vue"
599
776 -#: gitk:4335
600 msgid "Apply (F5)"
601 msgstr "Appliquer (F5)"
602
780 -#: gitk:4373
603 msgid "Error in commit selection arguments:"
604 msgstr "Erreur dans les arguments de sélection des commits :"
605
784 -#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411
606 msgid "None"
607 msgstr "Aucun"
608
788 -#: gitk:5040 gitk:5045
609 msgid "Descendant"
610 msgstr "Descendant"
611
792 -#: gitk:5041
612 msgid "Not descendant"
613 msgstr "Pas un descendant"
614
796 -#: gitk:5048 gitk:5053
615 msgid "Ancestor"
616 msgstr "Ancêtre"
617
800 -#: gitk:5049
618 msgid "Not ancestor"
619 msgstr "Pas un ancêtre"
620
804 -#: gitk:5343
621 msgid "Local changes checked in to index but not committed"
622 msgstr "Modifications locales enregistrées dans l'index mais non validées"
623
808 -#: gitk:5379
624 msgid "Local uncommitted changes, not checked in to index"
625 msgstr "Modifications locales non enregistrées dans l'index et non validées"
626
812 -#: gitk:7153
627 msgid "and many more"
628 msgstr "et beaucoup plus"
629
816 -#: gitk:7156
630 msgid "many"
631 msgstr "nombreux"
632
820 -#: gitk:7347
633 msgid "Tags:"
634 msgstr "Étiquettes :"
635
824 -#: gitk:7364 gitk:7370 gitk:8844
636 msgid "Parent"
637 msgstr "Parent"
638
828 -#: gitk:7375
639 msgid "Child"
640 msgstr "Enfant"
641
832 -#: gitk:7384
642 msgid "Branch"
643 msgstr "Branche"
644
836 -#: gitk:7387
645 msgid "Follows"
646 msgstr "Suit"
647
840 -#: gitk:7390
648 msgid "Precedes"
649 msgstr "Précède"
650
844 -#: gitk:7985
651 #, tcl-format
652 msgid "Error getting diffs: %s"
653 msgstr "Erreur lors de la récupération des diff : %s"
654
849 -#: gitk:8669
655 msgid "Goto:"
656 msgstr "Aller à :"
657
853 -#: gitk:8690
658 #, tcl-format
659 msgid "Short SHA1 id %s is ambiguous"
660 msgstr "L'id SHA1 court %s est ambigu"
661
858 -#: gitk:8697
662 #, tcl-format
663 msgid "Revision %s is not known"
664 msgstr "La révision %s est inconnu"
665
863 -#: gitk:8707
666 #, tcl-format
667 msgid "SHA1 id %s is not known"
668 msgstr "L'id SHA1 %s est inconnu"
669
868 -#: gitk:8709
670 #, tcl-format
671 msgid "Revision %s is not in the current view"
672 msgstr "La révision %s n'est pas dans la vue courante"
673
873 -#: gitk:8851 gitk:8866
674 msgid "Date"
675 msgstr "Date"
676
877 -#: gitk:8854
677 msgid "Children"
678 msgstr "Enfants"
679
881 -#: gitk:8917
680 #, tcl-format
681 msgid "Reset %s branch to here"
682 msgstr "Réinitialiser la branche %s vers cet état"
683
886 -#: gitk:8919
684 msgid "Detached head: can't reset"
685 msgstr "Head détaché : impossible de réinitialiser"
686
890 -#: gitk:9024 gitk:9030
687 msgid "Skipping merge commit "
688 msgstr "Éviter le commit de la fusion "
689
894 -#: gitk:9039 gitk:9044
690 msgid "Error getting patch ID for "
691 msgstr "Erreur à l'obtention de l'ID du patch pour "
692
898 -#: gitk:9040 gitk:9045
693 msgid " - stopping\n"
694 msgstr " - arrêt en cours\n"
695
902 -#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084
696 msgid "Commit "
697 msgstr "Commit "
698
906 -#: gitk:9054
699 msgid ""
700 " is the same patch as\n"
701 " "
@@ -911,7 +703,6 @@ msgstr ""
703 "est le même patch que \n"
704 " "
705
914 -#: gitk:9062
706 msgid ""
707 " differs from\n"
708 " "
@@ -919,146 +710,118 @@ msgstr ""
710 " diffère de\n"
711 " "
712
922 -#: gitk:9064
713 msgid ""
714 "Diff of commits:\n"
715 "\n"
926 -msgstr "Diff des commits :\n\n"
716 +msgstr ""
717 +"Diff des commits :\n"
718 +"\n"
719
928 -#: gitk:9076 gitk:9085
720 #, tcl-format
721 msgid " has %s children - stopping\n"
722 msgstr " a %s enfants - arrêt en cours\n"
723
933 -#: gitk:9104
724 #, tcl-format
725 msgid "Error writing commit to file: %s"
726 msgstr "Erreur à l'écriture du commit dans le fichier : %s"
727
938 -#: gitk:9110
728 #, tcl-format
729 msgid "Error diffing commits: %s"
730 msgstr "Erreur à la différence des commits : %s"
731
943 -#: gitk:9156
732 msgid "Top"
733 msgstr "Haut"
734
947 -#: gitk:9157
735 msgid "From"
736 msgstr "De"
737
951 -#: gitk:9162
738 msgid "To"
739 msgstr "À"
740
955 -#: gitk:9186
741 msgid "Generate patch"
742 msgstr "Générer le patch"
743
959 -#: gitk:9188
744 msgid "From:"
745 msgstr "De :"
746
963 -#: gitk:9197
747 msgid "To:"
748 msgstr "À :"
749
967 -#: gitk:9206
750 msgid "Reverse"
751 msgstr "Inverser"
752
971 -#: gitk:9208 gitk:9418
753 msgid "Output file:"
754 msgstr "Fichier de sortie :"
755
975 -#: gitk:9214
756 msgid "Generate"
757 msgstr "Générer"
758
979 -#: gitk:9252
759 msgid "Error creating patch:"
760 msgstr "Erreur à la création du patch :"
761
983 -#: gitk:9275 gitk:9406 gitk:9463
762 msgid "ID:"
763 msgstr "ID :"
764
987 -#: gitk:9284
765 msgid "Tag name:"
766 msgstr "Nom de l'étiquette :"
767
991 -#: gitk:9287
768 msgid "Tag message is optional"
769 msgstr "Le message d'étiquette est optionnel"
770
995 -#: gitk:9289
771 msgid "Tag message:"
772 msgstr "Message d'étiquette :"
773
999 -#: gitk:9293 gitk:9472
774 msgid "Create"
775 msgstr "Créer"
776
1003 -#: gitk:9311
777 msgid "No tag name specified"
778 msgstr "Aucun nom d'étiquette spécifié"
779
1007 -#: gitk:9315
780 #, tcl-format
781 msgid "Tag \"%s\" already exists"
782 msgstr "L'étiquette \"%s\" existe déjà"
783
1012 -#: gitk:9325
784 msgid "Error creating tag:"
785 msgstr "Erreur à la création de l'étiquette :"
786
1016 -#: gitk:9415
787 msgid "Command:"
788 msgstr "Commande :"
789
1020 -#: gitk:9423
790 msgid "Write"
791 msgstr "Écrire"
792
1024 -#: gitk:9441
793 msgid "Error writing commit:"
794 msgstr "Erreur à l'ecriture du commit :"
795
1028 -#: gitk:9468
796 msgid "Name:"
797 msgstr "Nom :"
798
1032 -#: gitk:9491
799 msgid "Please specify a name for the new branch"
800 msgstr "Veuillez spécifier un nom pour la nouvelle branche"
801
1036 -#: gitk:9496
802 #, tcl-format
803 msgid "Branch '%s' already exists. Overwrite?"
804 msgstr "La branche '%s' existe déjà. Écraser?"
805
1041 -#: gitk:9563
806 #, tcl-format
807 msgid "Commit %s is already included in branch %s -- really re-apply it?"
808 msgstr ""
809 "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
810 "tout?"
811
1048 -#: gitk:9568
812 msgid "Cherry-picking"
813 msgstr "Picorer (Cherry-picking)"
814
1052 -#: gitk:9577
815 #, tcl-format
816 msgid ""
817 "Cherry-pick failed because of local changes to file '%s'.\n"
818 "Please commit, reset or stash your changes and try again."
819 msgstr ""
1058 -"Le picorage (cherry-pick) a échouée à cause de modifications locales du fichier '%s'.\n"
1059 -"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de nouveau."
820 +"Le picorage (cherry-pick) a échouée à cause de modifications locales du "
821 +"fichier '%s'.\n"
822 +"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
823 +"nouveau."
824
1061 -#: gitk:9583
825 msgid ""
826 "Cherry-pick failed because of merge conflict.\n"
827 "Do you wish to run git citool to resolve it?"
@@ -1066,27 +829,26 @@ msgstr ""
829 "Le picorage (cherry-pick) a échouée à cause d'un conflit lors d'une fusion.\n"
830 "Souhaitez-vous exécuter git citool pour le résoudre ?"
831
1069 -#: gitk:9599 gitk:9657
832 msgid "No changes committed"
833 msgstr "Aucune modification validée"
834
1073 -#: gitk:9626
835 #, tcl-format
836 msgid "Commit %s is not included in branch %s -- really revert it?"
1076 -msgstr "Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?"
837 +msgstr ""
838 +"Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?"
839
1078 -#: gitk:9631
840 msgid "Reverting"
841 msgstr "Commit défait"
842
1082 -#: gitk:9639
843 #, tcl-format
844 msgid ""
845 "Revert failed because of local changes to the following files:%s Please "
846 "commit, reset or stash your changes and try again."
1087 -msgstr "Échec en tentant de défaire le commit à cause de modifications locales des fichiers : %s. Veuillez valider, réinitialiser ou remiser vos modifications et essayer de nouveau."
847 +msgstr ""
848 +"Échec en tentant de défaire le commit à cause de modifications locales des "
849 +"fichiers : %s. Veuillez valider, réinitialiser ou remiser vos modifications "
850 +"et essayer de nouveau."
851
1089 -#: gitk:9643
852 msgid ""
853 "Revert failed because of merge conflict.\n"
854 " Do you wish to run git citool to resolve it?"
@@ -1094,30 +856,24 @@ msgstr ""
856 "Échec en tentant de défaire à cause d'un conflit de fusion.\n"
857 "Souhaitez-vous exécuter git citool pour le résoudre ?"
858
1097 -#: gitk:9686
859 msgid "Confirm reset"
860 msgstr "Confirmer la réinitialisation"
861
1101 -#: gitk:9688
862 #, tcl-format
863 msgid "Reset branch %s to %s?"
864 msgstr "Réinitialiser la branche %s à %s?"
865
1106 -#: gitk:9690
866 msgid "Reset type:"
867 msgstr "Type de réinitialisation :"
868
1110 -#: gitk:9693
869 msgid "Soft: Leave working tree and index untouched"
870 msgstr "Douce : Laisse le répertoire de travail et l'index intacts"
871
1114 -#: gitk:9696
872 msgid "Mixed: Leave working tree untouched, reset index"
873 msgstr ""
874 "Hybride : Laisse le répertoire de travail dans son état courant, "
875 "réinitialise l'index"
876
1120 -#: gitk:9699
877 msgid ""
878 "Hard: Reset working tree and index\n"
879 "(discard ALL local changes)"
@@ -1125,20 +881,16 @@ msgstr ""
881 "Dure : Réinitialise le répertoire de travail et l'index\n"
882 "(abandonne TOUTES les modifications locale)"
883
1128 -#: gitk:9716
884 msgid "Resetting"
885 msgstr "Réinitialisation"
886
887 # Fixme: Récupération est-il vraiment une mauvaise traduction?
1133 -#: gitk:9776
888 msgid "Checking out"
889 msgstr "Extraction"
890
1137 -#: gitk:9829
891 msgid "Cannot delete the currently checked-out branch"
892 msgstr "Impossible de supprimer la branche extraite"
893
1141 -#: gitk:9835
894 #, tcl-format
895 msgid ""
896 "The commits on branch %s aren't on any other branch.\n"
@@ -1147,16 +899,13 @@ msgstr ""
899 "Les commits de la branche %s ne sont dans aucune autre branche.\n"
900 "Voulez-vous vraiment supprimer cette branche %s ?"
901
1150 -#: gitk:9866
902 #, tcl-format
903 msgid "Tags and heads: %s"
904 msgstr "Étiquettes et heads : %s"
905
1155 -#: gitk:9883
906 msgid "Filter"
907 msgstr "Filtrer"
908
1159 -#: gitk:10179
909 msgid ""
910 "Error reading commit topology information; branch and preceding/following "
911 "tag information will be incomplete."
@@ -1165,202 +914,153 @@ msgstr ""
914 "informations sur les branches et les tags précédents/suivants seront "
915 "incomplètes."
916
1168 -#: gitk:11156
917 msgid "Tag"
918 msgstr "Étiquette"
919
1172 -#: gitk:11160
920 msgid "Id"
921 msgstr "Id"
922
1176 -#: gitk:11243
923 msgid "Gitk font chooser"
924 msgstr "Sélecteur de police de Gitk"
925
1180 -#: gitk:11260
926 msgid "B"
927 msgstr "B"
928
1184 -#: gitk:11263
929 msgid "I"
930 msgstr "I"
931
1188 -#: gitk:11381
932 msgid "Commit list display options"
933 msgstr "Options d'affichage de la liste des commits"
934
1192 -#: gitk:11384
935 msgid "Maximum graph width (lines)"
936 msgstr "Longueur maximum du graphe (lignes)"
937
938 # FIXME : Traduction standard de "pane"?
1197 -#: gitk:11388
939 #, no-tcl-format
940 msgid "Maximum graph width (% of pane)"
941 msgstr "Largeur maximum du graphe (% du panneau)"
942
1202 -#: gitk:11391
943 msgid "Show local changes"
944 msgstr "Montrer les modifications locales"
945
1206 -#: gitk:11394
946 msgid "Auto-select SHA1 (length)"
947 msgstr "Sélection auto. du SHA1 (longueur)"
948
1210 -#: gitk:11398
949 msgid "Hide remote refs"
950 msgstr "Cacher les refs distantes"
951
1214 -#: gitk:11402
952 msgid "Diff display options"
953 msgstr "Options d'affichage des diff"
954
1218 -#: gitk:11404
955 msgid "Tab spacing"
956 msgstr "Taille des tabulations"
957
1222 -#: gitk:11407
958 msgid "Display nearby tags/heads"
959 msgstr "Afficher les tags les plus proches"
960
1226 -#: gitk:11410
961 msgid "Maximum # tags/heads to show"
962 msgstr "Nombre maximum d'étiquettes/heads à afficher"
963
1230 -#: gitk:11413
964 msgid "Limit diffs to listed paths"
965 msgstr "Limiter les différences aux chemins listés"
966
1234 -#: gitk:11416
967 msgid "Support per-file encodings"
968 msgstr "Support pour un encodage des caractères par fichier"
969
1238 -#: gitk:11422 gitk:11569
970 msgid "External diff tool"
971 msgstr "Outil diff externe"
972
1242 -#: gitk:11423
973 msgid "Choose..."
974 msgstr "Choisir..."
975
1246 -#: gitk:11428
976 msgid "General options"
977 msgstr "Options générales"
978
1250 -#: gitk:11431
979 msgid "Use themed widgets"
980 msgstr "Utiliser des widgets en thème"
981
1254 -#: gitk:11433
982 msgid "(change requires restart)"
983 msgstr "(la modification nécessite un redémarrage)"
984
1258 -#: gitk:11435
985 msgid "(currently unavailable)"
986 msgstr "(non disponible actuellement)"
987
1262 -#: gitk:11446
988 msgid "Colors: press to choose"
989 msgstr "Couleurs : cliquer pour choisir"
990
1266 -#: gitk:11449
991 msgid "Interface"
992 msgstr "Interface"
993
1270 -#: gitk:11450
994 msgid "interface"
995 msgstr "interface"
996
1274 -#: gitk:11453
997 msgid "Background"
998 msgstr "Arrière-plan"
999
1278 -#: gitk:11454 gitk:11484
1000 msgid "background"
1001 msgstr "arrière-plan"
1002
1282 -#: gitk:11457
1003 msgid "Foreground"
1004 msgstr "Premier plan"
1005
1286 -#: gitk:11458
1006 msgid "foreground"
1007 msgstr "premier plan"
1008
1290 -#: gitk:11461
1009 msgid "Diff: old lines"
1010 msgstr "Diff : anciennes lignes"
1011
1294 -#: gitk:11462
1012 msgid "diff old lines"
1013 msgstr "diff anciennes lignes"
1014
1298 -#: gitk:11466
1015 msgid "Diff: new lines"
1016 msgstr "Diff : nouvelles lignes"
1017
1302 -#: gitk:11467
1018 msgid "diff new lines"
1019 msgstr "diff nouvelles lignes"
1020
1306 -#: gitk:11471
1021 msgid "Diff: hunk header"
1022 msgstr "Diff : entête du hunk"
1023
1310 -#: gitk:11473
1024 msgid "diff hunk header"
1025 msgstr "diff : entête du hunk"
1026
1314 -#: gitk:11477
1027 msgid "Marked line bg"
1028 msgstr "Fond de la ligne marquée"
1029
1318 -#: gitk:11479
1030 msgid "marked line background"
1031 msgstr "Fond de la ligne marquée"
1032
1322 -#: gitk:11483
1033 msgid "Select bg"
1034 msgstr "Sélectionner le fond"
1035
1326 -#: gitk:11492
1036 msgid "Fonts: press to choose"
1037 msgstr "Polices : cliquer pour choisir"
1038
1330 -#: gitk:11494
1039 msgid "Main font"
1040 msgstr "Police principale"
1041
1334 -#: gitk:11495
1042 msgid "Diff display font"
1043 msgstr "Police d'affichage des diff"
1044
1338 -#: gitk:11496
1045 msgid "User interface font"
1046 msgstr "Police de l'interface utilisateur"
1047
1342 -#: gitk:11518
1048 msgid "Gitk preferences"
1049 msgstr "Préférences de Gitk"
1050
1346 -#: gitk:11527
1051 msgid "General"
1052 msgstr "Général"
1053
1350 -#: gitk:11528
1054 msgid "Colors"
1055 msgstr "Couleurs"
1056
1354 -#: gitk:11529
1057 msgid "Fonts"
1058 msgstr "Polices"
1059
1358 -#: gitk:11579
1060 #, tcl-format
1061 msgid "Gitk: choose color for %s"
1062 msgstr "Gitk : choisir la couleur de %s"
1063
1363 -#: gitk:12092
1064 msgid ""
1065 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1066 " Gitk requires at least Tcl/Tk 8.4."
@@ -1368,16 +1068,13 @@ msgstr ""
1068 "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n"
1069 " Gitk requiert Tcl/Tk version 8.4 ou supérieur."
1070
1371 -#: gitk:12302
1071 msgid "Cannot find a git repository here."
1072 msgstr "Impossible de trouver un dépôt git ici."
1073
1375 -#: gitk:12349
1074 #, tcl-format
1075 msgid "Ambiguous argument '%s': both revision and filename"
1076 msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier"
1077
1380 -#: gitk:12361
1078 msgid "Bad arguments to gitk:"
1079 msgstr "Arguments invalides pour gitk :"
1080
po/hu.po
-310
@@ -17,32 +17,25 @@ msgstr ""
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
20 -#: gitk:140
20 msgid "Couldn't get list of unmerged files:"
21 msgstr "Nem sikerült letölteni az unmerged fájl listát:"
22
24 -#: gitk:212 gitk:2381
23 msgid "Color words"
24 msgstr ""
25
28 -#: gitk:217 gitk:2381 gitk:8220 gitk:8253
26 msgid "Markup words"
27 msgstr ""
28
32 -#: gitk:324
29 msgid "Error parsing revisions:"
30 msgstr "Hiba történt értelmezés közben:"
31
36 -#: gitk:380
32 msgid "Error executing --argscmd command:"
33 msgstr "Hiba történt a végrehajtáskor --argscmd parancs:"
34
40 -#: gitk:393
35 msgid "No files selected: --merge specified but no files are unmerged."
36 msgstr ""
37 "Nincsen fájl kiválasztva: --merge megadve, de egyetlen fájl sem unmerged."
38
45 -#: gitk:396
39 msgid ""
40 "No files selected: --merge specified but no unmerged files are within file "
41 "limit."
@@ -50,317 +43,237 @@ msgstr ""
43 "Nincsen fájl kiválasztva: --merge megadva, de nincsenek unmerged fájlok a "
44 "fájlon belül limit."
45
53 -#: gitk:418 gitk:566
46 msgid "Error executing git log:"
47 msgstr "Hiba történt a git log végrehajtása közben:"
48
57 -#: gitk:436 gitk:582
49 msgid "Reading"
50 msgstr "Olvasás"
51
61 -#: gitk:496 gitk:4525
52 msgid "Reading commits..."
53 msgstr "Commitok olvasása ..."
54
65 -#: gitk:499 gitk:1637 gitk:4528
55 msgid "No commits selected"
56 msgstr "Nincsen commit kiválasztva"
57
69 -#: gitk:1445 gitk:4045 gitk:12432
58 msgid "Command line"
59 msgstr "Parancs sor"
60
73 -#: gitk:1511
61 msgid "Can't parse git log output:"
62 msgstr "Nem lehet értelmezni a git log kimenetét:"
63
77 -#: gitk:1740
64 msgid "No commit information available"
65 msgstr "Nincsen elérhető commit információ"
66
81 -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
67 msgid "OK"
68 msgstr "OK"
69
85 -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
86 -#: gitk:11242 gitk:11522
70 msgid "Cancel"
71 msgstr "Visszavonás"
72
90 -#: gitk:2069
73 msgid "&Update"
74 msgstr "Frissités"
75
94 -#: gitk:2070
76 msgid "&Reload"
77 msgstr "Újratöltés"
78
98 -#: gitk:2071
79 msgid "Reread re&ferences"
80 msgstr "Referenciák újraolvasása"
81
102 -#: gitk:2072
82 msgid "&List references"
83 msgstr "Referenciák listázása"
84
106 -#: gitk:2074
85 msgid "Start git &gui"
86 msgstr "Git gui indítása"
87
110 -#: gitk:2076
88 msgid "&Quit"
89 msgstr "Kilépés"
90
114 -#: gitk:2068
91 msgid "&File"
92 msgstr "Fájl"
93
118 -#: gitk:2080
94 msgid "&Preferences"
95 msgstr "Beállítások"
96
122 -#: gitk:2079
97 msgid "&Edit"
98 msgstr "Szerkesztés"
99
126 -#: gitk:2084
100 msgid "&New view..."
101 msgstr "Új nézet ..."
102
130 -#: gitk:2085
103 msgid "&Edit view..."
104 msgstr "Nézet szerkesztése ..."
105
134 -#: gitk:2086
106 msgid "&Delete view"
107 msgstr "Nézet törlése"
108
138 -#: gitk:2088 gitk:4043
109 msgid "&All files"
110 msgstr "Minden fájl"
111
142 -#: gitk:2083 gitk:4067
112 msgid "&View"
113 msgstr "Nézet"
114
146 -#: gitk:2093 gitk:2103 gitk:3012
115 msgid "&About gitk"
116 msgstr "Gitk névjegy"
117
150 -#: gitk:2094 gitk:2108
118 msgid "&Key bindings"
119 msgstr "Billentyűkombináció"
120
154 -#: gitk:2092 gitk:2107
121 msgid "&Help"
122 msgstr "Segítség"
123
158 -#: gitk:2185 gitk:8652
124 msgid "SHA1 ID:"
125 msgstr "SHA1 ID:"
126
162 -#: gitk:2229
127 msgid "Row"
128 msgstr "Sor"
129
166 -#: gitk:2267
130 msgid "Find"
131 msgstr "Keresés"
132
170 -#: gitk:2295
133 msgid "commit"
134 msgstr "commit"
135
174 -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
175 -#: gitk:6912
136 msgid "containing:"
137 msgstr "tartalmazás:"
138
179 -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
139 msgid "touching paths:"
140 msgstr "érintendő útvonalak:"
141
183 -#: gitk:2303 gitk:4777
142 msgid "adding/removing string:"
143 msgstr "string hozzáadása/törlése:"
144
187 -#: gitk:2304 gitk:4779
145 msgid "changing lines matching:"
146 msgstr ""
147
191 -#: gitk:2313 gitk:2315 gitk:4766
148 msgid "Exact"
149 msgstr "Pontos"
150
195 -#: gitk:2315 gitk:4854 gitk:6723
151 msgid "IgnCase"
152 msgstr "Kis/nagy betű nem számít"
153
199 -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
154 msgid "Regexp"
155 msgstr "Regexp"
156
203 -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
157 msgid "All fields"
158 msgstr "Minden mező"
159
207 -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
160 msgid "Headline"
161 msgstr "Főcím"
162
211 -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
163 msgid "Comments"
164 msgstr "Megjegyzések"
165
215 -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
216 -#: gitk:8845
166 msgid "Author"
167 msgstr "Szerző"
168
220 -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
169 msgid "Committer"
170 msgstr "Commitoló"
171
224 -#: gitk:2350
172 msgid "Search"
173 msgstr "Keresés"
174
228 -#: gitk:2358
175 msgid "Diff"
176 msgstr "Diff"
177
232 -#: gitk:2360
178 msgid "Old version"
179 msgstr "Régi verzió"
180
236 -#: gitk:2362
181 msgid "New version"
182 msgstr "Új verzió"
183
240 -#: gitk:2364
184 msgid "Lines of context"
185 msgstr "Tartalmi sorok"
186
244 -#: gitk:2374
187 msgid "Ignore space change"
188 msgstr "Space váltás mellőzése"
189
248 -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
190 msgid "Line diff"
191 msgstr ""
192
252 -#: gitk:2445
193 msgid "Patch"
194 msgstr "Patch"
195
256 -#: gitk:2447
196 msgid "Tree"
197 msgstr "Tree"
198
260 -#: gitk:2617 gitk:2637
199 msgid "Diff this -> selected"
200 msgstr "Diff ezeket -> kiválasztott"
201
264 -#: gitk:2618 gitk:2638
202 msgid "Diff selected -> this"
203 msgstr "Diff kiválasztottakat -> ezt"
204
268 -#: gitk:2619 gitk:2639
205 msgid "Make patch"
206 msgstr "Patch készítése"
207
272 -#: gitk:2620 gitk:9254
208 msgid "Create tag"
209 msgstr "Tag készítése"
210
276 -#: gitk:2621 gitk:9371
211 msgid "Write commit to file"
212 msgstr "Commit fáljba írása"
213
280 -#: gitk:2622 gitk:9428
214 msgid "Create new branch"
215 msgstr "Új branch készítése"
216
284 -#: gitk:2623
217 msgid "Cherry-pick this commit"
218 msgstr "Cherry-pick erre a commitra"
219
288 -#: gitk:2624
220 msgid "Reset HEAD branch to here"
221 msgstr "HEAD branch újraindítása ide"
222
292 -#: gitk:2625
223 msgid "Mark this commit"
224 msgstr "Ezen commit megjelölése"
225
296 -#: gitk:2626
226 msgid "Return to mark"
227 msgstr "Visszatérés a megjelöléshez"
228
300 -#: gitk:2627
229 msgid "Find descendant of this and mark"
230 msgstr "Találd meg ezen utódokat és jelöld meg"
231
304 -#: gitk:2628
232 msgid "Compare with marked commit"
233 msgstr "Összehasonlítás a megjelölt commit-tal"
234
308 -#: gitk:2629 gitk:2640
235 #, fuzzy
236 msgid "Diff this -> marked commit"
237 msgstr "Diff ezeket -> kiválasztott"
238
313 -#: gitk:2630 gitk:2641
239 #, fuzzy
240 msgid "Diff marked commit -> this"
241 msgstr "Diff kiválasztottakat -> ezt"
242
318 -#: gitk:2631
243 #, fuzzy
244 msgid "Revert this commit"
245 msgstr "Ezen commit megjelölése"
246
323 -#: gitk:2647
247 msgid "Check out this branch"
248 msgstr "Check out ezt a branchot"
249
327 -#: gitk:2648
250 msgid "Remove this branch"
251 msgstr "Töröld ezt a branch-ot"
252
331 -#: gitk:2649
253 msgid "Copy branch name"
254 msgstr ""
255
335 -#: gitk:2656
256 msgid "Highlight this too"
257 msgstr "Emeld ki ezt is"
258
339 -#: gitk:2657
259 msgid "Highlight this only"
260 msgstr "Csak ezt emeld ki"
261
343 -#: gitk:2658
262 msgid "External diff"
263 msgstr "Külső diff"
264
347 -#: gitk:2659
265 msgid "Blame parent commit"
266 msgstr "Blame szülő kommitra"
267
351 -#: gitk:2660
268 msgid "Copy path"
269 msgstr ""
270
355 -#: gitk:2667
271 msgid "Show origin of this line"
272 msgstr "Mutasd meg ennek a sornak az eredetét"
273
359 -#: gitk:2668
274 msgid "Run git gui blame on this line"
275 msgstr "Futtasd a git gui blame-t ezen a soron"
276
363 -#: gitk:3014
277 #, fuzzy
278 msgid ""
279 "\n"
@@ -377,321 +290,249 @@ msgstr ""
290 "\n"
291 "Használd és terjeszd a GNU General Public License feltételei mellett"
292
380 -#: gitk:3022 gitk:3089 gitk:9857
293 msgid "Close"
294 msgstr "Bezárás"
295
384 -#: gitk:3043
296 msgid "Gitk key bindings"
297 msgstr "Gitk-billentyű hozzárendelés"
298
388 -#: gitk:3046
299 msgid "Gitk key bindings:"
300 msgstr "Gitk-billentyű hozzaárendelés:"
301
392 -#: gitk:3048
302 #, tcl-format
303 msgid "<%s-Q>\t\tQuit"
304 msgstr "<%s-Q>\t\tKilépés"
305
397 -#: gitk:3049
306 #, fuzzy, tcl-format
307 msgid "<%s-W>\t\tClose window"
308 msgstr "<%s-F>\t\tKeresés"
309
402 -#: gitk:3050
310 msgid "<Home>\t\tMove to first commit"
311 msgstr "<Pos1>\t\tElső commithoz"
312
406 -#: gitk:3051
313 msgid "<End>\t\tMove to last commit"
314 msgstr "<Ende>\t\tUtolsó commithoz"
315
410 -#: gitk:3052
316 #, fuzzy
317 msgid "<Up>, p, k\tMove up one commit"
318 msgstr "<Hoch>, p, i\tEgy committal feljebb"
319
415 -#: gitk:3053
320 #, fuzzy
321 msgid "<Down>, n, j\tMove down one commit"
322 msgstr "<Runter>, n, k\tEgy committal lejjebb"
323
420 -#: gitk:3054
324 #, fuzzy
325 msgid "<Left>, z, h\tGo back in history list"
326 msgstr "<Links>, z, j\tVissza a history listába"
327
425 -#: gitk:3055
328 msgid "<Right>, x, l\tGo forward in history list"
329 msgstr "<Rechts>, x, l\tElőre a history listába"
330
429 -#: gitk:3056
331 #, tcl-format
332 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
333 msgstr ""
334
434 -#: gitk:3057
335 msgid "<PageUp>\tMove up one page in commit list"
336 msgstr "<BildHoch>\tEgy lappal feljebb a commit listába"
337
438 -#: gitk:3058
338 msgid "<PageDown>\tMove down one page in commit list"
339 msgstr "<BildRunter>\tEgy lappal lejjebb a commit listába"
340
442 -#: gitk:3059
341 #, tcl-format
342 msgid "<%s-Home>\tScroll to top of commit list"
343 msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez"
344
447 -#: gitk:3060
345 #, tcl-format
346 msgid "<%s-End>\tScroll to bottom of commit list"
347 msgstr "<%s-Ende>\tGörgetés a commit lista aljához"
348
452 -#: gitk:3061
349 #, tcl-format
350 msgid "<%s-Up>\tScroll commit list up one line"
351 msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában"
352
457 -#: gitk:3062
353 #, tcl-format
354 msgid "<%s-Down>\tScroll commit list down one line"
355 msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában"
356
462 -#: gitk:3063
357 #, tcl-format
358 msgid "<%s-PageUp>\tScroll commit list up one page"
359 msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában"
360
467 -#: gitk:3064
361 #, tcl-format
362 msgid "<%s-PageDown>\tScroll commit list down one page"
363 msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában"
364
472 -#: gitk:3065
365 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
366 msgstr "<Umschalt-Hoch>\tKeresés visszafele (felfele, utolsó commitok)"
367
476 -#: gitk:3066
368 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
369 msgstr "<Umschalt-Runter>\tKeresés előre (lefelé; korábbi commitok)"
370
480 -#: gitk:3067
371 msgid "<Delete>, b\tScroll diff view up one page"
372 msgstr "<Entf>, b\t\tEgy lappal feljebb görgetés a diff nézetben"
373
484 -#: gitk:3068
374 msgid "<Backspace>\tScroll diff view up one page"
375 msgstr "<Löschtaste>\tEgy lappal feljebb görgetés a diff nézetben"
376
488 -#: gitk:3069
377 msgid "<Space>\t\tScroll diff view down one page"
378 msgstr "<Leertaste>\tEgy lappal lejjebb görgetés a diff nézetben"
379
492 -#: gitk:3070
380 msgid "u\t\tScroll diff view up 18 lines"
381 msgstr "u\t\t18 sorral felfelé görgetés diff nézetben"
382
496 -#: gitk:3071
383 msgid "d\t\tScroll diff view down 18 lines"
384 msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben"
385
500 -#: gitk:3072
386 #, tcl-format
387 msgid "<%s-F>\t\tFind"
388 msgstr "<%s-F>\t\tKeresés"
389
505 -#: gitk:3073
390 #, tcl-format
391 msgid "<%s-G>\t\tMove to next find hit"
392 msgstr "<%s-G>\t\tKövetkező találathoz"
393
510 -#: gitk:3074
394 msgid "<Return>\tMove to next find hit"
395 msgstr "<Eingabetaste>\tKövetkező találathoz"
396
514 -#: gitk:3075
397 #, fuzzy
398 msgid "g\t\tGo to commit"
399 msgstr "<Ende>\t\tUtolsó commithoz"
400
519 -#: gitk:3076
401 msgid "/\t\tFocus the search box"
402 msgstr "/\t\tLépj a keresési mezőre"
403
523 -#: gitk:3077
404 msgid "?\t\tMove to previous find hit"
405 msgstr "?\t\tElőző találathoz"
406
527 -#: gitk:3078
407 msgid "f\t\tScroll diff view to next file"
408 msgstr "f\t\tKövetkező fájlra görgetés diff nézetben"
409
531 -#: gitk:3079
410 #, tcl-format
411 msgid "<%s-S>\t\tSearch for next hit in diff view"
412 msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben"
413
536 -#: gitk:3080
414 #, tcl-format
415 msgid "<%s-R>\t\tSearch for previous hit in diff view"
416 msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben"
417
541 -#: gitk:3081
418 #, tcl-format
419 msgid "<%s-KP+>\tIncrease font size"
420 msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése"
421
546 -#: gitk:3082
422 #, tcl-format
423 msgid "<%s-plus>\tIncrease font size"
424 msgstr "<%s-Plus>\tBetűméret növelése"
425
551 -#: gitk:3083
426 #, tcl-format
427 msgid "<%s-KP->\tDecrease font size"
428 msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése"
429
556 -#: gitk:3084
430 #, tcl-format
431 msgid "<%s-minus>\tDecrease font size"
432 msgstr "<%s-Minus>\tBetűméret csökkentése"
433
561 -#: gitk:3085
434 msgid "<F5>\t\tUpdate"
435 msgstr "<F5>\t\tFrissítés"
436
565 -#: gitk:3550 gitk:3559
437 #, tcl-format
438 msgid "Error creating temporary directory %s:"
439 msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:"
440
570 -#: gitk:3572
441 #, tcl-format
442 msgid "Error getting \"%s\" from %s:"
443 msgstr "Hiba történt \"%s\" letöltése közben %s-ről:"
444
575 -#: gitk:3635
445 msgid "command failed:"
446 msgstr "parancs hiba:"
447
579 -#: gitk:3784
448 msgid "No such commit"
449 msgstr "Nincs ilyen commit"
450
583 -#: gitk:3798
451 msgid "git gui blame: command failed:"
452 msgstr "git gui blame: parancs hiba:"
453
587 -#: gitk:3829
454 #, tcl-format
455 msgid "Couldn't read merge head: %s"
456 msgstr "Nem sikerült a Merge head olvasása: %s"
457
592 -#: gitk:3837
458 #, tcl-format
459 msgid "Error reading index: %s"
460 msgstr "Hiba történt az index olvasása közben: %s"
461
597 -#: gitk:3862
462 #, tcl-format
463 msgid "Couldn't start git blame: %s"
464 msgstr "Nem sikerült a git blame indítása: %s"
465
602 -#: gitk:3865 gitk:6754
466 msgid "Searching"
467 msgstr "Keresés"
468
606 -#: gitk:3897
469 #, tcl-format
470 msgid "Error running git blame: %s"
471 msgstr "Hiba történt a git blame futtatása közben: %s"
472
611 -#: gitk:3925
473 #, tcl-format
474 msgid "That line comes from commit %s, which is not in this view"
475 msgstr ""
476 "A %s commitból származik az a sor, amelyik nem található ebben a nézetben"
477
617 -#: gitk:3939
478 msgid "External diff viewer failed:"
479 msgstr "Külső diff nézegető hiba:"
480
621 -#: gitk:4070
481 msgid "Gitk view definition"
482 msgstr "Gitk nézet meghatározása"
483
625 -#: gitk:4074
484 msgid "Remember this view"
485 msgstr "Maradj ennél a nézetnél"
486
629 -#: gitk:4075
487 msgid "References (space separated list):"
488 msgstr "Referenciák (szóközzel tagolt lista"
489
633 -#: gitk:4076
490 msgid "Branches & tags:"
491 msgstr "Branch-ek & tagek:"
492
637 -#: gitk:4077
493 msgid "All refs"
494 msgstr "Minden ref"
495
641 -#: gitk:4078
496 msgid "All (local) branches"
497 msgstr "Minden (helyi) branch"
498
645 -#: gitk:4079
499 msgid "All tags"
500 msgstr "Minden tag"
501
649 -#: gitk:4080
502 msgid "All remote-tracking branches"
503 msgstr "Minden távoli követő branch"
504
653 -#: gitk:4081
505 msgid "Commit Info (regular expressions):"
506 msgstr "Commit Infó (reguláris kifejezés):"
507
657 -#: gitk:4082
508 msgid "Author:"
509 msgstr "Szerző:"
510
661 -#: gitk:4083
511 msgid "Committer:"
512 msgstr "Commitoló:"
513
665 -#: gitk:4084
514 msgid "Commit Message:"
515 msgstr "Commit üzenet:"
516
669 -#: gitk:4085
517 msgid "Matches all Commit Info criteria"
518 msgstr "Egyezik minen Commit Infó feltétellel"
519
673 -#: gitk:4086
520 #, fuzzy
521 msgid "Matches no Commit Info criteria"
522 msgstr "Egyezik minen Commit Infó feltétellel"
523
678 -#: gitk:4087
524 msgid "Changes to Files:"
525 msgstr "Fájl változások:"
526
682 -#: gitk:4088
527 msgid "Fixed String"
528 msgstr "Fix String"
529
686 -#: gitk:4089
530 msgid "Regular Expression"
531 msgstr "Reguláris kifejezés"
532
690 -#: gitk:4090
533 msgid "Search string:"
534 msgstr "Keresés szöveg:"
535
694 -#: gitk:4091
536 msgid ""
537 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
538 "15:27:38\"):"
@@ -699,203 +540,155 @@ msgstr ""
540 "Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
541 "15:27:38\"):"
542
702 -#: gitk:4092
543 msgid "Since:"
544 msgstr "Ettől:"
545
706 -#: gitk:4093
546 msgid "Until:"
547 msgstr "Eddig:"
548
710 -#: gitk:4094
549 msgid "Limit and/or skip a number of revisions (positive integer):"
550 msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):"
551
714 -#: gitk:4095
552 msgid "Number to show:"
553 msgstr "Mutatandó szám:"
554
718 -#: gitk:4096
555 msgid "Number to skip:"
556 msgstr "Kihagyandó szám:"
557
722 -#: gitk:4097
558 msgid "Miscellaneous options:"
559 msgstr "Különféle opciók:"
560
726 -#: gitk:4098
561 msgid "Strictly sort by date"
562 msgstr "Szigorú rendezás dátum alapján"
563
730 -#: gitk:4099
564 msgid "Mark branch sides"
565 msgstr "Jelölje meg az ágakat"
566
734 -#: gitk:4100
567 msgid "Limit to first parent"
568 msgstr "Korlátozás az első szülőre"
569
738 -#: gitk:4101
570 msgid "Simple history"
571 msgstr "Egyszerű history"
572
742 -#: gitk:4102
573 msgid "Additional arguments to git log:"
574 msgstr "További argumentok a git log-hoz:"
575
746 -#: gitk:4103
576 msgid "Enter files and directories to include, one per line:"
577 msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:"
578
750 -#: gitk:4104
579 msgid "Command to generate more commits to include:"
580 msgstr "Parancs több tartalmazó commit generálására:"
581
754 -#: gitk:4228
582 msgid "Gitk: edit view"
583 msgstr "Gitk: szerkesztés nézet"
584
758 -#: gitk:4236
585 msgid "-- criteria for selecting revisions"
586 msgstr "-- kritériumok a revíziók kiválasztásához"
587
762 -#: gitk:4241
588 msgid "View Name"
589 msgstr "Nézet neve"
590
766 -#: gitk:4316
591 msgid "Apply (F5)"
592 msgstr "Alkalmaz (F5)"
593
770 -#: gitk:4354
594 msgid "Error in commit selection arguments:"
595 msgstr "Hiba történt a commit argumentumok kiválasztása közben:"
596
774 -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
597 msgid "None"
598 msgstr "Keine"
599
778 -#: gitk:5021 gitk:5026
600 msgid "Descendant"
601 msgstr "Leszármazott"
602
782 -#: gitk:5022
603 msgid "Not descendant"
604 msgstr "Nem leszármazott"
605
786 -#: gitk:5029 gitk:5034
606 msgid "Ancestor"
607 msgstr "Előd"
608
790 -#: gitk:5030
609 msgid "Not ancestor"
610 msgstr "Nem előd"
611
794 -#: gitk:5324
612 msgid "Local changes checked in to index but not committed"
613 msgstr ""
614 "Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek "
615 "commitolva"
616
800 -#: gitk:5360
617 msgid "Local uncommitted changes, not checked in to index"
618 msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe"
619
804 -#: gitk:7134
620 msgid "and many more"
621 msgstr ""
622
808 -#: gitk:7137
623 msgid "many"
624 msgstr "sok"
625
812 -#: gitk:7328
626 msgid "Tags:"
627 msgstr "Tagek:"
628
816 -#: gitk:7345 gitk:7351 gitk:8825
629 msgid "Parent"
630 msgstr "Eltern"
631
820 -#: gitk:7356
632 msgid "Child"
633 msgstr "Gyerek"
634
824 -#: gitk:7365
635 msgid "Branch"
636 msgstr "Ág"
637
828 -#: gitk:7368
638 msgid "Follows"
639 msgstr "Következők"
640
832 -#: gitk:7371
641 msgid "Precedes"
642 msgstr "Megelőzők"
643
836 -#: gitk:7966
644 #, tcl-format
645 msgid "Error getting diffs: %s"
646 msgstr "Hiba történt a diff-ek letöltése közben: %s"
647
841 -#: gitk:8650
648 msgid "Goto:"
649 msgstr "Menj:"
650
845 -#: gitk:8671
651 #, tcl-format
652 msgid "Short SHA1 id %s is ambiguous"
653 msgstr "Rövid SHA1 id %s félreérthető"
654
850 -#: gitk:8678
655 #, tcl-format
656 msgid "Revision %s is not known"
657 msgstr "A(z) %s revízió nem ismert"
658
855 -#: gitk:8688
659 #, tcl-format
660 msgid "SHA1 id %s is not known"
661 msgstr "SHA1 id %s nem ismert"
662
860 -#: gitk:8690
663 #, tcl-format
664 msgid "Revision %s is not in the current view"
665 msgstr "A(z) %s revízió nincs a jelenlegi nézetben"
666
865 -#: gitk:8832 gitk:8847
667 msgid "Date"
668 msgstr "Dátum"
669
869 -#: gitk:8835
670 msgid "Children"
671 msgstr "Gyerekek"
672
873 -#: gitk:8898
673 #, tcl-format
674 msgid "Reset %s branch to here"
675 msgstr "Állítsd vissza a %s branch-ot ide"
676
878 -#: gitk:8900
677 msgid "Detached head: can't reset"
678 msgstr "Elkülönített head: nem lehet visszaállítani"
679
882 -#: gitk:9005 gitk:9011
680 msgid "Skipping merge commit "
681 msgstr "Merge commit kihagyása "
682
886 -#: gitk:9020 gitk:9025
683 msgid "Error getting patch ID for "
684 msgstr "Hiba történt a patch ID megszerzése közben a következőnél "
685
890 -#: gitk:9021 gitk:9026
686 msgid " - stopping\n"
687 msgstr " - abbahagyás\n"
688
894 -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
689 msgid "Commit "
690 msgstr "Commit "
691
898 -#: gitk:9035
692 msgid ""
693 " is the same patch as\n"
694 " "
@@ -903,7 +696,6 @@ msgstr ""
696 " Ugyanaz a patch mint\n"
697 " "
698
906 -#: gitk:9043
699 msgid ""
700 " differs from\n"
701 " "
@@ -911,7 +703,6 @@ msgstr ""
703 " különbözik innentől\n"
704 " "
705
914 -#: gitk:9045
706 msgid ""
707 "Diff of commits:\n"
708 "\n"
@@ -919,132 +710,102 @@ msgstr ""
710 "A commitok diffje:\n"
711 "\n"
712
922 -#: gitk:9057 gitk:9066
713 #, tcl-format
714 msgid " has %s children - stopping\n"
715 msgstr " %s gyereke van. abbahagyás\n"
716
927 -#: gitk:9085
717 #, tcl-format
718 msgid "Error writing commit to file: %s"
719 msgstr "Hiba történt a commit fájlba írása közben: %s"
720
932 -#: gitk:9091
721 #, tcl-format
722 msgid "Error diffing commits: %s"
723 msgstr "Hiba történt a commitok diffelése közben: %s"
724
937 -#: gitk:9137
725 msgid "Top"
726 msgstr "Teteje"
727
941 -#: gitk:9138
728 msgid "From"
729 msgstr "Innen"
730
945 -#: gitk:9143
731 msgid "To"
732 msgstr "Ide"
733
949 -#: gitk:9167
734 msgid "Generate patch"
735 msgstr "Patch generálása"
736
953 -#: gitk:9169
737 msgid "From:"
738 msgstr "Innen:"
739
957 -#: gitk:9178
740 msgid "To:"
741 msgstr "Ide:"
742
961 -#: gitk:9187
743 msgid "Reverse"
744 msgstr "Visszafele"
745
965 -#: gitk:9189 gitk:9385
746 msgid "Output file:"
747 msgstr "Kimeneti fájl:"
748
969 -#: gitk:9195
749 msgid "Generate"
750 msgstr "Generálás"
751
973 -#: gitk:9233
752 msgid "Error creating patch:"
753 msgstr "Hiba törtét a patch készítése közben:"
754
977 -#: gitk:9256 gitk:9373 gitk:9430
755 msgid "ID:"
756 msgstr "ID:"
757
981 -#: gitk:9265
758 msgid "Tag name:"
759 msgstr "Tag név:"
760
985 -#: gitk:9268
761 msgid "Tag message is optional"
762 msgstr ""
763
989 -#: gitk:9270
764 #, fuzzy
765 msgid "Tag message:"
766 msgstr "Tag név:"
767
994 -#: gitk:9274 gitk:9439
768 msgid "Create"
769 msgstr "Létrehozás"
770
998 -#: gitk:9292
771 msgid "No tag name specified"
772 msgstr "A tag neve nincsen megadva"
773
1002 -#: gitk:9296
774 #, tcl-format
775 msgid "Tag \"%s\" already exists"
776 msgstr "%s Tag már létezik"
777
1007 -#: gitk:9306
778 msgid "Error creating tag:"
779 msgstr "Hiba történt a tag létrehozása közben:"
780
1011 -#: gitk:9382
781 msgid "Command:"
782 msgstr "Parancs:"
783
1015 -#: gitk:9390
784 msgid "Write"
785 msgstr "Írás"
786
1019 -#: gitk:9408
787 msgid "Error writing commit:"
788 msgstr "Hiba történt a commit írása közben:"
789
1023 -#: gitk:9435
790 msgid "Name:"
791 msgstr "Név:"
792
1027 -#: gitk:9458
793 msgid "Please specify a name for the new branch"
794 msgstr "Kérem adja meg a nevét az új branchhoz"
795
1031 -#: gitk:9463
796 #, tcl-format
797 msgid "Branch '%s' already exists. Overwrite?"
798 msgstr "%s branch már létezik. Felülírja?"
799
1036 -#: gitk:9530
800 #, tcl-format
801 msgid "Commit %s is already included in branch %s -- really re-apply it?"
802 msgstr ""
803 "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?"
804 "eintragen?"
805
1043 -#: gitk:9535
806 msgid "Cherry-picking"
807 msgstr "Cherry-picking"
808
1047 -#: gitk:9544
809 #, tcl-format
810 msgid ""
811 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1054,7 +815,6 @@ msgstr ""
815 "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja "
816 "újra."
817
1057 -#: gitk:9550
818 msgid ""
819 "Cherry-pick failed because of merge conflict.\n"
820 "Do you wish to run git citool to resolve it?"
@@ -1062,23 +822,19 @@ msgstr ""
822 "Cherry-pick hiba történt merge konfliktus miatt.\n"
823 "Kívánja futtatni a git citool-t a probléma megoldásához?"
824
1065 -#: gitk:9566 gitk:9624
825 msgid "No changes committed"
826 msgstr "Nincsen változás commitolva"
827
1069 -#: gitk:9593
828 #, fuzzy, tcl-format
829 msgid "Commit %s is not included in branch %s -- really revert it?"
830 msgstr ""
831 "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?"
832 "eintragen?"
833
1076 -#: gitk:9598
834 #, fuzzy
835 msgid "Reverting"
836 msgstr "Újraindítás"
837
1081 -#: gitk:9606
838 #, fuzzy, tcl-format
839 msgid ""
840 "Revert failed because of local changes to the following files:%s Please "
@@ -1088,7 +844,6 @@ msgstr ""
844 "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja "
845 "újra."
846
1091 -#: gitk:9610
847 #, fuzzy
848 msgid ""
849 "Revert failed because of merge conflict.\n"
@@ -1097,28 +852,22 @@ msgstr ""
852 "Cherry-pick hiba történt merge konfliktus miatt.\n"
853 "Kívánja futtatni a git citool-t a probléma megoldásához?"
854
1100 -#: gitk:9653
855 msgid "Confirm reset"
856 msgstr "Újraindítás megerősítése"
857
1104 -#: gitk:9655
858 #, tcl-format
859 msgid "Reset branch %s to %s?"
860 msgstr "Újraindítja a %s branchot %s-ig?"
861
1109 -#: gitk:9657
862 msgid "Reset type:"
863 msgstr "Újraindítás típusa:"
864
1113 -#: gitk:9660
865 msgid "Soft: Leave working tree and index untouched"
866 msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül"
867
1117 -#: gitk:9663
868 msgid "Mixed: Leave working tree untouched, reset index"
869 msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet"
870
1121 -#: gitk:9666
871 msgid ""
872 "Hard: Reset working tree and index\n"
873 "(discard ALL local changes)"
@@ -1126,19 +875,15 @@ msgstr ""
875 "Hard: Indítsd újra a working tree-t és az indexet\n"
876 "(MINDEN lokális változás eldobása)"
877
1129 -#: gitk:9683
878 msgid "Resetting"
879 msgstr "Újraindítás"
880
1133 -#: gitk:9743
881 msgid "Checking out"
882 msgstr "Kivesz"
883
1137 -#: gitk:9796
884 msgid "Cannot delete the currently checked-out branch"
885 msgstr "Nem lehet a jelenleg kivett branch-ot törölni"
886
1141 -#: gitk:9802
887 #, tcl-format
888 msgid ""
889 "The commits on branch %s aren't on any other branch.\n"
@@ -1147,16 +892,13 @@ msgstr ""
892 "A %s branchon található commit nem található meg semelyik másik branchon.\n"
893 "Tényleg törli a %s branchot?"
894
1150 -#: gitk:9833
895 #, tcl-format
896 msgid "Tags and heads: %s"
897 msgstr "Tagek és headek: %s"
898
1155 -#: gitk:9850
899 msgid "Filter"
900 msgstr "Szűrő"
901
1159 -#: gitk:10146
902 msgid ""
903 "Error reading commit topology information; branch and preceding/following "
904 "tag information will be incomplete."
@@ -1164,204 +906,155 @@ msgstr ""
906 "Hiba történt a commit topológiai információ olvasása közben; branch ésa "
907 "megelőző/következő információ nem lesz teljes."
908
1167 -#: gitk:11123
909 msgid "Tag"
910 msgstr "Tag"
911
1171 -#: gitk:11127
912 msgid "Id"
913 msgstr "Id"
914
1175 -#: gitk:11210
915 msgid "Gitk font chooser"
916 msgstr "Gitk-betű kiválasztó"
917
1179 -#: gitk:11227
918 msgid "B"
919 msgstr "F"
920
1183 -#: gitk:11230
921 msgid "I"
922 msgstr "K"
923
1187 -#: gitk:11348
924 msgid "Commit list display options"
925 msgstr "Commit lista kijelzési opciók"
926
1191 -#: gitk:11351
927 msgid "Maximum graph width (lines)"
928 msgstr "Maximális grafikon szélesség (sorok)"
929
1195 -#: gitk:11355
930 #, no-tcl-format
931 msgid "Maximum graph width (% of pane)"
932 msgstr "Maximális grafikon szélesség (táble %-je)"
933
1200 -#: gitk:11358
934 msgid "Show local changes"
935 msgstr "Mutasd a lokális változtatásokat"
936
1204 -#: gitk:11361
937 #, fuzzy
938 msgid "Auto-select SHA1 (length)"
939 msgstr "SHA1 Automatikus kiválasztása"
940
1209 -#: gitk:11365
941 msgid "Hide remote refs"
942 msgstr "A távoli refek elrejtése"
943
1213 -#: gitk:11369
944 msgid "Diff display options"
945 msgstr "Diff kijelző opciók"
946
1217 -#: gitk:11371
947 msgid "Tab spacing"
948 msgstr "Tab sorköz"
949
1221 -#: gitk:11374
950 #, fuzzy
951 msgid "Display nearby tags/heads"
952 msgstr "Szomszédos tagek kijelzése"
953
1226 -#: gitk:11377
954 msgid "Maximum # tags/heads to show"
955 msgstr ""
956
1230 -#: gitk:11380
957 msgid "Limit diffs to listed paths"
958 msgstr "Korlátozott diffek a kilistázott útvonalakhoz"
959
1234 -#: gitk:11383
960 msgid "Support per-file encodings"
961 msgstr "Fájlonkénti kódolás támgatása"
962
1238 -#: gitk:11389 gitk:11536
963 msgid "External diff tool"
964 msgstr "Külső diff alkalmazás"
965
1242 -#: gitk:11390
966 msgid "Choose..."
967 msgstr "Válaszd ..."
968
1246 -#: gitk:11395
969 msgid "General options"
970 msgstr "Általános opciók"
971
1250 -#: gitk:11398
972 msgid "Use themed widgets"
973 msgstr "Témázott vezérlők használata"
974
1254 -#: gitk:11400
975 msgid "(change requires restart)"
976 msgstr "(a változás újraindítást igényel)"
977
1258 -#: gitk:11402
978 msgid "(currently unavailable)"
979 msgstr "(jelenleg nem elérhető)"
980
1262 -#: gitk:11413
981 msgid "Colors: press to choose"
982 msgstr "Színek: nyomja meg a kiválasztáshoz"
983
1266 -#: gitk:11416
984 msgid "Interface"
985 msgstr "Interfész"
986
1270 -#: gitk:11417
987 msgid "interface"
988 msgstr "interfész"
989
1274 -#: gitk:11420
990 msgid "Background"
991 msgstr "Háttér"
992
1278 -#: gitk:11421 gitk:11451
993 msgid "background"
994 msgstr "háttér"
995
1282 -#: gitk:11424
996 msgid "Foreground"
997 msgstr "Előtér"
998
1286 -#: gitk:11425
999 msgid "foreground"
1000 msgstr "előtér"
1001
1290 -#: gitk:11428
1002 msgid "Diff: old lines"
1003 msgstr "Diff: régi sorok"
1004
1294 -#: gitk:11429
1005 msgid "diff old lines"
1006 msgstr "diff régi sorok"
1007
1298 -#: gitk:11433
1008 msgid "Diff: new lines"
1009 msgstr "Diff: új sorok"
1010
1302 -#: gitk:11434
1011 msgid "diff new lines"
1012 msgstr "diff - új sorok"
1013
1306 -#: gitk:11438
1014 msgid "Diff: hunk header"
1015 msgstr "Diff: nagy headerök"
1016
1310 -#: gitk:11440
1017 msgid "diff hunk header"
1018 msgstr "diff - nagy headerök"
1019
1314 -#: gitk:11444
1020 msgid "Marked line bg"
1021 msgstr "Megjelölt sor háttér"
1022
1318 -#: gitk:11446
1023 msgid "marked line background"
1024 msgstr "megjelölt sor háttér"
1025
1322 -#: gitk:11450
1026 msgid "Select bg"
1027 msgstr "Válasszon hátteret"
1028
1326 -#: gitk:11459
1029 msgid "Fonts: press to choose"
1030 msgstr "Betű: nyomja meg a kiválasztáshoz"
1031
1330 -#: gitk:11461
1032 msgid "Main font"
1033 msgstr "Fő betű"
1034
1334 -#: gitk:11462
1035 msgid "Diff display font"
1036 msgstr "Diff kijelző betű"
1037
1338 -#: gitk:11463
1038 msgid "User interface font"
1039 msgstr "Felhasználói interfész betű"
1040
1342 -#: gitk:11485
1041 msgid "Gitk preferences"
1042 msgstr "Gitk beállítások"
1043
1346 -#: gitk:11494
1044 #, fuzzy
1045 msgid "General"
1046 msgstr "Generálás"
1047
1351 -#: gitk:11495
1048 msgid "Colors"
1049 msgstr ""
1050
1355 -#: gitk:11496
1051 msgid "Fonts"
1052 msgstr ""
1053
1359 -#: gitk:11546
1054 #, tcl-format
1055 msgid "Gitk: choose color for %s"
1056 msgstr "Gitk: válasszon színt a %s-ra"
1057
1364 -#: gitk:12059
1058 msgid ""
1059 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1060 " Gitk requires at least Tcl/Tk 8.4."
@@ -1369,16 +1062,13 @@ msgstr ""
1062 "Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n"
1063 "Gitk futtatásához legalább Tcl/Tk 8.4 szükséges."
1064
1372 -#: gitk:12269
1065 msgid "Cannot find a git repository here."
1066 msgstr "Nem találhatü git repository itt."
1067
1376 -#: gitk:12316
1068 #, tcl-format
1069 msgid "Ambiguous argument '%s': both revision and filename"
1070 msgstr "Félreérthető argumentum '%s': revízió és fájlnév is"
1071
1381 -#: gitk:12328
1072 msgid "Bad arguments to gitk:"
1073 msgstr "Rossz gitk argumentumok:"
1074
po/it.po
-310
@@ -17,33 +17,26 @@ msgstr ""
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
20 -#: gitk:140
20 msgid "Couldn't get list of unmerged files:"
21 msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:"
22
24 -#: gitk:212 gitk:2381
23 msgid "Color words"
24 msgstr ""
25
28 -#: gitk:217 gitk:2381 gitk:8220 gitk:8253
26 msgid "Markup words"
27 msgstr ""
28
32 -#: gitk:324
29 msgid "Error parsing revisions:"
30 msgstr "Errore nella lettura delle revisioni:"
31
36 -#: gitk:380
32 msgid "Error executing --argscmd command:"
33 msgstr "Errore nell'esecuzione del comando specificato con --argscmd:"
34
40 -#: gitk:393
35 msgid "No files selected: --merge specified but no files are unmerged."
36 msgstr ""
37 "Nessun file selezionato: è stata specificata l'opzione --merge ma non ci "
38 "sono file in attesa di fusione."
39
46 -#: gitk:396
40 msgid ""
41 "No files selected: --merge specified but no unmerged files are within file "
42 "limit."
@@ -51,317 +44,237 @@ msgstr ""
44 "Nessun file selezionato: è stata specificata l'opzione --merge ma i file "
45 "specificati non sono in attesa di fusione."
46
54 -#: gitk:418 gitk:566
47 msgid "Error executing git log:"
48 msgstr "Errore nell'esecuzione di git log:"
49
58 -#: gitk:436 gitk:582
50 msgid "Reading"
51 msgstr "Lettura in corso"
52
62 -#: gitk:496 gitk:4525
53 msgid "Reading commits..."
54 msgstr "Lettura delle revisioni in corso..."
55
66 -#: gitk:499 gitk:1637 gitk:4528
56 msgid "No commits selected"
57 msgstr "Nessuna revisione selezionata"
58
70 -#: gitk:1445 gitk:4045 gitk:12432
59 msgid "Command line"
60 msgstr "Linea di comando"
61
74 -#: gitk:1511
62 msgid "Can't parse git log output:"
63 msgstr "Impossibile elaborare i dati di git log:"
64
78 -#: gitk:1740
65 msgid "No commit information available"
66 msgstr "Nessuna informazione disponibile sulle revisioni"
67
82 -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
68 msgid "OK"
69 msgstr "OK"
70
86 -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
87 -#: gitk:11242 gitk:11522
71 msgid "Cancel"
72 msgstr "Annulla"
73
91 -#: gitk:2069
74 msgid "&Update"
75 msgstr "Aggiorna"
76
95 -#: gitk:2070
77 msgid "&Reload"
78 msgstr "Ricarica"
79
99 -#: gitk:2071
80 msgid "Reread re&ferences"
81 msgstr "Rileggi riferimenti"
82
103 -#: gitk:2072
83 msgid "&List references"
84 msgstr "Elenca riferimenti"
85
107 -#: gitk:2074
86 msgid "Start git &gui"
87 msgstr "Avvia git gui"
88
111 -#: gitk:2076
89 msgid "&Quit"
90 msgstr "Esci"
91
115 -#: gitk:2068
92 msgid "&File"
93 msgstr "&File"
94
119 -#: gitk:2080
95 msgid "&Preferences"
96 msgstr "Preferenze"
97
123 -#: gitk:2079
98 msgid "&Edit"
99 msgstr "Modifica"
100
127 -#: gitk:2084
101 msgid "&New view..."
102 msgstr "Nuova vista..."
103
131 -#: gitk:2085
104 msgid "&Edit view..."
105 msgstr "Modifica vista..."
106
135 -#: gitk:2086
107 msgid "&Delete view"
108 msgstr "Elimina vista"
109
139 -#: gitk:2088 gitk:4043
110 msgid "&All files"
111 msgstr "Tutti i file"
112
143 -#: gitk:2083 gitk:4067
113 msgid "&View"
114 msgstr "Vista"
115
147 -#: gitk:2093 gitk:2103 gitk:3012
116 msgid "&About gitk"
117 msgstr "Informazioni su gitk"
118
151 -#: gitk:2094 gitk:2108
119 msgid "&Key bindings"
120 msgstr "Scorciatoie da tastiera"
121
155 -#: gitk:2092 gitk:2107
122 msgid "&Help"
123 msgstr "Aiuto"
124
159 -#: gitk:2185 gitk:8652
125 msgid "SHA1 ID:"
126 msgstr "SHA1 ID:"
127
163 -#: gitk:2229
128 msgid "Row"
129 msgstr "Riga"
130
167 -#: gitk:2267
131 msgid "Find"
132 msgstr "Trova"
133
171 -#: gitk:2295
134 msgid "commit"
135 msgstr "revisione"
136
175 -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
176 -#: gitk:6912
137 msgid "containing:"
138 msgstr "contenente:"
139
180 -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
140 msgid "touching paths:"
141 msgstr "che riguarda i percorsi:"
142
184 -#: gitk:2303 gitk:4777
143 msgid "adding/removing string:"
144 msgstr "che aggiunge/rimuove la stringa:"
145
188 -#: gitk:2304 gitk:4779
146 msgid "changing lines matching:"
147 msgstr ""
148
192 -#: gitk:2313 gitk:2315 gitk:4766
149 msgid "Exact"
150 msgstr "Esatto"
151
196 -#: gitk:2315 gitk:4854 gitk:6723
152 msgid "IgnCase"
153 msgstr ""
154
200 -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
155 msgid "Regexp"
156 msgstr ""
157
204 -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
158 msgid "All fields"
159 msgstr "Tutti i campi"
160
208 -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
161 msgid "Headline"
162 msgstr "Titolo"
163
212 -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
164 msgid "Comments"
165 msgstr "Commenti"
166
216 -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
217 -#: gitk:8845
167 msgid "Author"
168 msgstr "Autore"
169
221 -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
170 msgid "Committer"
171 msgstr "Revisione creata da"
172
225 -#: gitk:2350
173 msgid "Search"
174 msgstr "Cerca"
175
229 -#: gitk:2358
176 msgid "Diff"
177 msgstr ""
178
233 -#: gitk:2360
179 msgid "Old version"
180 msgstr "Vecchia versione"
181
237 -#: gitk:2362
182 msgid "New version"
183 msgstr "Nuova versione"
184
241 -#: gitk:2364
185 msgid "Lines of context"
186 msgstr "Linee di contesto"
187
245 -#: gitk:2374
188 msgid "Ignore space change"
189 msgstr "Ignora modifiche agli spazi"
190
249 -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
191 msgid "Line diff"
192 msgstr ""
193
253 -#: gitk:2445
194 msgid "Patch"
195 msgstr "Modifiche"
196
257 -#: gitk:2447
197 msgid "Tree"
198 msgstr "Directory"
199
261 -#: gitk:2617 gitk:2637
200 msgid "Diff this -> selected"
201 msgstr "Diff questo -> selezionato"
202
265 -#: gitk:2618 gitk:2638
203 msgid "Diff selected -> this"
204 msgstr "Diff selezionato -> questo"
205
269 -#: gitk:2619 gitk:2639
206 msgid "Make patch"
207 msgstr "Crea patch"
208
273 -#: gitk:2620 gitk:9254
209 msgid "Create tag"
210 msgstr "Crea etichetta"
211
277 -#: gitk:2621 gitk:9371
212 msgid "Write commit to file"
213 msgstr "Scrivi revisione in un file"
214
281 -#: gitk:2622 gitk:9428
215 msgid "Create new branch"
216 msgstr "Crea un nuovo ramo"
217
285 -#: gitk:2623
218 msgid "Cherry-pick this commit"
219 msgstr "Porta questa revisione in cima al ramo attuale"
220
289 -#: gitk:2624
221 msgid "Reset HEAD branch to here"
222 msgstr "Aggiorna il ramo HEAD a questa revisione"
223
293 -#: gitk:2625
224 msgid "Mark this commit"
225 msgstr "Segna questa revisione"
226
297 -#: gitk:2626
227 msgid "Return to mark"
228 msgstr "Torna alla revisione segnata"
229
301 -#: gitk:2627
230 msgid "Find descendant of this and mark"
231 msgstr "Trova il discendente di questa revisione e di quella segnata"
232
305 -#: gitk:2628
233 msgid "Compare with marked commit"
234 msgstr "Confronta con la revisione segnata"
235
309 -#: gitk:2629 gitk:2640
236 #, fuzzy
237 msgid "Diff this -> marked commit"
238 msgstr "Diff questo -> selezionato"
239
314 -#: gitk:2630 gitk:2641
240 #, fuzzy
241 msgid "Diff marked commit -> this"
242 msgstr "Diff selezionato -> questo"
243
319 -#: gitk:2631
244 #, fuzzy
245 msgid "Revert this commit"
246 msgstr "Segna questa revisione"
247
324 -#: gitk:2647
248 msgid "Check out this branch"
249 msgstr "Attiva questo ramo"
250
328 -#: gitk:2648
251 msgid "Remove this branch"
252 msgstr "Elimina questo ramo"
253
332 -#: gitk:2649
254 msgid "Copy branch name"
255 msgstr ""
256
336 -#: gitk:2656
257 msgid "Highlight this too"
258 msgstr "Evidenzia anche questo"
259
340 -#: gitk:2657
260 msgid "Highlight this only"
261 msgstr "Evidenzia solo questo"
262
344 -#: gitk:2658
263 msgid "External diff"
264 msgstr "Visualizza differenze in un altro programma"
265
348 -#: gitk:2659
266 msgid "Blame parent commit"
267 msgstr "Annota la revisione precedente"
268
352 -#: gitk:2660
269 msgid "Copy path"
270 msgstr ""
271
356 -#: gitk:2667
272 msgid "Show origin of this line"
273 msgstr "Mostra la provenienza di questa riga"
274
360 -#: gitk:2668
275 msgid "Run git gui blame on this line"
276 msgstr "Esegui git gui blame su questa riga"
277
364 -#: gitk:3014
278 #, fuzzy
279 msgid ""
280 "\n"
@@ -379,321 +292,249 @@ msgstr ""
292 "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public "
293 "License"
294
382 -#: gitk:3022 gitk:3089 gitk:9857
295 msgid "Close"
296 msgstr "Chiudi"
297
386 -#: gitk:3043
298 msgid "Gitk key bindings"
299 msgstr "Scorciatoie da tastiera di Gitk"
300
390 -#: gitk:3046
301 msgid "Gitk key bindings:"
302 msgstr "Scorciatoie da tastiera di Gitk:"
303
394 -#: gitk:3048
304 #, tcl-format
305 msgid "<%s-Q>\t\tQuit"
306 msgstr "<%s-Q>\t\tEsci"
307
399 -#: gitk:3049
308 #, fuzzy, tcl-format
309 msgid "<%s-W>\t\tClose window"
310 msgstr "<%s-F>\t\tTrova"
311
404 -#: gitk:3050
312 msgid "<Home>\t\tMove to first commit"
313 msgstr "<Home>\t\tVai alla prima revisione"
314
408 -#: gitk:3051
315 msgid "<End>\t\tMove to last commit"
316 msgstr "<End>\t\tVai all'ultima revisione"
317
412 -#: gitk:3052
318 #, fuzzy
319 msgid "<Up>, p, k\tMove up one commit"
320 msgstr "<Su>, p, i\tVai più in alto di una revisione"
321
417 -#: gitk:3053
322 #, fuzzy
323 msgid "<Down>, n, j\tMove down one commit"
324 msgstr "<Giù>, n, k\tVai più in basso di una revisione"
325
422 -#: gitk:3054
326 #, fuzzy
327 msgid "<Left>, z, h\tGo back in history list"
328 msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia"
329
427 -#: gitk:3055
330 msgid "<Right>, x, l\tGo forward in history list"
331 msgstr "<Destra>, x, l\tVai avanti nella cronologia"
332
431 -#: gitk:3056
333 #, tcl-format
334 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
335 msgstr ""
336
436 -#: gitk:3057
337 msgid "<PageUp>\tMove up one page in commit list"
338 msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni"
339
440 -#: gitk:3058
340 msgid "<PageDown>\tMove down one page in commit list"
341 msgstr ""
342 "<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni"
343
445 -#: gitk:3059
344 #, tcl-format
345 msgid "<%s-Home>\tScroll to top of commit list"
346 msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni"
347
450 -#: gitk:3060
348 #, tcl-format
349 msgid "<%s-End>\tScroll to bottom of commit list"
350 msgstr "<%s-End>\tScorri alla fine della lista delle revisioni"
351
455 -#: gitk:3061
352 #, tcl-format
353 msgid "<%s-Up>\tScroll commit list up one line"
354 msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga"
355
460 -#: gitk:3062
356 #, tcl-format
357 msgid "<%s-Down>\tScroll commit list down one line"
358 msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga"
359
465 -#: gitk:3063
360 #, tcl-format
361 msgid "<%s-PageUp>\tScroll commit list up one page"
362 msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina"
363
470 -#: gitk:3064
364 #, tcl-format
365 msgid "<%s-PageDown>\tScroll commit list down one page"
366 msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina"
367
475 -#: gitk:3065
368 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
369 msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)"
370
479 -#: gitk:3066
371 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
372 msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)"
373
483 -#: gitk:3067
374 msgid "<Delete>, b\tScroll diff view up one page"
375 msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina"
376
487 -#: gitk:3068
377 msgid "<Backspace>\tScroll diff view up one page"
378 msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina"
379
491 -#: gitk:3069
380 msgid "<Space>\t\tScroll diff view down one page"
381 msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina"
382
495 -#: gitk:3070
383 msgid "u\t\tScroll diff view up 18 lines"
384 msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee"
385
499 -#: gitk:3071
386 msgid "d\t\tScroll diff view down 18 lines"
387 msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee"
388
503 -#: gitk:3072
389 #, tcl-format
390 msgid "<%s-F>\t\tFind"
391 msgstr "<%s-F>\t\tTrova"
392
508 -#: gitk:3073
393 #, tcl-format
394 msgid "<%s-G>\t\tMove to next find hit"
395 msgstr "<%s-G>\t\tTrova in avanti"
396
513 -#: gitk:3074
397 msgid "<Return>\tMove to next find hit"
398 msgstr "<Invio>\tTrova in avanti"
399
517 -#: gitk:3075
400 #, fuzzy
401 msgid "g\t\tGo to commit"
402 msgstr "<End>\t\tVai all'ultima revisione"
403
522 -#: gitk:3076
404 msgid "/\t\tFocus the search box"
405 msgstr "/\t\tCursore nel box di ricerca"
406
526 -#: gitk:3077
407 msgid "?\t\tMove to previous find hit"
408 msgstr "?\t\tTrova all'indietro"
409
530 -#: gitk:3078
410 msgid "f\t\tScroll diff view to next file"
411 msgstr "f\t\tScorri la vista delle differenze al file successivo"
412
534 -#: gitk:3079
413 #, tcl-format
414 msgid "<%s-S>\t\tSearch for next hit in diff view"
415 msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze"
416
539 -#: gitk:3080
417 #, tcl-format
418 msgid "<%s-R>\t\tSearch for previous hit in diff view"
419 msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze"
420
544 -#: gitk:3081
421 #, tcl-format
422 msgid "<%s-KP+>\tIncrease font size"
423 msgstr "<%s-KP+>\tAumenta dimensione carattere"
424
549 -#: gitk:3082
425 #, tcl-format
426 msgid "<%s-plus>\tIncrease font size"
427 msgstr "<%s-più>\tAumenta dimensione carattere"
428
554 -#: gitk:3083
429 #, tcl-format
430 msgid "<%s-KP->\tDecrease font size"
431 msgstr "<%s-KP->\tDiminuisci dimensione carattere"
432
559 -#: gitk:3084
433 #, tcl-format
434 msgid "<%s-minus>\tDecrease font size"
435 msgstr "<%s-meno>\tDiminuisci dimensione carattere"
436
564 -#: gitk:3085
437 msgid "<F5>\t\tUpdate"
438 msgstr "<F5>\t\tAggiorna"
439
568 -#: gitk:3550 gitk:3559
440 #, tcl-format
441 msgid "Error creating temporary directory %s:"
442 msgstr "Errore durante la creazione della directory temporanea %s:"
443
573 -#: gitk:3572
444 #, tcl-format
445 msgid "Error getting \"%s\" from %s:"
446 msgstr "Errore nella lettura di \"%s\" da %s:"
447
578 -#: gitk:3635
448 msgid "command failed:"
449 msgstr "impossibile eseguire il comando:"
450
582 -#: gitk:3784
451 msgid "No such commit"
452 msgstr "Revisione inesistente"
453
586 -#: gitk:3798
454 msgid "git gui blame: command failed:"
455 msgstr "git gui blame: impossibile eseguire il comando:"
456
590 -#: gitk:3829
457 #, tcl-format
458 msgid "Couldn't read merge head: %s"
459 msgstr "Impossibile leggere merge head: %s"
460
595 -#: gitk:3837
461 #, tcl-format
462 msgid "Error reading index: %s"
463 msgstr "Errore nella lettura dell'indice: %s"
464
600 -#: gitk:3862
465 #, tcl-format
466 msgid "Couldn't start git blame: %s"
467 msgstr "Impossibile eseguire git blame: %s"
468
605 -#: gitk:3865 gitk:6754
469 msgid "Searching"
470 msgstr "Ricerca in corso"
471
609 -#: gitk:3897
472 #, tcl-format
473 msgid "Error running git blame: %s"
474 msgstr "Errore nell'esecuzione di git blame: %s"
475
614 -#: gitk:3925
476 #, tcl-format
477 msgid "That line comes from commit %s, which is not in this view"
478 msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista"
479
619 -#: gitk:3939
480 msgid "External diff viewer failed:"
481 msgstr "Impossibile eseguire il visualizzatore di differenze:"
482
623 -#: gitk:4070
483 msgid "Gitk view definition"
484 msgstr "Scelta vista Gitk"
485
627 -#: gitk:4074
486 msgid "Remember this view"
487 msgstr "Ricorda questa vista"
488
631 -#: gitk:4075
489 msgid "References (space separated list):"
490 msgstr "Riferimenti (lista di elementi separati da spazi)"
491
635 -#: gitk:4076
492 msgid "Branches & tags:"
493 msgstr "Rami ed etichette"
494
639 -#: gitk:4077
495 msgid "All refs"
496 msgstr "Tutti i riferimenti"
497
643 -#: gitk:4078
498 msgid "All (local) branches"
499 msgstr "Tutti i rami (locali)"
500
647 -#: gitk:4079
501 msgid "All tags"
502 msgstr "Tutte le etichette"
503
651 -#: gitk:4080
504 msgid "All remote-tracking branches"
505 msgstr "Tutti i rami remoti"
506
655 -#: gitk:4081
507 msgid "Commit Info (regular expressions):"
508 msgstr "Informazioni sulla revisione (espressioni regolari):"
509
659 -#: gitk:4082
510 msgid "Author:"
511 msgstr "Autore:"
512
663 -#: gitk:4083
513 msgid "Committer:"
514 msgstr "Revisione creata da:"
515
667 -#: gitk:4084
516 msgid "Commit Message:"
517 msgstr "Messaggio di revisione:"
518
671 -#: gitk:4085
519 msgid "Matches all Commit Info criteria"
520 msgstr "Risponde a tutti i criteri di ricerca sulle revisioni"
521
675 -#: gitk:4086
522 #, fuzzy
523 msgid "Matches no Commit Info criteria"
524 msgstr "Risponde a tutti i criteri di ricerca sulle revisioni"
525
680 -#: gitk:4087
526 msgid "Changes to Files:"
527 msgstr "Modifiche ai file:"
528
684 -#: gitk:4088
529 msgid "Fixed String"
530 msgstr "Stringa fissa"
531
688 -#: gitk:4089
532 msgid "Regular Expression"
533 msgstr "Espressione regolare"
534
692 -#: gitk:4090
535 msgid "Search string:"
536 msgstr "Cerca stringa:"
537
696 -#: gitk:4091
538 msgid ""
539 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
540 "15:27:38\"):"
@@ -701,201 +542,153 @@ msgstr ""
542 "Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
543 "2009 15:27:38\"):"
544
704 -#: gitk:4092
545 msgid "Since:"
546 msgstr "Da:"
547
708 -#: gitk:4093
548 msgid "Until:"
549 msgstr "A:"
550
712 -#: gitk:4094
551 msgid "Limit and/or skip a number of revisions (positive integer):"
552 msgstr "Limita e/o salta N revisioni (intero positivo):"
553
716 -#: gitk:4095
554 msgid "Number to show:"
555 msgstr "Numero di revisioni da mostrare:"
556
720 -#: gitk:4096
557 msgid "Number to skip:"
558 msgstr "Numero di revisioni da saltare:"
559
724 -#: gitk:4097
560 msgid "Miscellaneous options:"
561 msgstr "Altre opzioni:"
562
728 -#: gitk:4098
563 msgid "Strictly sort by date"
564 msgstr "Ordina solo per data"
565
732 -#: gitk:4099
566 msgid "Mark branch sides"
567 msgstr "Segna i lati del ramo"
568
736 -#: gitk:4100
569 msgid "Limit to first parent"
570 msgstr "Limita al primo genitore"
571
740 -#: gitk:4101
572 msgid "Simple history"
573 msgstr "Cronologia semplificata"
574
744 -#: gitk:4102
575 msgid "Additional arguments to git log:"
576 msgstr "Ulteriori argomenti da passare a git log:"
577
748 -#: gitk:4103
578 msgid "Enter files and directories to include, one per line:"
579 msgstr "Inserire file e directory da includere, uno per riga:"
580
752 -#: gitk:4104
581 msgid "Command to generate more commits to include:"
582 msgstr "Comando che genera altre revisioni da visualizzare:"
583
756 -#: gitk:4228
584 msgid "Gitk: edit view"
585 msgstr "Gitk: modifica vista"
586
760 -#: gitk:4236
587 msgid "-- criteria for selecting revisions"
588 msgstr "-- criteri per la scelta delle revisioni"
589
764 -#: gitk:4241
590 msgid "View Name"
591 msgstr "Nome vista"
592
768 -#: gitk:4316
593 msgid "Apply (F5)"
594 msgstr "Applica (F5)"
595
772 -#: gitk:4354
596 msgid "Error in commit selection arguments:"
597 msgstr "Errore negli argomenti di selezione delle revisioni:"
598
776 -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
599 msgid "None"
600 msgstr "Nessuno"
601
780 -#: gitk:5021 gitk:5026
602 msgid "Descendant"
603 msgstr "Discendente"
604
784 -#: gitk:5022
605 msgid "Not descendant"
606 msgstr "Non discendente"
607
788 -#: gitk:5029 gitk:5034
608 msgid "Ancestor"
609 msgstr "Ascendente"
610
792 -#: gitk:5030
611 msgid "Not ancestor"
612 msgstr "Non ascendente"
613
796 -#: gitk:5324
614 msgid "Local changes checked in to index but not committed"
615 msgstr "Modifiche locali presenti nell'indice ma non nell'archivio"
616
800 -#: gitk:5360
617 msgid "Local uncommitted changes, not checked in to index"
618 msgstr "Modifiche locali non presenti né nell'archivio né nell'indice"
619
804 -#: gitk:7134
620 msgid "and many more"
621 msgstr ""
622
808 -#: gitk:7137
623 msgid "many"
624 msgstr "molti"
625
812 -#: gitk:7328
626 msgid "Tags:"
627 msgstr "Etichette:"
628
816 -#: gitk:7345 gitk:7351 gitk:8825
629 msgid "Parent"
630 msgstr "Genitore"
631
820 -#: gitk:7356
632 msgid "Child"
633 msgstr "Figlio"
634
824 -#: gitk:7365
635 msgid "Branch"
636 msgstr "Ramo"
637
828 -#: gitk:7368
638 msgid "Follows"
639 msgstr "Segue"
640
832 -#: gitk:7371
641 msgid "Precedes"
642 msgstr "Precede"
643
836 -#: gitk:7966
644 #, tcl-format
645 msgid "Error getting diffs: %s"
646 msgstr "Errore nella lettura delle differenze:"
647
841 -#: gitk:8650
648 msgid "Goto:"
649 msgstr "Vai a:"
650
845 -#: gitk:8671
651 #, tcl-format
652 msgid "Short SHA1 id %s is ambiguous"
653 msgstr "La SHA1 id abbreviata %s è ambigua"
654
850 -#: gitk:8678
655 #, tcl-format
656 msgid "Revision %s is not known"
657 msgstr "La revisione %s è sconosciuta"
658
855 -#: gitk:8688
659 #, tcl-format
660 msgid "SHA1 id %s is not known"
661 msgstr "La SHA1 id %s è sconosciuta"
662
860 -#: gitk:8690
663 #, tcl-format
664 msgid "Revision %s is not in the current view"
665 msgstr "La revisione %s non è presente nella vista attuale"
666
865 -#: gitk:8832 gitk:8847
667 msgid "Date"
668 msgstr "Data"
669
869 -#: gitk:8835
670 msgid "Children"
671 msgstr "Figli"
672
873 -#: gitk:8898
673 #, tcl-format
674 msgid "Reset %s branch to here"
675 msgstr "Aggiorna il ramo %s a questa revisione"
676
878 -#: gitk:8900
677 msgid "Detached head: can't reset"
678 msgstr "Nessun ramo attivo: reset impossibile"
679
882 -#: gitk:9005 gitk:9011
680 msgid "Skipping merge commit "
681 msgstr "Salto la revisione di fusione "
682
886 -#: gitk:9020 gitk:9025
683 msgid "Error getting patch ID for "
684 msgstr "Errore nella identificazione della patch per "
685
890 -#: gitk:9021 gitk:9026
686 msgid " - stopping\n"
687 msgstr " - fine\n"
688
894 -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
689 msgid "Commit "
690 msgstr "La revisione "
691
898 -#: gitk:9035
692 msgid ""
693 " is the same patch as\n"
694 " "
@@ -903,7 +696,6 @@ msgstr ""
696 " ha le stesse differenze di\n"
697 " "
698
906 -#: gitk:9043
699 msgid ""
700 " differs from\n"
701 " "
@@ -911,7 +703,6 @@ msgstr ""
703 " è diversa da\n"
704 " "
705
914 -#: gitk:9045
706 msgid ""
707 "Diff of commits:\n"
708 "\n"
@@ -919,129 +710,99 @@ msgstr ""
710 "Differenze tra le revisioni:\n"
711 "\n"
712
922 -#: gitk:9057 gitk:9066
713 #, tcl-format
714 msgid " has %s children - stopping\n"
715 msgstr " ha %s figli - fine\n"
716
927 -#: gitk:9085
717 #, tcl-format
718 msgid "Error writing commit to file: %s"
719 msgstr "Errore nella scrittura della revisione nel file: %s"
720
932 -#: gitk:9091
721 #, tcl-format
722 msgid "Error diffing commits: %s"
723 msgstr "Errore nelle differenze tra le revisioni: %s"
724
937 -#: gitk:9137
725 msgid "Top"
726 msgstr "Inizio"
727
941 -#: gitk:9138
728 msgid "From"
729 msgstr "Da"
730
945 -#: gitk:9143
731 msgid "To"
732 msgstr "A"
733
949 -#: gitk:9167
734 msgid "Generate patch"
735 msgstr "Genera patch"
736
953 -#: gitk:9169
737 msgid "From:"
738 msgstr "Da:"
739
957 -#: gitk:9178
740 msgid "To:"
741 msgstr "A:"
742
961 -#: gitk:9187
743 msgid "Reverse"
744 msgstr "Inverti"
745
965 -#: gitk:9189 gitk:9385
746 msgid "Output file:"
747 msgstr "Scrivi sul file:"
748
969 -#: gitk:9195
749 msgid "Generate"
750 msgstr "Genera"
751
973 -#: gitk:9233
752 msgid "Error creating patch:"
753 msgstr "Errore nella creazione della patch:"
754
977 -#: gitk:9256 gitk:9373 gitk:9430
755 msgid "ID:"
756 msgstr "ID:"
757
981 -#: gitk:9265
758 msgid "Tag name:"
759 msgstr "Nome etichetta:"
760
985 -#: gitk:9268
761 msgid "Tag message is optional"
762 msgstr "Il messaggio dell'etichetta è opzionale"
763
989 -#: gitk:9270
764 msgid "Tag message:"
765 msgstr "Messaggio dell'etichetta:"
766
993 -#: gitk:9274 gitk:9439
767 msgid "Create"
768 msgstr "Crea"
769
997 -#: gitk:9292
770 msgid "No tag name specified"
771 msgstr "Nessuna etichetta specificata"
772
1001 -#: gitk:9296
773 #, tcl-format
774 msgid "Tag \"%s\" already exists"
775 msgstr "L'etichetta \"%s\" esiste già"
776
1006 -#: gitk:9306
777 msgid "Error creating tag:"
778 msgstr "Errore nella creazione dell'etichetta:"
779
1010 -#: gitk:9382
780 msgid "Command:"
781 msgstr "Comando:"
782
1014 -#: gitk:9390
783 msgid "Write"
784 msgstr "Scrivi"
785
1018 -#: gitk:9408
786 msgid "Error writing commit:"
787 msgstr "Errore nella scrittura della revisione:"
788
1022 -#: gitk:9435
789 msgid "Name:"
790 msgstr "Nome:"
791
1026 -#: gitk:9458
792 msgid "Please specify a name for the new branch"
793 msgstr "Specificare un nome per il nuovo ramo"
794
1030 -#: gitk:9463
795 #, tcl-format
796 msgid "Branch '%s' already exists. Overwrite?"
797 msgstr "Il ramo '%s' esiste già. Sovrascrivere?"
798
1035 -#: gitk:9530
799 #, tcl-format
800 msgid "Commit %s is already included in branch %s -- really re-apply it?"
801 msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
802
1040 -#: gitk:9535
803 msgid "Cherry-picking"
804 msgstr ""
805
1044 -#: gitk:9544
806 #, tcl-format
807 msgid ""
808 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1052,7 +813,6 @@ msgstr ""
813 "Prima di riprovare, bisogna creare una nuova revisione, annullare le "
814 "modifiche o usare 'git stash'."
815
1055 -#: gitk:9550
816 msgid ""
817 "Cherry-pick failed because of merge conflict.\n"
818 "Do you wish to run git citool to resolve it?"
@@ -1060,21 +820,17 @@ msgstr ""
820 "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n"
821 "Vuoi avviare git citool per risolverlo?"
822
1063 -#: gitk:9566 gitk:9624
823 msgid "No changes committed"
824 msgstr "Nessuna modifica archiviata"
825
1067 -#: gitk:9593
826 #, fuzzy, tcl-format
827 msgid "Commit %s is not included in branch %s -- really revert it?"
828 msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
829
1072 -#: gitk:9598
830 #, fuzzy
831 msgid "Reverting"
832 msgstr "git reset in corso"
833
1077 -#: gitk:9606
834 #, fuzzy, tcl-format
835 msgid ""
836 "Revert failed because of local changes to the following files:%s Please "
@@ -1085,7 +841,6 @@ msgstr ""
841 "Prima di riprovare, bisogna creare una nuova revisione, annullare le "
842 "modifiche o usare 'git stash'."
843
1088 -#: gitk:9610
844 #, fuzzy
845 msgid ""
846 "Revert failed because of merge conflict.\n"
@@ -1094,28 +849,22 @@ msgstr ""
849 "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n"
850 "Vuoi avviare git citool per risolverlo?"
851
1097 -#: gitk:9653
852 msgid "Confirm reset"
853 msgstr "Conferma git reset"
854
1101 -#: gitk:9655
855 #, tcl-format
856 msgid "Reset branch %s to %s?"
857 msgstr "Aggiornare il ramo %s a %s?"
858
1106 -#: gitk:9657
859 msgid "Reset type:"
860 msgstr "Tipo di aggiornamento:"
861
1110 -#: gitk:9660
862 msgid "Soft: Leave working tree and index untouched"
863 msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono"
864
1114 -#: gitk:9663
865 msgid "Mixed: Leave working tree untouched, reset index"
866 msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice"
867
1118 -#: gitk:9666
868 msgid ""
869 "Hard: Reset working tree and index\n"
870 "(discard ALL local changes)"
@@ -1123,19 +872,15 @@ msgstr ""
872 "Hard: Aggiorna la directory di lavoro e l'indice\n"
873 "(abbandona TUTTE le modifiche locali)"
874
1126 -#: gitk:9683
875 msgid "Resetting"
876 msgstr "git reset in corso"
877
1130 -#: gitk:9743
878 msgid "Checking out"
879 msgstr "Attivazione in corso"
880
1134 -#: gitk:9796
881 msgid "Cannot delete the currently checked-out branch"
882 msgstr "Impossibile cancellare il ramo attualmente attivo"
883
1138 -#: gitk:9802
884 #, tcl-format
885 msgid ""
886 "The commits on branch %s aren't on any other branch.\n"
@@ -1144,16 +889,13 @@ msgstr ""
889 "Le revisioni nel ramo %s non sono presenti su altri rami.\n"
890 "Cancellare il ramo %s?"
891
1147 -#: gitk:9833
892 #, tcl-format
893 msgid "Tags and heads: %s"
894 msgstr "Etichette e rami: %s"
895
1152 -#: gitk:9850
896 msgid "Filter"
897 msgstr "Filtro"
898
1156 -#: gitk:10146
899 msgid ""
900 "Error reading commit topology information; branch and preceding/following "
901 "tag information will be incomplete."
@@ -1161,219 +903,167 @@ msgstr ""
903 "Errore nella lettura della topologia delle revisioni: le informazioni sul "
904 "ramo e le etichette precedenti e seguenti saranno incomplete."
905
1164 -#: gitk:11123
906 msgid "Tag"
907 msgstr "Etichetta"
908
1168 -#: gitk:11127
909 msgid "Id"
910 msgstr "Id"
911
1172 -#: gitk:11210
912 msgid "Gitk font chooser"
913 msgstr "Scelta caratteri gitk"
914
1176 -#: gitk:11227
915 msgid "B"
916 msgstr "B"
917
1180 -#: gitk:11230
918 msgid "I"
919 msgstr "I"
920
1184 -#: gitk:11348
921 msgid "Commit list display options"
922 msgstr "Opzioni visualizzazione dell'elenco revisioni"
923
1188 -#: gitk:11351
924 msgid "Maximum graph width (lines)"
925 msgstr "Larghezza massima del grafico (in linee)"
926
1192 -#: gitk:11355
927 #, no-tcl-format
928 msgid "Maximum graph width (% of pane)"
929 msgstr "Larghezza massima del grafico (% del pannello)"
930
1197 -#: gitk:11358
931 msgid "Show local changes"
932 msgstr "Mostra modifiche locali"
933
1201 -#: gitk:11361
934 #, fuzzy
935 msgid "Auto-select SHA1 (length)"
936 msgstr "Seleziona automaticamente SHA1 hash"
937
1206 -#: gitk:11365
938 msgid "Hide remote refs"
939 msgstr "Nascondi i riferimenti remoti"
940
1210 -#: gitk:11369
941 msgid "Diff display options"
942 msgstr "Opzioni di visualizzazione delle differenze"
943
1214 -#: gitk:11371
944 msgid "Tab spacing"
945 msgstr "Spaziatura tabulazioni"
946
1218 -#: gitk:11374
947 #, fuzzy
948 msgid "Display nearby tags/heads"
949 msgstr "Mostra etichette vicine"
950
1223 -#: gitk:11377
951 msgid "Maximum # tags/heads to show"
952 msgstr ""
953
1227 -#: gitk:11380
954 msgid "Limit diffs to listed paths"
955 msgstr "Limita le differenze ai percorsi elencati"
956
1231 -#: gitk:11383
957 msgid "Support per-file encodings"
958 msgstr "Attiva codifica file per file"
959
1235 -#: gitk:11389 gitk:11536
960 msgid "External diff tool"
961 msgstr "Visualizzatore di differenze"
962
1239 -#: gitk:11390
963 msgid "Choose..."
964 msgstr "Scegli..."
965
1243 -#: gitk:11395
966 msgid "General options"
967 msgstr "Opzioni generali"
968
1247 -#: gitk:11398
969 msgid "Use themed widgets"
970 msgstr "Utilizza interfaccia a tema"
971
1251 -#: gitk:11400
972 msgid "(change requires restart)"
973 msgstr "(una modifica richiede il riavvio)"
974
1255 -#: gitk:11402
975 msgid "(currently unavailable)"
976 msgstr "(momentaneamente non disponibile)"
977
1259 -#: gitk:11413
978 msgid "Colors: press to choose"
979 msgstr "Colori: premere per scegliere"
980
1263 -#: gitk:11416
981 msgid "Interface"
982 msgstr "Interfaccia"
983
1267 -#: gitk:11417
984 msgid "interface"
985 msgstr "interfaccia"
986
1271 -#: gitk:11420
987 msgid "Background"
988 msgstr "Sfondo"
989
1275 -#: gitk:11421 gitk:11451
990 msgid "background"
991 msgstr "sfondo"
992
1279 -#: gitk:11424
993 msgid "Foreground"
994 msgstr "Primo piano"
995
1283 -#: gitk:11425
996 msgid "foreground"
997 msgstr "primo piano"
998
1287 -#: gitk:11428
999 msgid "Diff: old lines"
1000 msgstr "Diff: vecchie linee"
1001
1291 -#: gitk:11429
1002 msgid "diff old lines"
1003 msgstr "vecchie linee"
1004
1295 -#: gitk:11433
1005 msgid "Diff: new lines"
1006 msgstr "Diff: nuove linee"
1007
1299 -#: gitk:11434
1008 msgid "diff new lines"
1009 msgstr "nuove linee"
1010
1303 -#: gitk:11438
1011 msgid "Diff: hunk header"
1012 msgstr "Diff: intestazione della sezione"
1013
1307 -#: gitk:11440
1014 msgid "diff hunk header"
1015 msgstr "intestazione della sezione"
1016
1311 -#: gitk:11444
1017 msgid "Marked line bg"
1018 msgstr "Sfondo riga selezionata"
1019
1315 -#: gitk:11446
1020 msgid "marked line background"
1021 msgstr "sfondo riga selezionata"
1022
1319 -#: gitk:11450
1023 msgid "Select bg"
1024 msgstr "Sfondo"
1025
1323 -#: gitk:11459
1026 msgid "Fonts: press to choose"
1027 msgstr "Carattere: premere per scegliere"
1028
1327 -#: gitk:11461
1029 msgid "Main font"
1030 msgstr "Carattere principale"
1031
1331 -#: gitk:11462
1032 msgid "Diff display font"
1033 msgstr "Carattere per differenze"
1034
1335 -#: gitk:11463
1035 msgid "User interface font"
1036 msgstr "Carattere per interfaccia utente"
1037
1339 -#: gitk:11485
1038 msgid "Gitk preferences"
1039 msgstr "Preferenze gitk"
1040
1343 -#: gitk:11494
1041 #, fuzzy
1042 msgid "General"
1043 msgstr "Genera"
1044
1348 -#: gitk:11495
1045 msgid "Colors"
1046 msgstr ""
1047
1352 -#: gitk:11496
1048 msgid "Fonts"
1049 msgstr ""
1050
1356 -#: gitk:11546
1051 #, tcl-format
1052 msgid "Gitk: choose color for %s"
1053 msgstr "Gitk: scegliere un colore per %s"
1054
1361 -#: gitk:12059
1055 msgid ""
1056 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1057 " Gitk requires at least Tcl/Tk 8.4."
1058 msgstr ""
1059
1367 -#: gitk:12269
1060 msgid "Cannot find a git repository here."
1061 msgstr "Archivio git non trovato."
1062
1371 -#: gitk:12316
1063 #, tcl-format
1064 msgid "Ambiguous argument '%s': both revision and filename"
1065 msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file"
1066
1376 -#: gitk:12328
1067 msgid "Bad arguments to gitk:"
1068 msgstr "Gitk: argomenti errati:"
1069
po/ja.po
+8 -317
@@ -20,33 +20,26 @@ msgstr ""
20 "Content-Transfer-Encoding: 8bit\n"
21 "Plural-Forms: nplurals=1; plural=0;\n"
22
23 -#: gitk:140
23 msgid "Couldn't get list of unmerged files:"
24 msgstr "マージされていないファイルのリストを取得できません:"
25
27 -#: gitk:212 gitk:2381
26 msgid "Color words"
27 msgstr "変更を着色"
28
31 -#: gitk:217 gitk:2381 gitk:8221 gitk:8254
29 msgid "Markup words"
30 msgstr "変更をマークアップ"
31
35 -#: gitk:324
32 msgid "Error parsing revisions:"
33 msgstr "リビジョン解析エラー:"
34
39 -#: gitk:380
35 msgid "Error executing --argscmd command:"
36 msgstr "--argscmd コマンド実行エラー:"
37
43 -#: gitk:393
38 msgid "No files selected: --merge specified but no files are unmerged."
39 msgstr ""
40 "ファイル未選択: --merge が指定されましたが、マージされていないファイルはあり"
41 "ません。"
42
49 -#: gitk:396
43 msgid ""
44 "No files selected: --merge specified but no unmerged files are within file "
45 "limit."
@@ -54,322 +47,240 @@ msgstr ""
47 "ファイル未選択: --merge が指定されましたが、ファイル制限内にマージされていな"
48 "いファイルはありません。"
49
57 -#: gitk:418 gitk:566
50 msgid "Error executing git log:"
51 msgstr "git log 実行エラー:"
52
61 -#: gitk:436 gitk:582
53 msgid "Reading"
54 msgstr "読み込み中"
55
65 -#: gitk:496 gitk:4526
56 msgid "Reading commits..."
57 msgstr "コミット読み込み中..."
58
69 -#: gitk:499 gitk:1637 gitk:4529
59 msgid "No commits selected"
60 msgstr "コミットが選択されていません"
61
73 -#: gitk:1445 gitk:4046 gitk:12447
62 msgid "Command line"
63 msgstr "コマンド行"
64
77 -#: gitk:1511
65 msgid "Can't parse git log output:"
66 msgstr "git log の出力を解析できません:"
67
81 -#: gitk:1740
68 msgid "No commit information available"
69 msgstr "有効なコミットの情報がありません"
70
85 -#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536
71 msgid "OK"
72 msgstr "OK"
73
89 -#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686
90 -#: gitk:11257 gitk:11537
74 msgid "Cancel"
75 msgstr "キャンセル"
76
94 -#: gitk:2069
77 msgid "&Update"
78 msgstr "更新(&U)"
79
98 -#: gitk:2070
80 msgid "&Reload"
81 msgstr "リロード(&R)"
82
102 -#: gitk:2071
83 msgid "Reread re&ferences"
84 msgstr "リファレンスを再読み込み(&F)"
85
106 -#: gitk:2072
86 msgid "&List references"
87 msgstr "リファレンスリストを表示(&L)"
88
110 -#: gitk:2074
89 msgid "Start git &gui"
90 msgstr "git gui の開始(&G)"
91
114 -#: gitk:2076
92 msgid "&Quit"
93 msgstr "終了(&Q)"
94
118 -#: gitk:2068
95 msgid "&File"
96 msgstr "ファイル(&F)"
97
122 -#: gitk:2080
98 msgid "&Preferences"
99 msgstr "設定(&P)"
100
126 -#: gitk:2079
101 msgid "&Edit"
102 msgstr "編集(&E)"
103
130 -#: gitk:2084
104 msgid "&New view..."
105 msgstr "新規ビュー(&N)..."
106
134 -#: gitk:2085
107 msgid "&Edit view..."
108 msgstr "ビュー編集(&E)..."
109
138 -#: gitk:2086
110 msgid "&Delete view"
111 msgstr "ビュー削除(&D)"
112
142 -#: gitk:2088
113 msgid "&All files"
114 msgstr "全てのファイル(&A)"
115
146 -#: gitk:2083
116 msgid "&View"
117 msgstr "ビュー(&V)"
118
150 -#: gitk:2093 gitk:2103
119 msgid "&About gitk"
120 msgstr "gitk について(&A)"
121
154 -#: gitk:2094 gitk:2108
122 msgid "&Key bindings"
123 msgstr "キーバインディング(&K)"
124
158 -#: gitk:2092 gitk:2107
125 msgid "&Help"
126 msgstr "ヘルプ(&H)"
127
162 -#: gitk:2185 gitk:8653
128 msgid "SHA1 ID:"
129 msgstr "SHA1 ID:"
130
166 -#: gitk:2229
131 msgid "Row"
132 msgstr "行"
133
170 -#: gitk:2267
134 msgid "Find"
135 msgstr "検索"
136
174 -#: gitk:2295
137 msgid "commit"
138 msgstr "コミット"
139
178 -#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828
179 -#: gitk:6913
140 msgid "containing:"
141 msgstr "含む:"
142
183 -#: gitk:2302 gitk:3527 gitk:3532 gitk:4764
143 msgid "touching paths:"
144 msgstr "パスの一部:"
145
187 -#: gitk:2303 gitk:4778
146 msgid "adding/removing string:"
147 msgstr "追加/除去される文字列:"
148
191 -#: gitk:2304 gitk:4780
149 msgid "changing lines matching:"
150 msgstr "変更される文字列"
151
195 -#: gitk:2313 gitk:2315 gitk:4767
152 msgid "Exact"
153 msgstr "英字の大小を区別する"
154
199 -#: gitk:2315 gitk:4855 gitk:6724
155 msgid "IgnCase"
156 msgstr "英字の大小を区別しない"
157
203 -#: gitk:2315 gitk:4737 gitk:4853 gitk:6720
158 msgid "Regexp"
159 msgstr "正規表現"
160
207 -#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917
161 msgid "All fields"
162 msgstr "全ての項目"
163
211 -#: gitk:2318 gitk:4872 gitk:4905 gitk:6787
164 msgid "Headline"
165 msgstr "ヘッドライン"
166
215 -#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390
167 msgid "Comments"
168 msgstr "コメント"
169
219 -#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831
220 -#: gitk:8846
170 msgid "Author"
171 msgstr "作者"
172
224 -#: gitk:2319 gitk:4872 gitk:6787 gitk:7327
173 msgid "Committer"
174 msgstr "コミット者"
175
228 -#: gitk:2350
176 msgid "Search"
177 msgstr "検索"
178
232 -#: gitk:2358
179 msgid "Diff"
180 msgstr "Diff"
181
236 -#: gitk:2360
182 msgid "Old version"
183 msgstr "旧バージョン"
184
240 -#: gitk:2362
185 msgid "New version"
186 msgstr "新バージョン"
187
244 -#: gitk:2364
188 msgid "Lines of context"
189 msgstr "文脈行数"
190
248 -#: gitk:2374
191 msgid "Ignore space change"
192 msgstr "空白の違いを無視"
193
252 -#: gitk:2378 gitk:2380 gitk:7960 gitk:8207
194 msgid "Line diff"
195 msgstr "行毎のdiff"
196
256 -#: gitk:2445
197 msgid "Patch"
198 msgstr "パッチ"
199
260 -#: gitk:2447
200 msgid "Tree"
201 msgstr "ツリー"
202
264 -#: gitk:2617 gitk:2638
203 msgid "Diff this -> selected"
204 msgstr "これと選択したコミットのdiffを見る"
205
268 -#: gitk:2618 gitk:2639
206 msgid "Diff selected -> this"
207 msgstr "選択したコミットとこれのdiffを見る"
208
272 -#: gitk:2619 gitk:2640
209 msgid "Make patch"
210 msgstr "パッチ作成"
211
276 -#: gitk:2620 gitk:9255
212 msgid "Create tag"
213 msgstr "タグ生成"
214
280 -#: gitk:2621
215 msgid "Copy commit summary"
216 msgstr "コミットの要約をコピーする"
217
284 -#: gitk:2622 gitk:9386
218 msgid "Write commit to file"
219 msgstr "コミットをファイルに書き出す"
220
288 -#: gitk:2623 gitk:9443
221 msgid "Create new branch"
222 msgstr "新規ブランチ生成"
223
292 -#: gitk:2624
224 msgid "Cherry-pick this commit"
225 msgstr "このコミットをチェリーピックする"
226
296 -#: gitk:2625
227 msgid "Reset HEAD branch to here"
228 msgstr "ブランチのHEADをここにリセットする"
229
300 -#: gitk:2626
230 msgid "Mark this commit"
231 msgstr "このコミットにマークをつける"
232
304 -#: gitk:2627
233 msgid "Return to mark"
234 msgstr "マークを付けた所に戻る"
235
308 -#: gitk:2628
236 msgid "Find descendant of this and mark"
237 msgstr "これとマークをつけた所との子孫を見つける"
238
312 -#: gitk:2629
239 msgid "Compare with marked commit"
240 msgstr "マークを付けたコミットと比較する"
241
316 -#: gitk:2630 gitk:2641
242 msgid "Diff this -> marked commit"
243 msgstr "これとマークを付けたコミットのdiffを見る"
244
320 -#: gitk:2631 gitk:2642
245 msgid "Diff marked commit -> this"
246 msgstr "マークを付けたコミットとこれのdiffを見る"
247
324 -#: gitk:2632
248 msgid "Revert this commit"
249 msgstr "このコミットを撤回する"
250
328 -#: gitk:2648
251 msgid "Check out this branch"
252 msgstr "このブランチをチェックアウトする"
253
332 -#: gitk:2649
254 msgid "Remove this branch"
255 msgstr "このブランチを除去する"
256
336 -#: gitk:2650
257 msgid "Copy branch name"
258 msgstr "ブランチ名をコピーする"
259
340 -#: gitk:2657
260 msgid "Highlight this too"
261 msgstr "これもハイライトさせる"
262
344 -#: gitk:2658
263 msgid "Highlight this only"
264 msgstr "これだけをハイライトさせる"
265
348 -#: gitk:2659
266 msgid "External diff"
267 msgstr "外部diffツール"
268
352 -#: gitk:2660
269 msgid "Blame parent commit"
270 msgstr "親コミットから blame をかける"
271
356 -#: gitk:2661
272 msgid "Copy path"
273 msgstr "パス名をコピーする"
274
360 -#: gitk:2668
275 msgid "Show origin of this line"
276 msgstr "この行の出自を表示する"
277
364 -#: gitk:2669
278 msgid "Run git gui blame on this line"
279 msgstr "この行に git gui で blame をかける"
280
368 -#: gitk:3013
281 msgid "About gitk"
282 msgstr "gitk について"
283
372 -#: gitk:3015
284 msgid ""
285 "\n"
286 "Gitk - a commit viewer for git\n"
@@ -385,323 +296,251 @@ msgstr ""
296 "\n"
297 "使用および再配布は GNU General Public License に従ってください"
298
388 -#: gitk:3023 gitk:3090 gitk:9872
299 msgid "Close"
300 msgstr "閉じる"
301
392 -#: gitk:3044
302 msgid "Gitk key bindings"
303 msgstr "Gitk キーバインディング"
304
396 -#: gitk:3047
305 msgid "Gitk key bindings:"
306 msgstr "Gitk キーバインディング:"
307
400 -#: gitk:3049
308 #, tcl-format
309 msgid "<%s-Q>\t\tQuit"
310 msgstr "<%s-Q>\t\t終了"
311
405 -#: gitk:3050
312 #, tcl-format
313 msgid "<%s-W>\t\tClose window"
314 msgstr "<%s-W>\t\tウィンドウを閉じる"
315
410 -#: gitk:3051
316 msgid "<Home>\t\tMove to first commit"
317 msgstr "<Home>\t\t最初のコミットに移動"
318
414 -#: gitk:3052
319 msgid "<End>\t\tMove to last commit"
320 msgstr "<End>\t\t最後のコミットに移動"
321
418 -#: gitk:3053
322 msgid "<Up>, p, k\tMove up one commit"
323 msgstr "<Up>, p, k\t一つ上のコミットに移動"
324
422 -#: gitk:3054
325 msgid "<Down>, n, j\tMove down one commit"
326 msgstr "<Down>, n, j\t一つ下のコミットに移動"
327
426 -#: gitk:3055
328 msgid "<Left>, z, h\tGo back in history list"
329 msgstr "<Left>, z, h\t履歴の前に戻る"
330
430 -#: gitk:3056
331 msgid "<Right>, x, l\tGo forward in history list"
332 msgstr "<Right>, x, l\t履歴の次へ進む"
333
434 -#: gitk:3057
334 #, tcl-format
335 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
437 -msgstr "<%s-n(数字)>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ移動"
336 +msgstr ""
337 +"<%s-n(数字)>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ"
338 +"移動"
339
439 -#: gitk:3058
340 msgid "<PageUp>\tMove up one page in commit list"
341 msgstr "<PageUp>\tコミットリストの一つ上のページに移動"
342
443 -#: gitk:3059
343 msgid "<PageDown>\tMove down one page in commit list"
344 msgstr "<PageDown>\tコミットリストの一つ下のページに移動"
345
447 -#: gitk:3060
346 #, tcl-format
347 msgid "<%s-Home>\tScroll to top of commit list"
348 msgstr "<%s-Home>\tコミットリストの一番上にスクロールする"
349
452 -#: gitk:3061
350 #, tcl-format
351 msgid "<%s-End>\tScroll to bottom of commit list"
352 msgstr "<%s-End>\tコミットリストの一番下にスクロールする"
353
457 -#: gitk:3062
354 #, tcl-format
355 msgid "<%s-Up>\tScroll commit list up one line"
356 msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする"
357
462 -#: gitk:3063
358 #, tcl-format
359 msgid "<%s-Down>\tScroll commit list down one line"
360 msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする"
361
467 -#: gitk:3064
362 #, tcl-format
363 msgid "<%s-PageUp>\tScroll commit list up one page"
364 msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする"
365
472 -#: gitk:3065
366 #, tcl-format
367 msgid "<%s-PageDown>\tScroll commit list down one page"
368 msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする"
369
477 -#: gitk:3066
370 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
371 msgstr "<Shift-Up>\t後方を検索 (上方の・新しいコミット)"
372
481 -#: gitk:3067
373 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
374 msgstr "<Shift-Down>\t前方を検索(下方の・古いコミット)"
375
485 -#: gitk:3068
376 msgid "<Delete>, b\tScroll diff view up one page"
377 msgstr "<Delete>, b\tdiff画面を上のページにスクロールする"
378
489 -#: gitk:3069
379 msgid "<Backspace>\tScroll diff view up one page"
380 msgstr "<Backspace>\tdiff画面を上のページにスクロールする"
381
493 -#: gitk:3070
382 msgid "<Space>\t\tScroll diff view down one page"
383 msgstr "<Space>\t\tdiff画面を下のページにスクロールする"
384
497 -#: gitk:3071
385 msgid "u\t\tScroll diff view up 18 lines"
386 msgstr "u\t\tdiff画面を上に18行スクロールする"
387
501 -#: gitk:3072
388 msgid "d\t\tScroll diff view down 18 lines"
389 msgstr "d\t\tdiff画面を下に18行スクロールする"
390
505 -#: gitk:3073
391 #, tcl-format
392 msgid "<%s-F>\t\tFind"
393 msgstr "<%s-F>\t\t検索"
394
510 -#: gitk:3074
395 #, tcl-format
396 msgid "<%s-G>\t\tMove to next find hit"
397 msgstr "<%s-G>\t\t次を検索して移動"
398
515 -#: gitk:3075
399 msgid "<Return>\tMove to next find hit"
400 msgstr "<Return>\t次を検索して移動"
401
519 -#: gitk:3076
402 msgid "g\t\tGo to commit"
403 msgstr "g\t\t指定してコミットに移動"
404
523 -#: gitk:3077
405 msgid "/\t\tFocus the search box"
406 msgstr "/\t\t検索ボックスにフォーカス"
407
527 -#: gitk:3078
408 msgid "?\t\tMove to previous find hit"
409 msgstr "?\t\t前を検索して移動"
410
531 -#: gitk:3079
411 msgid "f\t\tScroll diff view to next file"
412 msgstr "f\t\t次のファイルにdiff画面をスクロールする"
413
535 -#: gitk:3080
414 #, tcl-format
415 msgid "<%s-S>\t\tSearch for next hit in diff view"
416 msgstr "<%s-S>\t\tdiff画面の次を検索"
417
540 -#: gitk:3081
418 #, tcl-format
419 msgid "<%s-R>\t\tSearch for previous hit in diff view"
420 msgstr "<%s-R>\t\tdiff画面の前を検索"
421
545 -#: gitk:3082
422 #, tcl-format
423 msgid "<%s-KP+>\tIncrease font size"
424 msgstr "<%s-KP+>\t文字サイズを拡大"
425
550 -#: gitk:3083
426 #, tcl-format
427 msgid "<%s-plus>\tIncrease font size"
428 msgstr "<%s-plus>\t文字サイズを拡大"
429
555 -#: gitk:3084
430 #, tcl-format
431 msgid "<%s-KP->\tDecrease font size"
432 msgstr "<%s-KP->\t文字サイズを縮小"
433
560 -#: gitk:3085
434 #, tcl-format
435 msgid "<%s-minus>\tDecrease font size"
436 msgstr "<%s-minus>\t文字サイズを縮小"
437
565 -#: gitk:3086
438 msgid "<F5>\t\tUpdate"
439 msgstr "<F5>\t\t更新"
440
569 -#: gitk:3551 gitk:3560
441 #, tcl-format
442 msgid "Error creating temporary directory %s:"
443 msgstr "一時ディレクトリ %s 生成時エラー:"
444
574 -#: gitk:3573
445 #, tcl-format
446 msgid "Error getting \"%s\" from %s:"
447 msgstr "\"%s\" のエラーが %s に発生:"
448
579 -#: gitk:3636
449 msgid "command failed:"
450 msgstr "コマンド失敗:"
451
583 -#: gitk:3785
452 msgid "No such commit"
453 msgstr "そのようなコミットはありません"
454
587 -#: gitk:3799
455 msgid "git gui blame: command failed:"
456 msgstr "git gui blame: コマンド失敗:"
457
591 -#: gitk:3830
458 #, tcl-format
459 msgid "Couldn't read merge head: %s"
460 msgstr "マージする HEAD を読み込めません: %s"
461
596 -#: gitk:3838
462 #, tcl-format
463 msgid "Error reading index: %s"
464 msgstr "インデックス読み込みエラー: %s"
465
601 -#: gitk:3863
466 #, tcl-format
467 msgid "Couldn't start git blame: %s"
468 msgstr "git blame を始められません: %s"
469
606 -#: gitk:3866 gitk:6755
470 msgid "Searching"
471 msgstr "検索中"
472
610 -#: gitk:3898
473 #, tcl-format
474 msgid "Error running git blame: %s"
475 msgstr "git blame 実行エラー: %s"
476
615 -#: gitk:3926
477 #, tcl-format
478 msgid "That line comes from commit %s, which is not in this view"
479 msgstr "コミット %s に由来するその行は、このビューに表示されていません"
480
620 -#: gitk:3940
481 msgid "External diff viewer failed:"
482 msgstr "外部diffビューアが失敗:"
483
624 -#: gitk:4044
484 msgid "All files"
485 msgstr "全てのファイル"
486
628 -#: gitk:4068
487 msgid "View"
488 msgstr "ビュー"
489
632 -#: gitk:4071
490 msgid "Gitk view definition"
491 msgstr "Gitk ビュー定義"
492
636 -#: gitk:4075
493 msgid "Remember this view"
494 msgstr "このビューを記憶する"
495
640 -#: gitk:4076
496 msgid "References (space separated list):"
497 msgstr "リファレンス(スペース区切りのリスト):"
498
644 -#: gitk:4077
499 msgid "Branches & tags:"
500 msgstr "ブランチ&タグ:"
501
648 -#: gitk:4078
502 msgid "All refs"
503 msgstr "全てのリファレンス"
504
652 -#: gitk:4079
505 msgid "All (local) branches"
506 msgstr "全ての(ローカルな)ブランチ"
507
656 -#: gitk:4080
508 msgid "All tags"
509 msgstr "全てのタグ"
510
660 -#: gitk:4081
511 msgid "All remote-tracking branches"
512 msgstr "全てのリモート追跡ブランチ"
513
664 -#: gitk:4082
514 msgid "Commit Info (regular expressions):"
515 msgstr "コミット情報(正規表現):"
516
668 -#: gitk:4083
517 msgid "Author:"
518 msgstr "作者:"
519
672 -#: gitk:4084
520 msgid "Committer:"
521 msgstr "コミット者:"
522
676 -#: gitk:4085
523 msgid "Commit Message:"
524 msgstr "コミットメッセージ:"
525
680 -#: gitk:4086
526 msgid "Matches all Commit Info criteria"
527 msgstr "コミット情報の全ての条件に一致"
528
684 -#: gitk:4087
529 msgid "Matches no Commit Info criteria"
530 msgstr "コミット情報の全ての条件に不一致"
531
688 -#: gitk:4088
532 msgid "Changes to Files:"
533 msgstr "変更したファイル:"
534
692 -#: gitk:4089
535 msgid "Fixed String"
536 msgstr "固定文字列"
537
696 -#: gitk:4090
538 msgid "Regular Expression"
539 msgstr "正規表現"
540
700 -#: gitk:4091
541 msgid "Search string:"
542 msgstr "検索文字列:"
543
704 -#: gitk:4092
544 msgid ""
545 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
546 "15:27:38\"):"
@@ -709,201 +548,153 @@ msgstr ""
548 "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
549 "15:27:38\"):"
550
712 -#: gitk:4093
551 msgid "Since:"
552 msgstr "期間の始め:"
553
716 -#: gitk:4094
554 msgid "Until:"
555 msgstr "期間の終わり:"
556
720 -#: gitk:4095
557 msgid "Limit and/or skip a number of revisions (positive integer):"
558 msgstr "制限・省略するリビジョンの数(正の整数):"
559
724 -#: gitk:4096
560 msgid "Number to show:"
561 msgstr "表示する数:"
562
728 -#: gitk:4097
563 msgid "Number to skip:"
564 msgstr "省略する数:"
565
732 -#: gitk:4098
566 msgid "Miscellaneous options:"
567 msgstr "その他のオプション:"
568
736 -#: gitk:4099
569 msgid "Strictly sort by date"
570 msgstr "厳密に日付順で並び替え"
571
740 -#: gitk:4100
572 msgid "Mark branch sides"
573 msgstr "側枝マーク"
574
744 -#: gitk:4101
575 msgid "Limit to first parent"
576 msgstr "最初の親に制限"
577
748 -#: gitk:4102
578 msgid "Simple history"
579 msgstr "簡易な履歴"
580
752 -#: gitk:4103
581 msgid "Additional arguments to git log:"
582 msgstr "git log への追加の引数:"
583
756 -#: gitk:4104
584 msgid "Enter files and directories to include, one per line:"
585 msgstr "含まれるファイル・ディレクトリを一行ごとに入力:"
586
760 -#: gitk:4105
587 msgid "Command to generate more commits to include:"
588 msgstr "コミット追加コマンド:"
589
764 -#: gitk:4229
590 msgid "Gitk: edit view"
591 msgstr "Gitk: ビュー編集"
592
768 -#: gitk:4237
593 msgid "-- criteria for selecting revisions"
594 msgstr "― リビジョンの選択条件"
595
772 -#: gitk:4242
596 msgid "View Name"
597 msgstr "ビュー名:"
598
776 -#: gitk:4317
599 msgid "Apply (F5)"
600 msgstr "適用 (F5)"
601
780 -#: gitk:4355
602 msgid "Error in commit selection arguments:"
603 msgstr "コミット選択引数のエラー:"
604
784 -#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389
605 msgid "None"
606 msgstr "無し"
607
788 -#: gitk:5022 gitk:5027
608 msgid "Descendant"
609 msgstr "子孫"
610
792 -#: gitk:5023
611 msgid "Not descendant"
612 msgstr "非子孫"
613
796 -#: gitk:5030 gitk:5035
614 msgid "Ancestor"
615 msgstr "祖先"
616
800 -#: gitk:5031
617 msgid "Not ancestor"
618 msgstr "非祖先"
619
804 -#: gitk:5325
620 msgid "Local changes checked in to index but not committed"
621 msgstr "ステージされた、コミット前のローカルな変更"
622
808 -#: gitk:5361
623 msgid "Local uncommitted changes, not checked in to index"
624 msgstr "ステージされていない、コミット前のローカルな変更"
625
812 -#: gitk:7135
626 msgid "and many more"
627 msgstr "他多数"
628
816 -#: gitk:7138
629 msgid "many"
630 msgstr "多数"
631
820 -#: gitk:7329
632 msgid "Tags:"
633 msgstr "タグ:"
634
824 -#: gitk:7346 gitk:7352 gitk:8826
635 msgid "Parent"
636 msgstr "親"
637
828 -#: gitk:7357
638 msgid "Child"
639 msgstr "子"
640
832 -#: gitk:7366
641 msgid "Branch"
642 msgstr "ブランチ"
643
836 -#: gitk:7369
644 msgid "Follows"
645 msgstr "下位"
646
840 -#: gitk:7372
647 msgid "Precedes"
648 msgstr "上位"
649
844 -#: gitk:7967
650 #, tcl-format
651 msgid "Error getting diffs: %s"
652 msgstr "diff取得エラー: %s"
653
849 -#: gitk:8651
654 msgid "Goto:"
655 msgstr "Goto:"
656
853 -#: gitk:8672
657 #, tcl-format
658 msgid "Short SHA1 id %s is ambiguous"
659 msgstr "%s を含む SHA1 ID は複数存在します"
660
858 -#: gitk:8679
661 #, tcl-format
662 msgid "Revision %s is not known"
663 msgstr "リビジョン %s は不明です"
664
863 -#: gitk:8689
665 #, tcl-format
666 msgid "SHA1 id %s is not known"
667 msgstr "SHA1 id %s は不明です"
668
868 -#: gitk:8691
669 #, tcl-format
670 msgid "Revision %s is not in the current view"
671 msgstr "リビジョン %s は現在のビューにはありません"
672
873 -#: gitk:8833 gitk:8848
673 msgid "Date"
674 msgstr "日付"
675
877 -#: gitk:8836
676 msgid "Children"
677 msgstr "子"
678
881 -#: gitk:8899
679 #, tcl-format
680 msgid "Reset %s branch to here"
681 msgstr "%s ブランチをここにリセットする"
682
886 -#: gitk:8901
683 msgid "Detached head: can't reset"
684 msgstr "切り離されたHEAD: リセットできません"
685
890 -#: gitk:9006 gitk:9012
686 msgid "Skipping merge commit "
687 msgstr "コミットマージをスキップ: "
688
894 -#: gitk:9021 gitk:9026
689 msgid "Error getting patch ID for "
690 msgstr "パッチ取得エラー: ID "
691
898 -#: gitk:9022 gitk:9027
692 msgid " - stopping\n"
693 msgstr " - 停止\n"
694
902 -#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066
695 msgid "Commit "
696 msgstr "コミット "
697
906 -#: gitk:9036
698 msgid ""
699 " is the same patch as\n"
700 " "
@@ -911,7 +702,6 @@ msgstr ""
702 " は下記のパッチと同等\n"
703 " "
704
914 -#: gitk:9044
705 msgid ""
706 " differs from\n"
707 " "
@@ -919,7 +709,6 @@ msgstr ""
709 " 下記からのdiff\n"
710 " "
711
922 -#: gitk:9046
712 msgid ""
713 "Diff of commits:\n"
714 "\n"
@@ -927,130 +716,100 @@ msgstr ""
716 "コミットのdiff:\n"
717 "\n"
718
930 -#: gitk:9058 gitk:9067
719 #, tcl-format
720 msgid " has %s children - stopping\n"
721 msgstr " には %s の子があります - 停止\n"
722
935 -#: gitk:9086
723 #, tcl-format
724 msgid "Error writing commit to file: %s"
725 msgstr "ファイルへのコミット書き出しエラー: %s"
726
940 -#: gitk:9092
727 #, tcl-format
728 msgid "Error diffing commits: %s"
729 msgstr "コミットのdiff実行エラー: %s"
730
945 -#: gitk:9138
731 msgid "Top"
732 msgstr "Top"
733
949 -#: gitk:9139
734 msgid "From"
735 msgstr "From"
736
953 -#: gitk:9144
737 msgid "To"
738 msgstr "To"
739
957 -#: gitk:9168
740 msgid "Generate patch"
741 msgstr "パッチ生成"
742
961 -#: gitk:9170
743 msgid "From:"
744 msgstr "From:"
745
965 -#: gitk:9179
746 msgid "To:"
747 msgstr "To:"
748
969 -#: gitk:9188
749 msgid "Reverse"
750 msgstr "逆"
751
973 -#: gitk:9190 gitk:9400
752 msgid "Output file:"
753 msgstr "出力ファイル:"
754
977 -#: gitk:9196
755 msgid "Generate"
756 msgstr "生成"
757
981 -#: gitk:9234
758 msgid "Error creating patch:"
759 msgstr "パッチ生成エラー:"
760
985 -#: gitk:9257 gitk:9388 gitk:9445
761 msgid "ID:"
762 msgstr "ID:"
763
989 -#: gitk:9266
764 msgid "Tag name:"
765 msgstr "タグ名:"
766
993 -#: gitk:9269
767 msgid "Tag message is optional"
768 msgstr "タグメッセージを付ける事も出来ます"
769
997 -#: gitk:9271
770 msgid "Tag message:"
771 msgstr "タグメッセージ:"
772
1001 -#: gitk:9275 gitk:9454
773 msgid "Create"
774 msgstr "生成"
775
1005 -#: gitk:9293
776 msgid "No tag name specified"
777 msgstr "タグの名称が指定されていません"
778
1009 -#: gitk:9297
779 #, tcl-format
780 msgid "Tag \"%s\" already exists"
781 msgstr "タグ \"%s\" は既に存在します"
782
1014 -#: gitk:9307
783 msgid "Error creating tag:"
784 msgstr "タグ生成エラー:"
785
1018 -#: gitk:9397
786 msgid "Command:"
787 msgstr "コマンド:"
788
1022 -#: gitk:9405
789 msgid "Write"
790 msgstr "書き出し"
791
1026 -#: gitk:9423
792 msgid "Error writing commit:"
793 msgstr "コミット書き出しエラー:"
794
1030 -#: gitk:9450
795 msgid "Name:"
796 msgstr "名前:"
797
1034 -#: gitk:9473
798 msgid "Please specify a name for the new branch"
799 msgstr "新しいブランチの名前を指定してください"
800
1038 -#: gitk:9478
801 #, tcl-format
802 msgid "Branch '%s' already exists. Overwrite?"
803 msgstr "ブランチ '%s' は既に存在します。上書きしますか?"
804
1043 -#: gitk:9545
805 #, tcl-format
806 msgid "Commit %s is already included in branch %s -- really re-apply it?"
807 msgstr ""
808 "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか?"
809
1049 -#: gitk:9550
810 msgid "Cherry-picking"
811 msgstr "チェリーピック中"
812
1053 -#: gitk:9559
813 #, tcl-format
814 msgid ""
815 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1060,7 +819,6 @@ msgstr ""
819 "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ"
820 "い。"
821
1063 -#: gitk:9565
822 msgid ""
823 "Cherry-pick failed because of merge conflict.\n"
824 "Do you wish to run git citool to resolve it?"
@@ -1068,27 +826,25 @@ msgstr ""
826 "マージの衝突によってチェリーピックは失敗しました。\n"
827 "この解決のために git citool を実行したいですか?"
828
1071 -#: gitk:9581 gitk:9639
829 msgid "No changes committed"
830 msgstr "何の変更もコミットされていません"
831
1075 -#: gitk:9608
832 #, tcl-format
833 msgid "Commit %s is not included in branch %s -- really revert it?"
1078 -msgstr "コミット %s は既にブランチ %s に含まれています ― 本当にこれを撤回しますか?"
834 +msgstr ""
835 +"コミット %s は既にブランチ %s に含まれています ― 本当にこれを撤回しますか?"
836
1080 -#: gitk:9613
837 msgid "Reverting"
838 msgstr "撤回中"
839
1084 -#: gitk:9621
840 #, tcl-format
841 msgid ""
842 "Revert failed because of local changes to the following files:%s Please "
843 "commit, reset or stash your changes and try again."
1089 -msgstr "ファイル '%s' のローカルな変更のために撤回は失敗しました。 あなたの変更に commit, reset, stash のいずれかを行ってからやり直してください。"
844 +msgstr ""
845 +"ファイル '%s' のローカルな変更のために撤回は失敗しました。 あなたの変更に "
846 +"commit, reset, stash のいずれかを行ってからやり直してください。"
847
1091 -#: gitk:9625
848 msgid ""
849 "Revert failed because of merge conflict.\n"
850 " Do you wish to run git citool to resolve it?"
@@ -1096,28 +852,22 @@ msgstr ""
852 "マージの衝突によって撤回は失敗しました。\n"
853 "この解決のために git citool を実行したいですか?"
854
1099 -#: gitk:9668
855 msgid "Confirm reset"
856 msgstr "確認を取り消す"
857
1103 -#: gitk:9670
858 #, tcl-format
859 msgid "Reset branch %s to %s?"
860 msgstr "ブランチ %s を %s にリセットしますか?"
861
1108 -#: gitk:9672
862 msgid "Reset type:"
863 msgstr "Reset タイプ:"
864
1112 -#: gitk:9675
865 msgid "Soft: Leave working tree and index untouched"
866 msgstr "Soft: 作業ツリーもインデックスもそのままにする"
867
1116 -#: gitk:9678
868 msgid "Mixed: Leave working tree untouched, reset index"
869 msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット"
870
1120 -#: gitk:9681
871 msgid ""
872 "Hard: Reset working tree and index\n"
873 "(discard ALL local changes)"
@@ -1125,19 +875,15 @@ msgstr ""
875 "Hard: 作業ツリーやインデックスをリセット\n"
876 "(「全ての」ローカルな変更を破棄)"
877
1128 -#: gitk:9698
878 msgid "Resetting"
879 msgstr "リセット中"
880
1132 -#: gitk:9758
881 msgid "Checking out"
882 msgstr "チェックアウト"
883
1136 -#: gitk:9811
884 msgid "Cannot delete the currently checked-out branch"
885 msgstr "現在チェックアウトされているブランチを削除することはできません"
886
1140 -#: gitk:9817
887 #, tcl-format
888 msgid ""
889 "The commits on branch %s aren't on any other branch.\n"
@@ -1146,16 +892,13 @@ msgstr ""
892 "ブランチ %s には他のブランチに存在しないコミットがあります。\n"
893 "本当にブランチ %s を削除しますか?"
894
1149 -#: gitk:9848
895 #, tcl-format
896 msgid "Tags and heads: %s"
897 msgstr "タグとHEAD: %s"
898
1154 -#: gitk:9865
899 msgid "Filter"
900 msgstr "フィルター"
901
1158 -#: gitk:10161
902 msgid ""
903 "Error reading commit topology information; branch and preceding/following "
904 "tag information will be incomplete."
@@ -1163,201 +906,152 @@ msgstr ""
906 "コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である"
907 "ようです。"
908
1166 -#: gitk:11138
909 msgid "Tag"
910 msgstr "タグ"
911
1170 -#: gitk:11142
912 msgid "Id"
913 msgstr "ID"
914
1174 -#: gitk:11225
915 msgid "Gitk font chooser"
916 msgstr "Gitk フォント選択"
917
1178 -#: gitk:11242
918 msgid "B"
919 msgstr "B"
920
1182 -#: gitk:11245
921 msgid "I"
922 msgstr "I"
923
1186 -#: gitk:11363
924 msgid "Commit list display options"
925 msgstr "コミットリスト表示オプション"
926
1190 -#: gitk:11366
927 msgid "Maximum graph width (lines)"
928 msgstr "最大グラフ幅(線の本数)"
929
1194 -#: gitk:11370
930 #, no-tcl-format
931 msgid "Maximum graph width (% of pane)"
932 msgstr "最大グラフ幅(ペインに対する%)"
933
1199 -#: gitk:11373
934 msgid "Show local changes"
935 msgstr "ローカルな変更を表示"
936
1203 -#: gitk:11376
937 msgid "Auto-select SHA1 (length)"
938 msgstr "SHA1 の自動選択 (選択文字数指定)"
939
1207 -#: gitk:11380
940 msgid "Hide remote refs"
941 msgstr "リモートリファレンスを隠す"
942
1211 -#: gitk:11384
943 msgid "Diff display options"
944 msgstr "diff表示オプション"
945
1215 -#: gitk:11386
946 msgid "Tab spacing"
947 msgstr "タブ空白幅"
948
1219 -#: gitk:11389
949 msgid "Display nearby tags/heads"
950 msgstr "近くの タグ/head を表示する"
951
1223 -#: gitk:11392
952 msgid "Maximum # tags/heads to show"
953 msgstr "タグ/head の最大表示数"
954
1227 -#: gitk:11395
955 msgid "Limit diffs to listed paths"
956 msgstr "diff をリストのパスに制限"
957
1231 -#: gitk:11398
958 msgid "Support per-file encodings"
959 msgstr "ファイルごとのエンコーディングのサポート"
960
1235 -#: gitk:11404 gitk:11551
961 msgid "External diff tool"
962 msgstr "外部diffツール"
963
1239 -#: gitk:11405
964 msgid "Choose..."
965 msgstr "選択..."
966
1243 -#: gitk:11410
967 msgid "General options"
968 msgstr "全体設定"
969
1247 -#: gitk:11413
970 msgid "Use themed widgets"
971 msgstr "テーマウィジェットを使用する"
972
1251 -#: gitk:11415
973 msgid "(change requires restart)"
974 msgstr "(変更には再起動が必要です)"
975
1255 -#: gitk:11417
976 msgid "(currently unavailable)"
977 msgstr "(現在は使用出来ません)"
978
1259 -#: gitk:11428
979 msgid "Colors: press to choose"
980 msgstr "色: ボタンを押して選択"
981
1263 -#: gitk:11431
982 msgid "Interface"
983 msgstr "インターフェイス"
984
1267 -#: gitk:11432
985 msgid "interface"
986 msgstr "インターフェイス"
987
1271 -#: gitk:11435
988 msgid "Background"
989 msgstr "背景"
990
1275 -#: gitk:11436 gitk:11466
991 msgid "background"
992 msgstr "背景"
993
1279 -#: gitk:11439
994 msgid "Foreground"
995 msgstr "前景"
996
1283 -#: gitk:11440
997 msgid "foreground"
998 msgstr "前景"
999
1287 -#: gitk:11443
1000 msgid "Diff: old lines"
1001 msgstr "Diff: 旧バージョン"
1002
1291 -#: gitk:11444
1003 msgid "diff old lines"
1004 msgstr "diff 旧バージョン"
1005
1295 -#: gitk:11448
1006 msgid "Diff: new lines"
1007 msgstr "Diff: 新バージョン"
1008
1299 -#: gitk:11449
1009 msgid "diff new lines"
1010 msgstr "diff 新バージョン"
1011
1303 -#: gitk:11453
1012 msgid "Diff: hunk header"
1013 msgstr "Diff: hunkヘッダ"
1014
1307 -#: gitk:11455
1015 msgid "diff hunk header"
1016 msgstr "diff hunkヘッダ"
1017
1311 -#: gitk:11459
1018 msgid "Marked line bg"
1019 msgstr "マーク行の背景"
1020
1315 -#: gitk:11461
1021 msgid "marked line background"
1022 msgstr "マーク行の背景"
1023
1319 -#: gitk:11465
1024 msgid "Select bg"
1025 msgstr "選択の背景"
1026
1323 -#: gitk:11474
1027 msgid "Fonts: press to choose"
1028 msgstr "フォント: ボタンを押して選択"
1029
1327 -#: gitk:11476
1030 msgid "Main font"
1031 msgstr "主フォント"
1032
1331 -#: gitk:11477
1033 msgid "Diff display font"
1034 msgstr "Diff表示用フォント"
1035
1335 -#: gitk:11478
1036 msgid "User interface font"
1037 msgstr "UI用フォント"
1038
1339 -#: gitk:11500
1039 msgid "Gitk preferences"
1040 msgstr "Gitk 設定"
1041
1343 -#: gitk:11509
1042 msgid "General"
1043 msgstr "一般"
1044
1347 -#: gitk:11510
1045 msgid "Colors"
1046 msgstr "色"
1047
1351 -#: gitk:11511
1048 msgid "Fonts"
1049 msgstr "フォント"
1050
1355 -#: gitk:11561
1051 #, tcl-format
1052 msgid "Gitk: choose color for %s"
1053 msgstr "Gitk: 「%s」 の色を選択"
1054
1360 -#: gitk:12074
1055 msgid ""
1056 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1057 " Gitk requires at least Tcl/Tk 8.4."
@@ -1365,15 +1059,12 @@ msgstr ""
1059 "申し訳ありませんが、このバージョンの Tcl/Tk では gitk を実行出来ません。\n"
1060 "Gitkの実行には Tcl/Tk 8.4 以上が必要です。"
1061
1368 -#: gitk:12284
1062 msgid "Cannot find a git repository here."
1063 msgstr "ここにはgitリポジトリがありません。"
1064
1372 -#: gitk:12331
1065 #, tcl-format
1066 msgid "Ambiguous argument '%s': both revision and filename"
1067 msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます"
1068
1377 -#: gitk:12343
1069 msgid "Bad arguments to gitk:"
1070 msgstr "gitkへの不正な引数:"
po/pt_br.po
-310
@@ -18,33 +18,26 @@ msgstr ""
18 "Content-Type: text/plain; charset=UTF-8\n"
19 "Content-Transfer-Encoding: 8bit\n"
20
21 -#: gitk:140
21 msgid "Couldn't get list of unmerged files:"
22 msgstr "Não foi possível obter a lista dos arquivos não mesclados:"
23
25 -#: gitk:212 gitk:2381
24 msgid "Color words"
25 msgstr ""
26
29 -#: gitk:217 gitk:2381 gitk:8220 gitk:8253
27 msgid "Markup words"
28 msgstr ""
29
33 -#: gitk:324
30 msgid "Error parsing revisions:"
31 msgstr "Erro ao interpretar revisões:"
32
37 -#: gitk:380
33 msgid "Error executing --argscmd command:"
34 msgstr "Erro ao executar o comando--argscmd:"
35
41 -#: gitk:393
36 msgid "No files selected: --merge specified but no files are unmerged."
37 msgstr ""
38 "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-"
39 "mesclados."
40
47 -#: gitk:396
41 msgid ""
42 "No files selected: --merge specified but no unmerged files are within file "
43 "limit."
@@ -52,317 +45,237 @@ msgstr ""
45 "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-"
46 "mesclados dentro dos limites."
47
55 -#: gitk:418 gitk:566
48 msgid "Error executing git log:"
49 msgstr "Erro ao executar git log:"
50
59 -#: gitk:436 gitk:582
51 msgid "Reading"
52 msgstr "Lendo"
53
63 -#: gitk:496 gitk:4525
54 msgid "Reading commits..."
55 msgstr "Lendo revisões..."
56
67 -#: gitk:499 gitk:1637 gitk:4528
57 msgid "No commits selected"
58 msgstr "Nenhuma revisão foi selecionada"
59
71 -#: gitk:1445 gitk:4045 gitk:12432
60 msgid "Command line"
61 msgstr "Linha de comando"
62
75 -#: gitk:1511
63 msgid "Can't parse git log output:"
64 msgstr "Não foi possível interpretar a saída do \"git log\":"
65
79 -#: gitk:1740
66 msgid "No commit information available"
67 msgstr "Não há informações disponíveis sobre a revisão"
68
83 -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
69 msgid "OK"
70 msgstr "Ok"
71
87 -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
88 -#: gitk:11242 gitk:11522
72 msgid "Cancel"
73 msgstr "Cancelar"
74
92 -#: gitk:2069
75 msgid "&Update"
76 msgstr "Atualizar"
77
96 -#: gitk:2070
78 msgid "&Reload"
79 msgstr "Recarregar"
80
100 -#: gitk:2071
81 msgid "Reread re&ferences"
82 msgstr "Ler as referências novamente"
83
104 -#: gitk:2072
84 msgid "&List references"
85 msgstr "Listar referências"
86
108 -#: gitk:2074
87 msgid "Start git &gui"
88 msgstr "Iniciar Git GUI"
89
112 -#: gitk:2076
90 msgid "&Quit"
91 msgstr "Sair"
92
116 -#: gitk:2068
93 msgid "&File"
94 msgstr "Arquivo"
95
120 -#: gitk:2080
96 msgid "&Preferences"
97 msgstr "Preferências"
98
124 -#: gitk:2079
99 msgid "&Edit"
100 msgstr "Editar"
101
128 -#: gitk:2084
102 msgid "&New view..."
103 msgstr "Nova vista..."
104
132 -#: gitk:2085
105 msgid "&Edit view..."
106 msgstr "Editar vista..."
107
136 -#: gitk:2086
108 msgid "&Delete view"
109 msgstr "Apagar vista"
110
140 -#: gitk:2088 gitk:4043
111 msgid "&All files"
112 msgstr "Todos os arquivos"
113
144 -#: gitk:2083 gitk:4067
114 msgid "&View"
115 msgstr "Exibir"
116
148 -#: gitk:2093 gitk:2103 gitk:3012
117 msgid "&About gitk"
118 msgstr "Sobre o gitk"
119
152 -#: gitk:2094 gitk:2108
120 msgid "&Key bindings"
121 msgstr "Atalhos de teclado"
122
156 -#: gitk:2092 gitk:2107
123 msgid "&Help"
124 msgstr "Ajuda"
125
160 -#: gitk:2185 gitk:8652
126 msgid "SHA1 ID:"
127 msgstr "SHA1 ID:"
128
164 -#: gitk:2229
129 msgid "Row"
130 msgstr "Linha"
131
168 -#: gitk:2267
132 msgid "Find"
133 msgstr "Encontrar"
134
172 -#: gitk:2295
135 msgid "commit"
136 msgstr "Revisão"
137
176 -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
177 -#: gitk:6912
138 msgid "containing:"
139 msgstr "contendo:"
140
181 -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
141 msgid "touching paths:"
142 msgstr "envolvendo os caminhos:"
143
185 -#: gitk:2303 gitk:4777
144 msgid "adding/removing string:"
145 msgstr "Adicionando/removendo texto:"
146
189 -#: gitk:2304 gitk:4779
147 msgid "changing lines matching:"
148 msgstr ""
149
193 -#: gitk:2313 gitk:2315 gitk:4766
150 msgid "Exact"
151 msgstr "Exatamente"
152
197 -#: gitk:2315 gitk:4854 gitk:6723
153 msgid "IgnCase"
154 msgstr "Ignorar maiúsculas/minúsculas"
155
201 -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
156 msgid "Regexp"
157 msgstr "Expressão regular"
158
205 -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
159 msgid "All fields"
160 msgstr "Todos os campos"
161
209 -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
162 msgid "Headline"
163 msgstr "Assunto"
164
213 -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
165 msgid "Comments"
166 msgstr "Descrição da revisão"
167
217 -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
218 -#: gitk:8845
168 msgid "Author"
169 msgstr "Autor"
170
222 -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
171 msgid "Committer"
172 msgstr "Revisor"
173
226 -#: gitk:2350
174 msgid "Search"
175 msgstr "Buscar"
176
230 -#: gitk:2358
177 msgid "Diff"
178 msgstr "Diferenças"
179
234 -#: gitk:2360
180 msgid "Old version"
181 msgstr "Versão antiga"
182
238 -#: gitk:2362
183 msgid "New version"
184 msgstr "Versão nova"
185
242 -#: gitk:2364
186 msgid "Lines of context"
187 msgstr "Número de linhas de contexto"
188
246 -#: gitk:2374
189 msgid "Ignore space change"
190 msgstr "Ignorar mudanças de caixa"
191
250 -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
192 msgid "Line diff"
193 msgstr ""
194
254 -#: gitk:2445
195 msgid "Patch"
196 msgstr "Diferenças"
197
258 -#: gitk:2447
198 msgid "Tree"
199 msgstr "Árvore"
200
262 -#: gitk:2617 gitk:2637
201 msgid "Diff this -> selected"
202 msgstr "Comparar esta revisão com a selecionada"
203
266 -#: gitk:2618 gitk:2638
204 msgid "Diff selected -> this"
205 msgstr "Comparar a revisão selecionada com esta"
206
270 -#: gitk:2619 gitk:2639
207 msgid "Make patch"
208 msgstr "Criar patch"
209
274 -#: gitk:2620 gitk:9254
210 msgid "Create tag"
211 msgstr "Criar etiqueta"
212
278 -#: gitk:2621 gitk:9371
213 msgid "Write commit to file"
214 msgstr "Salvar revisão para um arquivo"
215
282 -#: gitk:2622 gitk:9428
216 msgid "Create new branch"
217 msgstr "Criar novo ramo"
218
286 -#: gitk:2623
219 msgid "Cherry-pick this commit"
220 msgstr "Fazer cherry-pick desta revisão"
221
290 -#: gitk:2624
222 msgid "Reset HEAD branch to here"
223 msgstr "Redefinir HEAD para cá"
224
294 -#: gitk:2625
225 msgid "Mark this commit"
226 msgstr "Marcar esta revisão"
227
298 -#: gitk:2626
228 msgid "Return to mark"
229 msgstr "Voltar à marca"
230
302 -#: gitk:2627
231 msgid "Find descendant of this and mark"
232 msgstr "Encontrar descendente e marcar"
233
306 -#: gitk:2628
234 msgid "Compare with marked commit"
235 msgstr "Comparar com a revisão marcada"
236
310 -#: gitk:2629 gitk:2640
237 #, fuzzy
238 msgid "Diff this -> marked commit"
239 msgstr "Comparar esta revisão com a selecionada"
240
315 -#: gitk:2630 gitk:2641
241 #, fuzzy
242 msgid "Diff marked commit -> this"
243 msgstr "Comparar a revisão selecionada com esta"
244
320 -#: gitk:2631
245 #, fuzzy
246 msgid "Revert this commit"
247 msgstr "Marcar esta revisão"
248
325 -#: gitk:2647
249 msgid "Check out this branch"
250 msgstr "Efetuar checkout deste ramo"
251
329 -#: gitk:2648
252 msgid "Remove this branch"
253 msgstr "Excluir este ramo"
254
333 -#: gitk:2649
255 msgid "Copy branch name"
256 msgstr ""
257
337 -#: gitk:2656
258 msgid "Highlight this too"
259 msgstr "Marcar este também"
260
341 -#: gitk:2657
261 msgid "Highlight this only"
262 msgstr "Marcar apenas este"
263
345 -#: gitk:2658
264 msgid "External diff"
265 msgstr "Diff externo"
266
349 -#: gitk:2659
267 msgid "Blame parent commit"
268 msgstr "Anotar revisão anterior"
269
353 -#: gitk:2660
270 msgid "Copy path"
271 msgstr ""
272
357 -#: gitk:2667
273 msgid "Show origin of this line"
274 msgstr "Exibir origem desta linha"
275
361 -#: gitk:2668
276 msgid "Run git gui blame on this line"
277 msgstr "Executar 'git blame' nesta linha"
278
365 -#: gitk:3014
279 #, fuzzy
280 msgid ""
281 "\n"
@@ -379,320 +292,248 @@ msgstr ""
292 "\n"
293 "Uso e distribuição segundo os termos da Licença Pública Geral GNU"
294
382 -#: gitk:3022 gitk:3089 gitk:9857
295 msgid "Close"
296 msgstr "Fechar"
297
386 -#: gitk:3043
298 msgid "Gitk key bindings"
299 msgstr "Atalhos de teclado"
300
390 -#: gitk:3046
301 msgid "Gitk key bindings:"
302 msgstr "Atalhos de teclado:"
303
394 -#: gitk:3048
304 #, tcl-format
305 msgid "<%s-Q>\t\tQuit"
306 msgstr "<%s-Q>\t\tSair"
307
399 -#: gitk:3049
308 #, tcl-format
309 msgid "<%s-W>\t\tClose window"
310 msgstr "<%s-W>\t\tFechar janela"
311
404 -#: gitk:3050
312 msgid "<Home>\t\tMove to first commit"
313 msgstr "<Home>\t\tIr para a primeira revisão"
314
408 -#: gitk:3051
315 msgid "<End>\t\tMove to last commit"
316 msgstr "<End>\t\tIr para a última revisão"
317
412 -#: gitk:3052
318 #, fuzzy
319 msgid "<Up>, p, k\tMove up one commit"
320 msgstr "<Up>, p, i\tIr para uma revisão acima"
321
417 -#: gitk:3053
322 #, fuzzy
323 msgid "<Down>, n, j\tMove down one commit"
324 msgstr "<Down>, n, k\tIr para uma revisão abaixo"
325
422 -#: gitk:3054
326 #, fuzzy
327 msgid "<Left>, z, h\tGo back in history list"
328 msgstr "<Left>, z, j\tVoltar no histórico"
329
427 -#: gitk:3055
330 msgid "<Right>, x, l\tGo forward in history list"
331 msgstr "<Right>, x, l\tAvançar no histórico"
332
431 -#: gitk:3056
333 #, tcl-format
334 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
335 msgstr ""
336
436 -#: gitk:3057
337 msgid "<PageUp>\tMove up one page in commit list"
338 msgstr "<PageUp>\tSubir uma página na lista de revisões"
339
440 -#: gitk:3058
340 msgid "<PageDown>\tMove down one page in commit list"
341 msgstr "<PageDown>\tDescer uma página na lista de revisões"
342
444 -#: gitk:3059
343 #, tcl-format
344 msgid "<%s-Home>\tScroll to top of commit list"
345 msgstr "<%s-Home>\tRolar para o início da lista de revisões"
346
449 -#: gitk:3060
347 #, tcl-format
348 msgid "<%s-End>\tScroll to bottom of commit list"
349 msgstr "<%s-End>\tRolar para o final da lista de revisões"
350
454 -#: gitk:3061
351 #, tcl-format
352 msgid "<%s-Up>\tScroll commit list up one line"
353 msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões"
354
459 -#: gitk:3062
355 #, tcl-format
356 msgid "<%s-Down>\tScroll commit list down one line"
357 msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões"
358
464 -#: gitk:3063
359 #, tcl-format
360 msgid "<%s-PageUp>\tScroll commit list up one page"
361 msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões"
362
469 -#: gitk:3064
363 #, tcl-format
364 msgid "<%s-PageDown>\tScroll commit list down one page"
365 msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões"
366
474 -#: gitk:3065
367 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
368 msgstr "<Shift-Up>\tProcurar próxima (revisões mas recentes)"
369
478 -#: gitk:3066
370 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
371 msgstr "<Shift-Down>\tProcurar anterior (revisões mais antigas)"
372
482 -#: gitk:3067
373 msgid "<Delete>, b\tScroll diff view up one page"
374 msgstr "<Delete>, b\tRola alterações uma página acima"
375
486 -#: gitk:3068
376 msgid "<Backspace>\tScroll diff view up one page"
377 msgstr "<Backspace>\tRolar alterações uma página abaixo"
378
490 -#: gitk:3069
379 msgid "<Space>\t\tScroll diff view down one page"
380 msgstr "<Space>\t\tRolar alterações uma página abaixo"
381
494 -#: gitk:3070
382 msgid "u\t\tScroll diff view up 18 lines"
383 msgstr "u\t\tRolar alterações 18 linhas acima"
384
498 -#: gitk:3071
385 msgid "d\t\tScroll diff view down 18 lines"
386 msgstr "d\t\tRolar alterações 18 linhas abaixo"
387
502 -#: gitk:3072
388 #, tcl-format
389 msgid "<%s-F>\t\tFind"
390 msgstr "<%s-F>\t\tProcurar"
391
507 -#: gitk:3073
392 #, tcl-format
393 msgid "<%s-G>\t\tMove to next find hit"
394 msgstr "<%s-G>\t\tIr para a próxima ocorrência"
395
512 -#: gitk:3074
396 msgid "<Return>\tMove to next find hit"
397 msgstr "<Return>\tIr para a próxima ocorrência"
398
516 -#: gitk:3075
399 #, fuzzy
400 msgid "g\t\tGo to commit"
401 msgstr "<End>\t\tIr para a última revisão"
402
521 -#: gitk:3076
403 msgid "/\t\tFocus the search box"
404 msgstr "/\t\tPor foco na caixa de busca"
405
525 -#: gitk:3077
406 msgid "?\t\tMove to previous find hit"
407 msgstr "?\t\tIr para a ocorrência anterior"
408
529 -#: gitk:3078
409 msgid "f\t\tScroll diff view to next file"
410 msgstr "f\t\tRolar alterações para o próximo arquivo"
411
533 -#: gitk:3079
412 #, tcl-format
413 msgid "<%s-S>\t\tSearch for next hit in diff view"
414 msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações"
415
538 -#: gitk:3080
416 #, tcl-format
417 msgid "<%s-R>\t\tSearch for previous hit in diff view"
418 msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações"
419
543 -#: gitk:3081
420 #, tcl-format
421 msgid "<%s-KP+>\tIncrease font size"
422 msgstr "<%s-KP+>\tAumentar tamanho da fonte"
423
548 -#: gitk:3082
424 #, tcl-format
425 msgid "<%s-plus>\tIncrease font size"
426 msgstr "<%s-plus>\tAumentar tamanho da fonte"
427
553 -#: gitk:3083
428 #, tcl-format
429 msgid "<%s-KP->\tDecrease font size"
430 msgstr "<%s-KP->\tReduzir tamanho da fonte"
431
558 -#: gitk:3084
432 #, tcl-format
433 msgid "<%s-minus>\tDecrease font size"
434 msgstr "<%s-minus>\tReduzir tamanho da fonte"
435
563 -#: gitk:3085
436 msgid "<F5>\t\tUpdate"
437 msgstr "<F5>\t\tAtualizar"
438
567 -#: gitk:3550 gitk:3559
439 #, tcl-format
440 msgid "Error creating temporary directory %s:"
441 msgstr "Erro ao criar o diretório temporário %s:"
442
572 -#: gitk:3572
443 #, tcl-format
444 msgid "Error getting \"%s\" from %s:"
445 msgstr "Erro ao ler \"%s\" de %s:"
446
577 -#: gitk:3635
447 msgid "command failed:"
448 msgstr "O comando falhou:"
449
581 -#: gitk:3784
450 msgid "No such commit"
451 msgstr "Revisão não encontrada"
452
585 -#: gitk:3798
453 msgid "git gui blame: command failed:"
454 msgstr "Comando 'git gui blame' falhou:"
455
589 -#: gitk:3829
456 #, tcl-format
457 msgid "Couldn't read merge head: %s"
458 msgstr "Impossível ler merge head: %s"
459
594 -#: gitk:3837
460 #, tcl-format
461 msgid "Error reading index: %s"
462 msgstr "Erro ao ler o índice: %s"
463
599 -#: gitk:3862
464 #, tcl-format
465 msgid "Couldn't start git blame: %s"
466 msgstr "Não foi possível inciar o 'git blame': %s"
467
604 -#: gitk:3865 gitk:6754
468 msgid "Searching"
469 msgstr "Procurando"
470
608 -#: gitk:3897
471 #, tcl-format
472 msgid "Error running git blame: %s"
473 msgstr "Erro ao executar 'git blame': %s"
474
613 -#: gitk:3925
475 #, tcl-format
476 msgid "That line comes from commit %s, which is not in this view"
477 msgstr "Esta linha vem da revisão %s, que não está nesta vista"
478
618 -#: gitk:3939
479 msgid "External diff viewer failed:"
480 msgstr "Erro do visualizador de alterações externo:"
481
622 -#: gitk:4070
482 msgid "Gitk view definition"
483 msgstr "Definir vista"
484
626 -#: gitk:4074
485 msgid "Remember this view"
486 msgstr "Lembrar esta vista"
487
630 -#: gitk:4075
488 msgid "References (space separated list):"
489 msgstr "Referências (separar a lista com um espaço):"
490
634 -#: gitk:4076
491 msgid "Branches & tags:"
492 msgstr "Ramos & etiquetas:"
493
638 -#: gitk:4077
494 msgid "All refs"
495 msgstr "Todas as referências"
496
642 -#: gitk:4078
497 msgid "All (local) branches"
498 msgstr "Todos os ramos locais"
499
646 -#: gitk:4079
500 msgid "All tags"
501 msgstr "Todas as etiquetas"
502
650 -#: gitk:4080
503 msgid "All remote-tracking branches"
504 msgstr "Todos os ramos de rastreio"
505
654 -#: gitk:4081
506 msgid "Commit Info (regular expressions):"
507 msgstr "Informações da revisão (expressões regulares):"
508
658 -#: gitk:4082
509 msgid "Author:"
510 msgstr "Autor:"
511
662 -#: gitk:4083
512 msgid "Committer:"
513 msgstr "Revisor:"
514
666 -#: gitk:4084
515 msgid "Commit Message:"
516 msgstr "Descrição da revisão:"
517
670 -#: gitk:4085
518 msgid "Matches all Commit Info criteria"
519 msgstr "Coincidir todos os critérios de informações da revisão"
520
674 -#: gitk:4086
521 #, fuzzy
522 msgid "Matches no Commit Info criteria"
523 msgstr "Coincidir todos os critérios de informações da revisão"
524
679 -#: gitk:4087
525 msgid "Changes to Files:"
526 msgstr "Mudanças para os arquivos:"
527
683 -#: gitk:4088
528 msgid "Fixed String"
529 msgstr "Texto fixo"
530
687 -#: gitk:4089
531 msgid "Regular Expression"
532 msgstr "Expressão regular"
533
691 -#: gitk:4090
534 msgid "Search string:"
535 msgstr "Texto de busca"
536
695 -#: gitk:4091
537 msgid ""
538 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
539 "15:27:38\"):"
@@ -700,201 +541,153 @@ msgstr ""
541 "Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
542 "15:27:38\"):"
543
703 -#: gitk:4092
544 msgid "Since:"
545 msgstr "Desde:"
546
707 -#: gitk:4093
547 msgid "Until:"
548 msgstr "Até:"
549
711 -#: gitk:4094
550 msgid "Limit and/or skip a number of revisions (positive integer):"
551 msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):"
552
715 -#: gitk:4095
553 msgid "Number to show:"
554 msgstr "Número para mostrar:"
555
719 -#: gitk:4096
556 msgid "Number to skip:"
557 msgstr "Número para ignorar:"
558
723 -#: gitk:4097
559 msgid "Miscellaneous options:"
560 msgstr "Opções diversas:"
561
727 -#: gitk:4098
562 msgid "Strictly sort by date"
563 msgstr "Ordenar estritamente pela data"
564
731 -#: gitk:4099
565 msgid "Mark branch sides"
566 msgstr "Marcar os dois lados do ramo"
567
735 -#: gitk:4100
568 msgid "Limit to first parent"
569 msgstr "Limitar ao primeiro antecessor"
570
739 -#: gitk:4101
571 msgid "Simple history"
572 msgstr "Histórico simplificado"
573
743 -#: gitk:4102
574 msgid "Additional arguments to git log:"
575 msgstr "Argumentos adicionais para o 'git log':"
576
747 -#: gitk:4103
577 msgid "Enter files and directories to include, one per line:"
578 msgstr "Arquivos e diretórios para incluir, um por linha"
579
751 -#: gitk:4104
580 msgid "Command to generate more commits to include:"
581 msgstr "Comando para gerar mais revisões para incluir:"
582
755 -#: gitk:4228
583 msgid "Gitk: edit view"
584 msgstr "Gitk: editar vista"
585
759 -#: gitk:4236
586 msgid "-- criteria for selecting revisions"
587 msgstr "-- critérios para selecionar revisões"
588
763 -#: gitk:4241
589 msgid "View Name"
590 msgstr "Nome da vista"
591
767 -#: gitk:4316
592 msgid "Apply (F5)"
593 msgstr "Aplicar (F5)"
594
771 -#: gitk:4354
595 msgid "Error in commit selection arguments:"
596 msgstr "Erro nos argumentos de seleção de revisões:"
597
775 -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
598 msgid "None"
599 msgstr "Nenhum"
600
779 -#: gitk:5021 gitk:5026
601 msgid "Descendant"
602 msgstr "Descendente de"
603
783 -#: gitk:5022
604 msgid "Not descendant"
605 msgstr "Não descendente de"
606
787 -#: gitk:5029 gitk:5034
607 msgid "Ancestor"
608 msgstr "Antecessor de"
609
791 -#: gitk:5030
610 msgid "Not ancestor"
611 msgstr "Não antecessor de"
612
795 -#: gitk:5324
613 msgid "Local changes checked in to index but not committed"
614 msgstr "Mudanças locais marcadas, porém não salvas"
615
799 -#: gitk:5360
616 msgid "Local uncommitted changes, not checked in to index"
617 msgstr "Mudanças locais não marcadas"
618
803 -#: gitk:7134
619 msgid "and many more"
620 msgstr ""
621
807 -#: gitk:7137
622 msgid "many"
623 msgstr "muitas"
624
811 -#: gitk:7328
625 msgid "Tags:"
626 msgstr "Etiquetas:"
627
815 -#: gitk:7345 gitk:7351 gitk:8825
628 msgid "Parent"
629 msgstr "Antecessor"
630
819 -#: gitk:7356
631 msgid "Child"
632 msgstr "Descendente"
633
823 -#: gitk:7365
634 msgid "Branch"
635 msgstr "Ramo"
636
827 -#: gitk:7368
637 msgid "Follows"
638 msgstr "Segue"
639
831 -#: gitk:7371
640 msgid "Precedes"
641 msgstr "Precede"
642
835 -#: gitk:7966
643 #, tcl-format
644 msgid "Error getting diffs: %s"
645 msgstr "Erro ao obter diferenças: %s"
646
840 -#: gitk:8650
647 msgid "Goto:"
648 msgstr "Ir para:"
649
844 -#: gitk:8671
650 #, tcl-format
651 msgid "Short SHA1 id %s is ambiguous"
652 msgstr "O id SHA1 %s é ambíguo"
653
849 -#: gitk:8678
654 #, tcl-format
655 msgid "Revision %s is not known"
656 msgstr "Revisão %s desconhecida"
657
854 -#: gitk:8688
658 #, tcl-format
659 msgid "SHA1 id %s is not known"
660 msgstr "Id SHA1 %s desconhecido"
661
859 -#: gitk:8690
662 #, tcl-format
663 msgid "Revision %s is not in the current view"
664 msgstr "A revisão %s não está na vista atual"
665
864 -#: gitk:8832 gitk:8847
666 msgid "Date"
667 msgstr "Data"
668
868 -#: gitk:8835
669 msgid "Children"
670 msgstr "Descendentes"
671
872 -#: gitk:8898
672 #, tcl-format
673 msgid "Reset %s branch to here"
674 msgstr "Redefinir ramo %s para este ponto"
675
877 -#: gitk:8900
676 msgid "Detached head: can't reset"
677 msgstr "Detached head: impossível redefinir"
678
881 -#: gitk:9005 gitk:9011
679 msgid "Skipping merge commit "
680 msgstr "Saltando revisão de mesclagem"
681
885 -#: gitk:9020 gitk:9025
682 msgid "Error getting patch ID for "
683 msgstr "Erro ao obter patch ID para"
684
889 -#: gitk:9021 gitk:9026
685 msgid " - stopping\n"
686 msgstr "- parando\n"
687
893 -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
688 msgid "Commit "
689 msgstr "Revisão"
690
897 -#: gitk:9035
691 msgid ""
692 " is the same patch as\n"
693 " "
@@ -902,13 +695,11 @@ msgstr ""
695 "é o mesmo patch que\n"
696 " "
697
905 -#: gitk:9043
698 msgid ""
699 " differs from\n"
700 " "
701 msgstr "difere de"
702
911 -#: gitk:9045
703 msgid ""
704 "Diff of commits:\n"
705 "\n"
@@ -916,129 +707,99 @@ msgstr ""
707 "Diferença de revisões:\n"
708 "\n"
709
919 -#: gitk:9057 gitk:9066
710 #, tcl-format
711 msgid " has %s children - stopping\n"
712 msgstr "possui %s descendentes - parando\n"
713
924 -#: gitk:9085
714 #, tcl-format
715 msgid "Error writing commit to file: %s"
716 msgstr "Erro ao salvar revisão para o arquivo: %s"
717
929 -#: gitk:9091
718 #, tcl-format
719 msgid "Error diffing commits: %s"
720 msgstr "Erro ao comparar revisões: %s"
721
934 -#: gitk:9137
722 msgid "Top"
723 msgstr "Início"
724
938 -#: gitk:9138
725 msgid "From"
726 msgstr "De"
727
942 -#: gitk:9143
728 msgid "To"
729 msgstr "Para"
730
946 -#: gitk:9167
731 msgid "Generate patch"
732 msgstr "Gerar patch"
733
950 -#: gitk:9169
734 msgid "From:"
735 msgstr "De:"
736
954 -#: gitk:9178
737 msgid "To:"
738 msgstr "Para:"
739
958 -#: gitk:9187
740 msgid "Reverse"
741 msgstr "Inverter"
742
962 -#: gitk:9189 gitk:9385
743 msgid "Output file:"
744 msgstr "Arquivo de saída:"
745
966 -#: gitk:9195
746 msgid "Generate"
747 msgstr "Gerar"
748
970 -#: gitk:9233
749 msgid "Error creating patch:"
750 msgstr "Erro ao criar patch:"
751
974 -#: gitk:9256 gitk:9373 gitk:9430
752 msgid "ID:"
753 msgstr "ID:"
754
978 -#: gitk:9265
755 msgid "Tag name:"
756 msgstr "Nome da etiqueta:"
757
982 -#: gitk:9268
758 msgid "Tag message is optional"
759 msgstr "A descrição da etiqueta é opcional"
760
986 -#: gitk:9270
761 msgid "Tag message:"
762 msgstr "Descrição da etiqueta"
763
990 -#: gitk:9274 gitk:9439
764 msgid "Create"
765 msgstr "Criar"
766
994 -#: gitk:9292
767 msgid "No tag name specified"
768 msgstr "Nome da etiqueta não indicado"
769
998 -#: gitk:9296
770 #, tcl-format
771 msgid "Tag \"%s\" already exists"
772 msgstr "Etiqueta \"%s\" já existe"
773
1003 -#: gitk:9306
774 msgid "Error creating tag:"
775 msgstr "Erro ao criar etiqueta:"
776
1007 -#: gitk:9382
777 msgid "Command:"
778 msgstr "Comando:"
779
1011 -#: gitk:9390
780 msgid "Write"
781 msgstr "Exportar"
782
1015 -#: gitk:9408
783 msgid "Error writing commit:"
784 msgstr "Erro ao exportar revisão"
785
1019 -#: gitk:9435
786 msgid "Name:"
787 msgstr "Nome:"
788
1023 -#: gitk:9458
789 msgid "Please specify a name for the new branch"
790 msgstr "Indique um nome para o novo ramo"
791
1027 -#: gitk:9463
792 #, tcl-format
793 msgid "Branch '%s' already exists. Overwrite?"
794 msgstr "O ramo \"%s\" já existe. Sobrescrever?"
795
1032 -#: gitk:9530
796 #, tcl-format
797 msgid "Commit %s is already included in branch %s -- really re-apply it?"
798 msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?"
799
1037 -#: gitk:9535
800 msgid "Cherry-picking"
801 msgstr "Cherry-picking"
802
1041 -#: gitk:9544
803 #, tcl-format
804 msgid ""
805 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1048,7 +809,6 @@ msgstr ""
809 "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente "
810 "novamente."
811
1051 -#: gitk:9550
812 msgid ""
813 "Cherry-pick failed because of merge conflict.\n"
814 "Do you wish to run git citool to resolve it?"
@@ -1056,21 +816,17 @@ msgstr ""
816 "O cherry-pick falhou porque houve um conflito na mesclagem.\n"
817 "Executar o 'git citool' para resolvê-lo?"
818
1059 -#: gitk:9566 gitk:9624
819 msgid "No changes committed"
820 msgstr "Nenhuma revisão foi salva"
821
1063 -#: gitk:9593
822 #, fuzzy, tcl-format
823 msgid "Commit %s is not included in branch %s -- really revert it?"
824 msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?"
825
1068 -#: gitk:9598
826 #, fuzzy
827 msgid "Reverting"
828 msgstr "Redefinindo"
829
1073 -#: gitk:9606
830 #, fuzzy, tcl-format
831 msgid ""
832 "Revert failed because of local changes to the following files:%s Please "
@@ -1080,7 +836,6 @@ msgstr ""
836 "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente "
837 "novamente."
838
1083 -#: gitk:9610
839 #, fuzzy
840 msgid ""
841 "Revert failed because of merge conflict.\n"
@@ -1089,28 +844,22 @@ msgstr ""
844 "O cherry-pick falhou porque houve um conflito na mesclagem.\n"
845 "Executar o 'git citool' para resolvê-lo?"
846
1092 -#: gitk:9653
847 msgid "Confirm reset"
848 msgstr "Confirmar redefinição"
849
1096 -#: gitk:9655
850 #, tcl-format
851 msgid "Reset branch %s to %s?"
852 msgstr "Você realmente deseja redefinir o ramo %s para %s?"
853
1101 -#: gitk:9657
854 msgid "Reset type:"
855 msgstr "Tipo de redefinição"
856
1105 -#: gitk:9660
857 msgid "Soft: Leave working tree and index untouched"
858 msgstr "Soft: deixa a árvore de trabalho e o índice intocados"
859
1109 -#: gitk:9663
860 msgid "Mixed: Leave working tree untouched, reset index"
861 msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o índice"
862
1113 -#: gitk:9666
863 msgid ""
864 "Hard: Reset working tree and index\n"
865 "(discard ALL local changes)"
@@ -1118,19 +867,15 @@ msgstr ""
867 "Hard: Redefine a árvore de trabalho e o índice\n"
868 "(descarta TODAS as mudanças locais)"
869
1121 -#: gitk:9683
870 msgid "Resetting"
871 msgstr "Redefinindo"
872
1125 -#: gitk:9743
873 msgid "Checking out"
874 msgstr "Abrindo"
875
1129 -#: gitk:9796
876 msgid "Cannot delete the currently checked-out branch"
877 msgstr "Impossível excluir o ramo atualmente aberto"
878
1133 -#: gitk:9802
879 #, tcl-format
880 msgid ""
881 "The commits on branch %s aren't on any other branch.\n"
@@ -1139,16 +884,13 @@ msgstr ""
884 "As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n"
885 "Você realmente deseja excluir ramo \"%s\"?"
886
1142 -#: gitk:9833
887 #, tcl-format
888 msgid "Tags and heads: %s"
889 msgstr "Referências: %s"
890
1147 -#: gitk:9850
891 msgid "Filter"
892 msgstr "Filtro"
893
1151 -#: gitk:10146
894 msgid ""
895 "Error reading commit topology information; branch and preceding/following "
896 "tag information will be incomplete."
@@ -1156,221 +898,169 @@ msgstr ""
898 "Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas "
899 "antecessoras/sucessoras estarão incompletas"
900
1159 -#: gitk:11123
901 msgid "Tag"
902 msgstr "Etiqueta"
903
1163 -#: gitk:11127
904 msgid "Id"
905 msgstr "Id"
906
1167 -#: gitk:11210
907 msgid "Gitk font chooser"
908 msgstr "Selecionar fontes do Gitk"
909
1171 -#: gitk:11227
910 msgid "B"
911 msgstr "B"
912
1175 -#: gitk:11230
913 msgid "I"
914 msgstr "I"
915
1179 -#: gitk:11348
916 msgid "Commit list display options"
917 msgstr "Opções da lista de revisões"
918
1183 -#: gitk:11351
919 msgid "Maximum graph width (lines)"
920 msgstr "Largura máxima do grafo (linhas)"
921
1187 -#: gitk:11355
922 #, no-tcl-format
923 msgid "Maximum graph width (% of pane)"
924 msgstr "Largura máxima do grafo (% do painel)"
925
1192 -#: gitk:11358
926 msgid "Show local changes"
927 msgstr "Exibir mudanças locais"
928
1196 -#: gitk:11361
929 #, fuzzy
930 msgid "Auto-select SHA1 (length)"
931 msgstr "Selecionar o SHA1 automaticamente"
932
1201 -#: gitk:11365
933 msgid "Hide remote refs"
934 msgstr "Ocultar referências remotas"
935
1205 -#: gitk:11369
936 msgid "Diff display options"
937 msgstr "Opções de exibição das alterações"
938
1209 -#: gitk:11371
939 msgid "Tab spacing"
940 msgstr "Espaços por tabulação"
941
1213 -#: gitk:11374
942 #, fuzzy
943 msgid "Display nearby tags/heads"
944 msgstr "Exibir etiquetas próximas"
945
1218 -#: gitk:11377
946 msgid "Maximum # tags/heads to show"
947 msgstr ""
948
1222 -#: gitk:11380
949 msgid "Limit diffs to listed paths"
950 msgstr "Limitar diferenças aos caminhos listados"
951
1226 -#: gitk:11383
952 msgid "Support per-file encodings"
953 msgstr "Usar codificações distintas por arquivo"
954
1230 -#: gitk:11389 gitk:11536
955 msgid "External diff tool"
956 msgstr "Ferramenta 'diff' externa"
957
1234 -#: gitk:11390
958 msgid "Choose..."
959 msgstr "Selecionar..."
960
1238 -#: gitk:11395
961 msgid "General options"
962 msgstr "Opções gerais"
963
1242 -#: gitk:11398
964 msgid "Use themed widgets"
965 msgstr "Usar temas para as janelas"
966
1246 -#: gitk:11400
967 msgid "(change requires restart)"
968 msgstr "(exige reinicialização)"
969
1250 -#: gitk:11402
970 msgid "(currently unavailable)"
971 msgstr "(atualmente indisponível)"
972
1254 -#: gitk:11413
973 msgid "Colors: press to choose"
974 msgstr "Cores: clique para escolher"
975
1258 -#: gitk:11416
976 msgid "Interface"
977 msgstr "Interface"
978
1262 -#: gitk:11417
979 msgid "interface"
980 msgstr "interface"
981
1266 -#: gitk:11420
982 msgid "Background"
983 msgstr "Segundo plano"
984
1270 -#: gitk:11421 gitk:11451
985 msgid "background"
986 msgstr "segundo plano"
987
1274 -#: gitk:11424
988 msgid "Foreground"
989 msgstr "Primeiro plano"
990
1278 -#: gitk:11425
991 msgid "foreground"
992 msgstr "primeiro plano"
993
1282 -#: gitk:11428
994 msgid "Diff: old lines"
995 msgstr "Diff: linhas excluídas"
996
1286 -#: gitk:11429
997 msgid "diff old lines"
998 msgstr "linhas excluídas"
999
1290 -#: gitk:11433
1000 msgid "Diff: new lines"
1001 msgstr "Diff: linhas adicionadas"
1002
1294 -#: gitk:11434
1003 msgid "diff new lines"
1004 msgstr "linhas adicionadas"
1005
1298 -#: gitk:11438
1006 msgid "Diff: hunk header"
1007 msgstr "Diff: cabeçalho do bloco"
1008
1302 -#: gitk:11440
1009 msgid "diff hunk header"
1010 msgstr "cabeçalho do bloco"
1011
1306 -#: gitk:11444
1012 msgid "Marked line bg"
1013 msgstr "2º plano da linha marcada"
1014
1310 -#: gitk:11446
1015 msgid "marked line background"
1016 msgstr "segundo plano da linha marcada"
1017
1314 -#: gitk:11450
1018 msgid "Select bg"
1019 msgstr "2º plano da seleção"
1020
1318 -#: gitk:11459
1021 msgid "Fonts: press to choose"
1022 msgstr "Fontes: clique para escolher"
1023
1322 -#: gitk:11461
1024 msgid "Main font"
1025 msgstr "Fonte principal"
1026
1326 -#: gitk:11462
1027 msgid "Diff display font"
1028 msgstr "Fonte da lista de mudanças"
1029
1330 -#: gitk:11463
1030 msgid "User interface font"
1031 msgstr "Fonte da interface"
1032
1334 -#: gitk:11485
1033 msgid "Gitk preferences"
1034 msgstr "Preferências do Gitk"
1035
1338 -#: gitk:11494
1036 #, fuzzy
1037 msgid "General"
1038 msgstr "Gerar"
1039
1343 -#: gitk:11495
1040 msgid "Colors"
1041 msgstr ""
1042
1347 -#: gitk:11496
1043 msgid "Fonts"
1044 msgstr ""
1045
1351 -#: gitk:11546
1046 #, tcl-format
1047 msgid "Gitk: choose color for %s"
1048 msgstr "Gitk: selecionar cor para %s"
1049
1356 -#: gitk:12059
1050 msgid ""
1051 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1052 " Gitk requires at least Tcl/Tk 8.4."
1053 msgstr ""
1054
1362 -#: gitk:12269
1055 msgid "Cannot find a git repository here."
1056 msgstr "Não há nenhum repositório git aqui."
1057
1366 -#: gitk:12316
1058 #, tcl-format
1059 msgid "Ambiguous argument '%s': both revision and filename"
1060 msgstr ""
1061 "O argumento \"%s\" é ambíguo (especifica tanto uma revisão e um nome de "
1062 "arquivo)"
1063
1373 -#: gitk:12328
1064 msgid "Bad arguments to gitk:"
1065 msgstr "Argumentos incorretos para o gitk:"
1066
po/pt_pt.po
-314
@@ -17,33 +17,26 @@ msgstr ""
17 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
18 "X-Generator: Virtaal 0.7.1\n"
19
20 -#: gitk:140
20 msgid "Couldn't get list of unmerged files:"
21 msgstr "Não foi possível obter lista de ficheiros não integrados:"
22
24 -#: gitk:212 gitk:2399
23 msgid "Color words"
24 msgstr "Colorir palavras"
25
28 -#: gitk:217 gitk:2399 gitk:8239 gitk:8272
26 msgid "Markup words"
27 msgstr "Marcar palavras"
28
32 -#: gitk:324
29 msgid "Error parsing revisions:"
30 msgstr "Erro ao analisar revisões:"
31
36 -#: gitk:380
32 msgid "Error executing --argscmd command:"
33 msgstr "Erro ao executar o comando de --argscmd:"
34
40 -#: gitk:393
35 msgid "No files selected: --merge specified but no files are unmerged."
36 msgstr ""
37 "Nenhum ficheiro selecionado: --merge especificado mas não há ficheiros por "
38 "integrar."
39
46 -#: gitk:396
40 msgid ""
41 "No files selected: --merge specified but no unmerged files are within file "
42 "limit."
@@ -51,322 +44,240 @@ msgstr ""
44 "Nenhum ficheiro selecionado: --merge especificado mas não há ficheiros por "
45 "integrar ao nível de ficheiro."
46
54 -#: gitk:418 gitk:566
47 msgid "Error executing git log:"
48 msgstr "Erro ao executar git log:"
49
58 -#: gitk:436 gitk:582
50 msgid "Reading"
51 msgstr "A ler"
52
62 -#: gitk:496 gitk:4544
53 msgid "Reading commits..."
54 msgstr "A ler commits..."
55
66 -#: gitk:499 gitk:1637 gitk:4547
56 msgid "No commits selected"
57 msgstr "Nenhum commit selecionado"
58
70 -#: gitk:1445 gitk:4064 gitk:12469
59 msgid "Command line"
60 msgstr "Linha de comandos"
61
74 -#: gitk:1511
62 msgid "Can't parse git log output:"
63 msgstr "Não é possível analisar a saída de git log:"
64
78 -#: gitk:1740
65 msgid "No commit information available"
66 msgstr "Não há informação disponível sobre o commit"
67
82 -#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554
68 msgid "OK"
69 msgstr "OK"
70
86 -#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704
87 -#: gitk:11275 gitk:11555
71 msgid "Cancel"
72 msgstr "Cancelar"
73
91 -#: gitk:2083
74 msgid "&Update"
75 msgstr "At&ualizar"
76
95 -#: gitk:2084
77 msgid "&Reload"
78 msgstr "&Recarregar"
79
99 -#: gitk:2085
80 msgid "Reread re&ferences"
81 msgstr "Reler re&ferências"
82
103 -#: gitk:2086
83 msgid "&List references"
84 msgstr "&Listar referências"
85
107 -#: gitk:2088
86 msgid "Start git &gui"
87 msgstr "Iniciar git &gui"
88
111 -#: gitk:2090
89 msgid "&Quit"
90 msgstr "&Sair"
91
115 -#: gitk:2082
92 msgid "&File"
93 msgstr "&Ficheiro"
94
119 -#: gitk:2094
95 msgid "&Preferences"
96 msgstr "&Preferências"
97
123 -#: gitk:2093
98 msgid "&Edit"
99 msgstr "&Editar"
100
127 -#: gitk:2098
101 msgid "&New view..."
102 msgstr "&Nova vista..."
103
131 -#: gitk:2099
104 msgid "&Edit view..."
105 msgstr "&Editar vista..."
106
135 -#: gitk:2100
107 msgid "&Delete view"
108 msgstr "Elimina&r vista"
109
139 -#: gitk:2102
110 msgid "&All files"
111 msgstr "&Todos os ficheiros"
112
143 -#: gitk:2097
113 msgid "&View"
114 msgstr "&Ver"
115
147 -#: gitk:2107 gitk:2117
116 msgid "&About gitk"
117 msgstr "&Sobre gitk"
118
151 -#: gitk:2108 gitk:2122
119 msgid "&Key bindings"
120 msgstr "&Atalhos"
121
155 -#: gitk:2106 gitk:2121
122 msgid "&Help"
123 msgstr "&Ajuda"
124
159 -#: gitk:2199 gitk:8671
125 msgid "SHA1 ID:"
126 msgstr "ID SHA1:"
127
163 -#: gitk:2243
128 msgid "Row"
129 msgstr "Linha"
130
167 -#: gitk:2281
131 msgid "Find"
132 msgstr "Procurar"
133
171 -#: gitk:2309
134 msgid "commit"
135 msgstr "commit"
136
175 -#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846
176 -#: gitk:6931
137 msgid "containing:"
138 msgstr "contendo:"
139
180 -#: gitk:2316 gitk:3545 gitk:3550 gitk:4782
140 msgid "touching paths:"
141 msgstr "altera os caminhos:"
142
184 -#: gitk:2317 gitk:4796
143 msgid "adding/removing string:"
144 msgstr "adiciona/remove a cadeia:"
145
188 -#: gitk:2318 gitk:4798
146 msgid "changing lines matching:"
147 msgstr "altera linhas com:"
148
192 -#: gitk:2327 gitk:2329 gitk:4785
149 msgid "Exact"
150 msgstr "Exato"
151
196 -#: gitk:2329 gitk:4873 gitk:6742
152 msgid "IgnCase"
153 msgstr "IgnMaiúsculas"
154
200 -#: gitk:2329 gitk:4755 gitk:4871 gitk:6738
155 msgid "Regexp"
156 msgstr "Expr. regular"
157
204 -#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935
158 msgid "All fields"
159 msgstr "Todos os campos"
160
208 -#: gitk:2332 gitk:4890 gitk:4923 gitk:6805
161 msgid "Headline"
162 msgstr "Cabeçalho"
163
212 -#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408
164 msgid "Comments"
165 msgstr "Comentários"
166
216 -#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849
217 -#: gitk:8864
167 msgid "Author"
168 msgstr "Autor"
169
221 -#: gitk:2333 gitk:4890 gitk:6805 gitk:7345
170 msgid "Committer"
171 msgstr "Committer"
172
225 -#: gitk:2367
173 msgid "Search"
174 msgstr "Pesquisar"
175
229 -#: gitk:2375
176 msgid "Diff"
177 msgstr "Diff"
178
233 -#: gitk:2377
179 msgid "Old version"
180 msgstr "Versão antiga"
181
237 -#: gitk:2379
182 msgid "New version"
183 msgstr "Versão nova"
184
241 -#: gitk:2382
185 msgid "Lines of context"
186 msgstr "Linhas de contexto"
187
245 -#: gitk:2392
188 msgid "Ignore space change"
189 msgstr "Ignorar espaços"
190
249 -#: gitk:2396 gitk:2398 gitk:7978 gitk:8225
191 msgid "Line diff"
192 msgstr "Diff de linha"
193
253 -#: gitk:2463
194 msgid "Patch"
195 msgstr "Patch"
196
257 -#: gitk:2465
197 msgid "Tree"
198 msgstr "Árvore"
199
261 -#: gitk:2635 gitk:2656
200 msgid "Diff this -> selected"
201 msgstr "Diff este -> seleção"
202
265 -#: gitk:2636 gitk:2657
203 msgid "Diff selected -> this"
204 msgstr "Diff seleção -> este"
205
269 -#: gitk:2637 gitk:2658
206 msgid "Make patch"
207 msgstr "Gerar patch"
208
273 -#: gitk:2638 gitk:9273
209 msgid "Create tag"
210 msgstr "Criar tag"
211
277 -#: gitk:2639
212 msgid "Copy commit summary"
213 msgstr "Copiar sumário do commit"
214
281 -#: gitk:2640 gitk:9404
215 msgid "Write commit to file"
216 msgstr "Escrever commit num ficheiro"
217
285 -#: gitk:2641 gitk:9461
218 msgid "Create new branch"
219 msgstr "Criar novo ramo"
220
289 -#: gitk:2642
221 msgid "Cherry-pick this commit"
222 msgstr "Efetuar cherry-pick deste commit"
223
293 -#: gitk:2643
224 msgid "Reset HEAD branch to here"
225 msgstr "Repor ramo HEAD para aqui"
226
297 -#: gitk:2644
227 msgid "Mark this commit"
228 msgstr "Marcar este commit"
229
301 -#: gitk:2645
230 msgid "Return to mark"
231 msgstr "Voltar à marca"
232
305 -#: gitk:2646
233 msgid "Find descendant of this and mark"
234 msgstr "Encontrar descendeste deste e da marca"
235
309 -#: gitk:2647
236 msgid "Compare with marked commit"
237 msgstr "Comparar com o commit marcado"
238
313 -#: gitk:2648 gitk:2659
239 msgid "Diff this -> marked commit"
240 msgstr "Diff este -> commit marcado"
241
317 -#: gitk:2649 gitk:2660
242 msgid "Diff marked commit -> this"
243 msgstr "Diff commit marcado -> este"
244
321 -#: gitk:2650
245 msgid "Revert this commit"
246 msgstr "Reverter este commit"
247
325 -#: gitk:2666
248 msgid "Check out this branch"
249 msgstr "Extrair este ramo"
250
329 -#: gitk:2667
251 msgid "Remove this branch"
252 msgstr "Remover este ramo"
253
333 -#: gitk:2668
254 msgid "Copy branch name"
255 msgstr "Copiar nome do ramo"
256
337 -#: gitk:2675
257 msgid "Highlight this too"
258 msgstr "Realçar este também"
259
341 -#: gitk:2676
260 msgid "Highlight this only"
261 msgstr "Realçar apenas este"
262
345 -#: gitk:2677
263 msgid "External diff"
264 msgstr "Diff externo"
265
349 -#: gitk:2678
266 msgid "Blame parent commit"
267 msgstr "Culpar commit pai"
268
353 -#: gitk:2679
269 msgid "Copy path"
270 msgstr "Copiar caminho"
271
357 -#: gitk:2686
272 msgid "Show origin of this line"
273 msgstr "Mostrar origem deste ficheiro"
274
361 -#: gitk:2687
275 msgid "Run git gui blame on this line"
276 msgstr "Executar git gui blame sobre esta linha"
277
365 -#: gitk:3031
278 msgid "About gitk"
279 msgstr "Sobre gitk"
280
369 -#: gitk:3033
281 msgid ""
282 "\n"
283 "Gitk - a commit viewer for git\n"
@@ -382,323 +293,249 @@ msgstr ""
293 "\n"
294 "Use e redistribua sob os termos da GNU General Public License"
295
385 -#: gitk:3041 gitk:3108 gitk:9890
296 msgid "Close"
297 msgstr "Fechar"
298
389 -#: gitk:3062
299 msgid "Gitk key bindings"
300 msgstr "Atalhos do gitk"
301
393 -#: gitk:3065
302 msgid "Gitk key bindings:"
303 msgstr "Atalhos do gitk:"
304
397 -#: gitk:3067
305 #, tcl-format
306 msgid "<%s-Q>\t\tQuit"
307 msgstr "<%s-Q>\t\tSair"
308
402 -#: gitk:3068
309 #, tcl-format
310 msgid "<%s-W>\t\tClose window"
311 msgstr "<%s-W>\t\tFechar janela"
312
407 -#: gitk:3069
313 msgid "<Home>\t\tMove to first commit"
314 msgstr "<Home>\t\tMover para o primeiro commit"
315
411 -#: gitk:3070
316 msgid "<End>\t\tMove to last commit"
317 msgstr "<End>\t\tMover para o último commit"
318
415 -#: gitk:3071
319 msgid "<Up>, p, k\tMove up one commit"
320 msgstr "<Cima>, p, k\tMover para o commit acima"
321
419 -#: gitk:3072
322 msgid "<Down>, n, j\tMove down one commit"
323 msgstr "<Baixo>, n, j\tMover para o commit abaixo"
324
423 -#: gitk:3073
325 msgid "<Left>, z, h\tGo back in history list"
326 msgstr "<Esquerda>, z, h\tRecuar no histórico"
327
427 -#: gitk:3074
328 msgid "<Right>, x, l\tGo forward in history list"
329 msgstr "<Direita>, x, l\tAvançar no histórico"
330
431 -#: gitk:3075
331 #, tcl-format
332 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
333 msgstr "<%s-n>\tIr para o n-ésimo pai do commit atual no histórico"
334
436 -#: gitk:3076
335 msgid "<PageUp>\tMove up one page in commit list"
336 msgstr "<PageUp>\tMover a lista de commits uma página para cima"
337
440 -#: gitk:3077
338 msgid "<PageDown>\tMove down one page in commit list"
339 msgstr "<PageDown>\tMover a lista de commits uma página para baixo"
340
444 -#: gitk:3078
341 #, tcl-format
342 msgid "<%s-Home>\tScroll to top of commit list"
343 msgstr "<%s-Home>\tDeslocar para o topo da lista"
344
449 -#: gitk:3079
345 #, tcl-format
346 msgid "<%s-End>\tScroll to bottom of commit list"
347 msgstr "<%s-End>\tDeslocar para o fim da lista"
348
454 -#: gitk:3080
349 #, tcl-format
350 msgid "<%s-Up>\tScroll commit list up one line"
351 msgstr "<%s-Cima>\tDeslocar a lista de commits uma linha para cima"
352
459 -#: gitk:3081
353 #, tcl-format
354 msgid "<%s-Down>\tScroll commit list down one line"
355 msgstr "<%s-Baixo>\tDeslocar a lista de commits uma linha para baixo"
356
464 -#: gitk:3082
357 #, tcl-format
358 msgid "<%s-PageUp>\tScroll commit list up one page"
359 msgstr "<%s-PageUp>\tDeslocar a lista de commits uma página para cima"
360
469 -#: gitk:3083
361 #, tcl-format
362 msgid "<%s-PageDown>\tScroll commit list down one page"
363 msgstr "<%s-PageDown>\tDeslocar a lista de commits uma página para baixo"
364
474 -#: gitk:3084
365 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
366 msgstr "<Shift-Cima>\tProcurar para trás (para cima, commits posteriores)"
367
478 -#: gitk:3085
368 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
369 msgstr "<Shift-Baixo>\tProcurar para a frente (para baixo, commits anteriores)"
370
482 -#: gitk:3086
371 msgid "<Delete>, b\tScroll diff view up one page"
372 msgstr "<Delete>, b\tDeslocar vista diff uma página para cima"
373
486 -#: gitk:3087
374 msgid "<Backspace>\tScroll diff view up one page"
375 msgstr "<Retrocesso>\tDeslocar vista diff uma página para cima"
376
490 -#: gitk:3088
377 msgid "<Space>\t\tScroll diff view down one page"
378 msgstr "<Espaço>\tDeslocar vista diff uma página para baixo"
379
494 -#: gitk:3089
380 msgid "u\t\tScroll diff view up 18 lines"
381 msgstr "u\t\tDeslocar vista diff 18 linhas para cima"
382
498 -#: gitk:3090
383 msgid "d\t\tScroll diff view down 18 lines"
384 msgstr "d\t\tDeslocar vista diff 18 linhas para baixo"
385
502 -#: gitk:3091
386 #, tcl-format
387 msgid "<%s-F>\t\tFind"
388 msgstr "<%s-F>\t\tProcurar"
389
507 -#: gitk:3092
390 #, tcl-format
391 msgid "<%s-G>\t\tMove to next find hit"
392 msgstr "<%s-G>\t\tMover para a ocorrência seguinte"
393
512 -#: gitk:3093
394 msgid "<Return>\tMove to next find hit"
395 msgstr "<Return>\tMover para a ocorrência seguinte"
396
516 -#: gitk:3094
397 msgid "g\t\tGo to commit"
398 msgstr "g\t\tIr para o commit"
399
520 -#: gitk:3095
400 msgid "/\t\tFocus the search box"
401 msgstr "/\t\tFocar a caixa de pesquisa"
402
524 -#: gitk:3096
403 msgid "?\t\tMove to previous find hit"
404 msgstr "?\t\tMover para a ocorrência anterior"
405
528 -#: gitk:3097
406 msgid "f\t\tScroll diff view to next file"
407 msgstr "f\t\tDeslocar vista diff para o ficheiro seguinte"
408
532 -#: gitk:3098
409 #, tcl-format
410 msgid "<%s-S>\t\tSearch for next hit in diff view"
411 msgstr "<%s-S>\t\tProcurar pela ocorrência seguinte na vista diff"
412
537 -#: gitk:3099
413 #, tcl-format
414 msgid "<%s-R>\t\tSearch for previous hit in diff view"
415 msgstr "<%s-R>\t\tProcurar pela ocorrência anterior na vista diff"
416
542 -#: gitk:3100
417 #, tcl-format
418 msgid "<%s-KP+>\tIncrease font size"
419 msgstr "<%s-KP+>\tAumentar o tamanho da letra"
420
547 -#: gitk:3101
421 #, tcl-format
422 msgid "<%s-plus>\tIncrease font size"
423 msgstr "<%s-mais>\tAumentar o tamanho da letra"
424
552 -#: gitk:3102
425 #, tcl-format
426 msgid "<%s-KP->\tDecrease font size"
427 msgstr "<%s-KP->\tDiminuir o tamanho da letra"
428
557 -#: gitk:3103
429 #, tcl-format
430 msgid "<%s-minus>\tDecrease font size"
431 msgstr "<%s-menos>\tDiminuir o tamanho da letra"
432
562 -#: gitk:3104
433 msgid "<F5>\t\tUpdate"
434 msgstr "<F5>\t\tAtualizar"
435
566 -#: gitk:3569 gitk:3578
436 #, tcl-format
437 msgid "Error creating temporary directory %s:"
438 msgstr "Erro ao criar ficheiro temporário %s:"
439
571 -#: gitk:3591
440 #, tcl-format
441 msgid "Error getting \"%s\" from %s:"
442 msgstr "Erro ao obter \"%s\" de %s:"
443
576 -#: gitk:3654
444 msgid "command failed:"
445 msgstr "o comando falhou:"
446
580 -#: gitk:3803
447 msgid "No such commit"
448 msgstr "Commit inexistente"
449
584 -#: gitk:3817
450 msgid "git gui blame: command failed:"
451 msgstr "git gui blame: o comando falhou:"
452
588 -#: gitk:3848
453 #, tcl-format
454 msgid "Couldn't read merge head: %s"
455 msgstr "Não foi possível ler a cabeça de integração: %s"
456
593 -#: gitk:3856
457 #, tcl-format
458 msgid "Error reading index: %s"
459 msgstr "Erro ao ler o índice: %s"
460
598 -#: gitk:3881
461 #, tcl-format
462 msgid "Couldn't start git blame: %s"
463 msgstr "Não foi possível iniciar git blame: %s"
464
603 -#: gitk:3884 gitk:6773
465 msgid "Searching"
466 msgstr "A procurar"
467
607 -#: gitk:3916
468 #, tcl-format
469 msgid "Error running git blame: %s"
470 msgstr "Erro ao executar git blame: %s"
471
612 -#: gitk:3944
472 #, tcl-format
473 msgid "That line comes from commit %s, which is not in this view"
474 msgstr "Essa linha provém do commit %s, que não está nesta vista"
475
617 -#: gitk:3958
476 msgid "External diff viewer failed:"
477 msgstr "Visualizador diff externo falhou:"
478
621 -#: gitk:4062
479 msgid "All files"
480 msgstr "Todos os ficheiros"
481
625 -#: gitk:4086
482 msgid "View"
483 msgstr "Vista"
484
629 -#: gitk:4089
485 msgid "Gitk view definition"
486 msgstr "Definição de vistas do gitk"
487
633 -#: gitk:4093
488 msgid "Remember this view"
489 msgstr "Recordar esta vista"
490
637 -#: gitk:4094
491 msgid "References (space separated list):"
492 msgstr "Referências (lista separada por espaço):"
493
641 -#: gitk:4095
494 msgid "Branches & tags:"
495 msgstr "Ramos e tags:"
496
645 -#: gitk:4096
497 msgid "All refs"
498 msgstr "Todas as referências"
499
649 -#: gitk:4097
500 msgid "All (local) branches"
501 msgstr "Todos os ramos (locais)"
502
653 -#: gitk:4098
503 msgid "All tags"
504 msgstr "Todas as tags"
505
657 -#: gitk:4099
506 msgid "All remote-tracking branches"
507 msgstr "Todos os ramos remotos de monitorização"
508
661 -#: gitk:4100
509 msgid "Commit Info (regular expressions):"
510 msgstr "Informação Sobre o Commit (expressões regulares):"
511
665 -#: gitk:4101
512 msgid "Author:"
513 msgstr "Autor:"
514
669 -#: gitk:4102
515 msgid "Committer:"
516 msgstr "Committer:"
517
673 -#: gitk:4103
518 msgid "Commit Message:"
519 msgstr "Mensagem de Commit:"
520
677 -#: gitk:4104
521 msgid "Matches all Commit Info criteria"
522 msgstr "Corresponde a todos os critérios da Informação Sobre o Commit"
523
681 -#: gitk:4105
524 msgid "Matches no Commit Info criteria"
525 msgstr "Não corresponde a nenhum critério da Informação Sobre o Commit"
526
685 -#: gitk:4106
527 msgid "Changes to Files:"
528 msgstr "Alterações nos Ficheiros:"
529
689 -#: gitk:4107
530 msgid "Fixed String"
531 msgstr "Cadeia Fixa"
532
693 -#: gitk:4108
533 msgid "Regular Expression"
534 msgstr "Expressão Regular"
535
697 -#: gitk:4109
536 msgid "Search string:"
537 msgstr "Procurar pela cadeia:"
538
701 -#: gitk:4110
539 msgid ""
540 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
541 "15:27:38\"):"
@@ -706,201 +543,153 @@ msgstr ""
543 "Datas de Commit (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
544 "15:27:38\"):"
545
709 -#: gitk:4111
546 msgid "Since:"
547 msgstr "Desde:"
548
713 -#: gitk:4112
549 msgid "Until:"
550 msgstr "Até:"
551
717 -#: gitk:4113
552 msgid "Limit and/or skip a number of revisions (positive integer):"
553 msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):"
554
721 -#: gitk:4114
555 msgid "Number to show:"
556 msgstr "Número a mostrar:"
557
725 -#: gitk:4115
558 msgid "Number to skip:"
559 msgstr "Número a ignorar:"
560
729 -#: gitk:4116
561 msgid "Miscellaneous options:"
562 msgstr "Opções diversas:"
563
733 -#: gitk:4117
564 msgid "Strictly sort by date"
565 msgstr "Ordenar estritamente pela data"
566
737 -#: gitk:4118
567 msgid "Mark branch sides"
568 msgstr "Marcar lado dos ramos"
569
741 -#: gitk:4119
570 msgid "Limit to first parent"
571 msgstr "Restringir ao primeiro pai"
572
745 -#: gitk:4120
573 msgid "Simple history"
574 msgstr "Histórico simples"
575
749 -#: gitk:4121
576 msgid "Additional arguments to git log:"
577 msgstr "Argumentos adicionais ao git log:"
578
753 -#: gitk:4122
579 msgid "Enter files and directories to include, one per line:"
580 msgstr "Introduza ficheiros e diretórios para incluir, um por linha:"
581
757 -#: gitk:4123
582 msgid "Command to generate more commits to include:"
583 msgstr "Comando para gerar mais commits para incluir:"
584
761 -#: gitk:4247
585 msgid "Gitk: edit view"
586 msgstr "Gitk: editar vista"
587
765 -#: gitk:4255
588 msgid "-- criteria for selecting revisions"
589 msgstr "-- critério para selecionar revisões"
590
769 -#: gitk:4260
591 msgid "View Name"
592 msgstr "Nome da Vista"
593
773 -#: gitk:4335
594 msgid "Apply (F5)"
595 msgstr "Aplicar (F5)"
596
777 -#: gitk:4373
597 msgid "Error in commit selection arguments:"
598 msgstr "Erro nos argumentos de seleção de commits:"
599
781 -#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411
600 msgid "None"
601 msgstr "Nenhum"
602
785 -#: gitk:5040 gitk:5045
603 msgid "Descendant"
604 msgstr "Descendente"
605
789 -#: gitk:5041
606 msgid "Not descendant"
607 msgstr "Não descendente"
608
793 -#: gitk:5048 gitk:5053
609 msgid "Ancestor"
610 msgstr "Antecessor"
611
797 -#: gitk:5049
612 msgid "Not ancestor"
613 msgstr "Não antecessor"
614
801 -#: gitk:5343
615 msgid "Local changes checked in to index but not committed"
616 msgstr "Alterações locais preparadas no índice mas não submetidas"
617
805 -#: gitk:5379
618 msgid "Local uncommitted changes, not checked in to index"
619 msgstr "Alterações locais não submetidas, não preparadas no índice"
620
809 -#: gitk:7153
621 msgid "and many more"
622 msgstr "e muitos mais"
623
813 -#: gitk:7156
624 msgid "many"
625 msgstr "muitos"
626
817 -#: gitk:7347
627 msgid "Tags:"
628 msgstr "Tags:"
629
821 -#: gitk:7364 gitk:7370 gitk:8844
630 msgid "Parent"
631 msgstr "Pai"
632
825 -#: gitk:7375
633 msgid "Child"
634 msgstr "Filho"
635
829 -#: gitk:7384
636 msgid "Branch"
637 msgstr "Ramo"
638
833 -#: gitk:7387
639 msgid "Follows"
640 msgstr "Sucede"
641
837 -#: gitk:7390
642 msgid "Precedes"
643 msgstr "Precede"
644
841 -#: gitk:7985
645 #, tcl-format
646 msgid "Error getting diffs: %s"
647 msgstr "Erro ao obter diferenças: %s"
648
846 -#: gitk:8669
649 msgid "Goto:"
650 msgstr "Ir para:"
651
850 -#: gitk:8690
652 #, tcl-format
653 msgid "Short SHA1 id %s is ambiguous"
654 msgstr "O id SHA1 abreviado %s é ambíguo"
655
855 -#: gitk:8697
656 #, tcl-format
657 msgid "Revision %s is not known"
658 msgstr "A revisão %s não é conhecida"
659
860 -#: gitk:8707
660 #, tcl-format
661 msgid "SHA1 id %s is not known"
662 msgstr "O id SHA1 %s não é conhecido"
663
865 -#: gitk:8709
664 #, tcl-format
665 msgid "Revision %s is not in the current view"
666 msgstr "A revisão %s não se encontra na vista atual"
667
870 -#: gitk:8851 gitk:8866
668 msgid "Date"
669 msgstr "Data"
670
874 -#: gitk:8854
671 msgid "Children"
672 msgstr "Filhos"
673
878 -#: gitk:8917
674 #, tcl-format
675 msgid "Reset %s branch to here"
676 msgstr "Repor o ramo %s para aqui"
677
883 -#: gitk:8919
678 msgid "Detached head: can't reset"
679 msgstr "Cabeça destacada: não é possível repor"
680
887 -#: gitk:9024 gitk:9030
681 msgid "Skipping merge commit "
682 msgstr "A ignorar commit de integração "
683
891 -#: gitk:9039 gitk:9044
684 msgid "Error getting patch ID for "
685 msgstr "Erro ao obter ID de patch de "
686
895 -#: gitk:9040 gitk:9045
687 msgid " - stopping\n"
688 msgstr " - a interromper\n"
689
899 -#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084
690 msgid "Commit "
691 msgstr "Commit "
692
903 -#: gitk:9054
693 msgid ""
694 " is the same patch as\n"
695 " "
@@ -908,7 +697,6 @@ msgstr ""
697 " é o mesmo patch que\n"
698 " "
699
911 -#: gitk:9062
700 msgid ""
701 " differs from\n"
702 " "
@@ -916,7 +704,6 @@ msgstr ""
704 " difere de\n"
705 " "
706
919 -#: gitk:9064
707 msgid ""
708 "Diff of commits:\n"
709 "\n"
@@ -924,129 +711,99 @@ msgstr ""
711 "Diferença dos commits:\n"
712 "\n"
713
927 -#: gitk:9076 gitk:9085
714 #, tcl-format
715 msgid " has %s children - stopping\n"
716 msgstr " tem %s filhos - a interromper\n"
717
932 -#: gitk:9104
718 #, tcl-format
719 msgid "Error writing commit to file: %s"
720 msgstr "Erro ao escrever commit no ficheiro: %s"
721
937 -#: gitk:9110
722 #, tcl-format
723 msgid "Error diffing commits: %s"
724 msgstr "Erro ao calcular as diferenças dos commits: %s"
725
942 -#: gitk:9156
726 msgid "Top"
727 msgstr "Topo"
728
946 -#: gitk:9157
729 msgid "From"
730 msgstr "De"
731
950 -#: gitk:9162
732 msgid "To"
733 msgstr "Para"
734
954 -#: gitk:9186
735 msgid "Generate patch"
736 msgstr "Gerar patch"
737
958 -#: gitk:9188
738 msgid "From:"
739 msgstr "De:"
740
962 -#: gitk:9197
741 msgid "To:"
742 msgstr "Para:"
743
966 -#: gitk:9206
744 msgid "Reverse"
745 msgstr "Reverter"
746
970 -#: gitk:9208 gitk:9418
747 msgid "Output file:"
748 msgstr "Ficheiro de saída:"
749
974 -#: gitk:9214
750 msgid "Generate"
751 msgstr "Gerar"
752
978 -#: gitk:9252
753 msgid "Error creating patch:"
754 msgstr "Erro ao criar patch:"
755
982 -#: gitk:9275 gitk:9406 gitk:9463
756 msgid "ID:"
757 msgstr "ID:"
758
986 -#: gitk:9284
759 msgid "Tag name:"
760 msgstr "Nome da tag:"
761
990 -#: gitk:9287
762 msgid "Tag message is optional"
763 msgstr "A mensagem da tag é opcional"
764
994 -#: gitk:9289
765 msgid "Tag message:"
766 msgstr "Mensagem da tag:"
767
998 -#: gitk:9293 gitk:9472
768 msgid "Create"
769 msgstr "Criar"
770
1002 -#: gitk:9311
771 msgid "No tag name specified"
772 msgstr "Nenhum nome de tag especificado"
773
1006 -#: gitk:9315
774 #, tcl-format
775 msgid "Tag \"%s\" already exists"
776 msgstr "A tag \"%s\" já existe"
777
1011 -#: gitk:9325
778 msgid "Error creating tag:"
779 msgstr "Erro ao criar tag:"
780
1015 -#: gitk:9415
781 msgid "Command:"
782 msgstr "Comando:"
783
1019 -#: gitk:9423
784 msgid "Write"
785 msgstr "Escrever"
786
1023 -#: gitk:9441
787 msgid "Error writing commit:"
788 msgstr "Erro ao escrever commit:"
789
1027 -#: gitk:9468
790 msgid "Name:"
791 msgstr "Nome:"
792
1031 -#: gitk:9491
793 msgid "Please specify a name for the new branch"
794 msgstr "Especifique um nome para o novo ramo"
795
1035 -#: gitk:9496
796 #, tcl-format
797 msgid "Branch '%s' already exists. Overwrite?"
798 msgstr "O ramo '%s' já existe. Substituí-lo?"
799
1040 -#: gitk:9563
800 #, tcl-format
801 msgid "Commit %s is already included in branch %s -- really re-apply it?"
802 msgstr "O commit %s já está incluído no ramo %s -- reaplicá-lo mesmo assim?"
803
1045 -#: gitk:9568
804 msgid "Cherry-picking"
805 msgstr "A efetuar cherry-pick"
806
1049 -#: gitk:9577
807 #, tcl-format
808 msgid ""
809 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1055,7 +812,6 @@ msgstr ""
812 "Falha ao efetuar cherry-pick devido a alterações locais no ficheiro '%s'.\n"
813 "Submeta, empilhe ou reponha as alterações e tente de novo."
814
1058 -#: gitk:9583
815 msgid ""
816 "Cherry-pick failed because of merge conflict.\n"
817 "Do you wish to run git citool to resolve it?"
@@ -1063,20 +819,16 @@ msgstr ""
819 "Falha ao efetuar cherry-pick devido a conflito de integração.\n"
820 "Deseja executar git citool para resolvê-lo?"
821
1066 -#: gitk:9599 gitk:9657
822 msgid "No changes committed"
823 msgstr "Não foi submetida nenhum alteração"
824
1070 -#: gitk:9626
825 #, tcl-format
826 msgid "Commit %s is not included in branch %s -- really revert it?"
827 msgstr "O commit %s não está incluído no ramo %s -- revertê-lo mesmo assim?"
828
1075 -#: gitk:9631
829 msgid "Reverting"
830 msgstr "A reverter"
831
1079 -#: gitk:9639
832 #, tcl-format
833 msgid ""
834 "Revert failed because of local changes to the following files:%s Please "
@@ -1085,7 +837,6 @@ msgstr ""
837 "Falha ao reverter devido a alterações locais nos seguintes ficheiros:%s "
838 "Submeta, empilhe ou reponha as alterações e tente de novo."
839
1088 -#: gitk:9643
840 msgid ""
841 "Revert failed because of merge conflict.\n"
842 " Do you wish to run git citool to resolve it?"
@@ -1093,28 +844,22 @@ msgstr ""
844 "Falha ao reverter devido a conflito de integração.\n"
845 "Deseja executar git citool para resolvê-lo?"
846
1096 -#: gitk:9686
847 msgid "Confirm reset"
848 msgstr "Confirmar reposição"
849
1100 -#: gitk:9688
850 #, tcl-format
851 msgid "Reset branch %s to %s?"
852 msgstr "Repor o ramo %s para %s?"
853
1105 -#: gitk:9690
854 msgid "Reset type:"
855 msgstr "Tipo de reposição:"
856
1109 -#: gitk:9693
857 msgid "Soft: Leave working tree and index untouched"
858 msgstr "Suave: Deixar a árvore de trabalho e o índice intactos"
859
1113 -#: gitk:9696
860 msgid "Mixed: Leave working tree untouched, reset index"
861 msgstr "Misto: Deixar a árvore de trabalho intacta, repor índice"
862
1117 -#: gitk:9699
863 msgid ""
864 "Hard: Reset working tree and index\n"
865 "(discard ALL local changes)"
@@ -1122,19 +867,15 @@ msgstr ""
867 "Forte: Repor árvore de trabalho e índice\n"
868 "(descartar TODAS as alterações locais)"
869
1125 -#: gitk:9716
870 msgid "Resetting"
871 msgstr "A repor"
872
1129 -#: gitk:9776
873 msgid "Checking out"
874 msgstr "A extrair"
875
1133 -#: gitk:9829
876 msgid "Cannot delete the currently checked-out branch"
877 msgstr "Não é possível eliminar o ramo atual extraído"
878
1137 -#: gitk:9835
879 #, tcl-format
880 msgid ""
881 "The commits on branch %s aren't on any other branch.\n"
@@ -1143,16 +884,13 @@ msgstr ""
884 "Os commits no ramo %s não estão presentes em mais nenhum ramo.\n"
885 "Eliminar o ramo %s mesmo assim?"
886
1146 -#: gitk:9866
887 #, tcl-format
888 msgid "Tags and heads: %s"
889 msgstr "Tags e cabeças: %s"
890
1151 -#: gitk:9883
891 msgid "Filter"
892 msgstr "Filtrar"
893
1155 -#: gitk:10179
894 msgid ""
895 "Error reading commit topology information; branch and preceding/following "
896 "tag information will be incomplete."
@@ -1160,201 +898,152 @@ msgstr ""
898 "Erro ao ler informação de topologia do commit; a informação do ramo e da tag "
899 "precedente/seguinte ficará incompleta."
900
1163 -#: gitk:11156
901 msgid "Tag"
902 msgstr "Tag"
903
1167 -#: gitk:11160
904 msgid "Id"
905 msgstr "Id"
906
1171 -#: gitk:11243
907 msgid "Gitk font chooser"
908 msgstr "Escolha de tipo de letra do gitk"
909
1175 -#: gitk:11260
910 msgid "B"
911 msgstr "B"
912
1179 -#: gitk:11263
913 msgid "I"
914 msgstr "I"
915
1183 -#: gitk:11381
916 msgid "Commit list display options"
917 msgstr "Opções de visualização da lista de commits"
918
1187 -#: gitk:11384
919 msgid "Maximum graph width (lines)"
920 msgstr "Largura máxima do gráfico (linhas)"
921
1191 -#: gitk:11388
922 #, no-tcl-format
923 msgid "Maximum graph width (% of pane)"
924 msgstr "Largura máxima do gráfico (% do painel)"
925
1196 -#: gitk:11391
926 msgid "Show local changes"
927 msgstr "Mostrar alterações locais"
928
1200 -#: gitk:11394
929 msgid "Auto-select SHA1 (length)"
930 msgstr "Selecionar automaticamente SHA1 (largura)"
931
1204 -#: gitk:11398
932 msgid "Hide remote refs"
933 msgstr "Ocultar referências remotas"
934
1208 -#: gitk:11402
935 msgid "Diff display options"
936 msgstr "Opções de visualização de diferenças"
937
1212 -#: gitk:11404
938 msgid "Tab spacing"
939 msgstr "Espaçamento da tabulação"
940
1216 -#: gitk:11407
941 msgid "Display nearby tags/heads"
942 msgstr "Mostrar tags/cabeças próximas"
943
1220 -#: gitk:11410
944 msgid "Maximum # tags/heads to show"
945 msgstr "Nº máximo de tags/cabeças a mostrar"
946
1224 -#: gitk:11413
947 msgid "Limit diffs to listed paths"
948 msgstr "Limitar diferenças aos caminhos listados"
949
1228 -#: gitk:11416
950 msgid "Support per-file encodings"
951 msgstr "Suportar codificação por cada ficheiro"
952
1232 -#: gitk:11422 gitk:11569
953 msgid "External diff tool"
954 msgstr "Ferramenta diff externa"
955
1236 -#: gitk:11423
956 msgid "Choose..."
957 msgstr "Escolher..."
958
1240 -#: gitk:11428
959 msgid "General options"
960 msgstr "Opções gerais"
961
1244 -#: gitk:11431
962 msgid "Use themed widgets"
963 msgstr "Usar widgets com estilo"
964
1248 -#: gitk:11433
965 msgid "(change requires restart)"
966 msgstr "(alteração exige reiniciar)"
967
1252 -#: gitk:11435
968 msgid "(currently unavailable)"
969 msgstr "(não disponível de momento)"
970
1256 -#: gitk:11446
971 msgid "Colors: press to choose"
972 msgstr "Cores: pressione para escolher"
973
1260 -#: gitk:11449
974 msgid "Interface"
975 msgstr "Interface"
976
1264 -#: gitk:11450
977 msgid "interface"
978 msgstr "interface"
979
1268 -#: gitk:11453
980 msgid "Background"
981 msgstr "Fundo"
982
1272 -#: gitk:11454 gitk:11484
983 msgid "background"
984 msgstr "fundo"
985
1276 -#: gitk:11457
986 msgid "Foreground"
987 msgstr "Primeiro plano"
988
1280 -#: gitk:11458
989 msgid "foreground"
990 msgstr "primeiro plano"
991
1284 -#: gitk:11461
992 msgid "Diff: old lines"
993 msgstr "Diff: linhas antigas"
994
1288 -#: gitk:11462
995 msgid "diff old lines"
996 msgstr "diff linhas antigas"
997
1292 -#: gitk:11466
998 msgid "Diff: new lines"
999 msgstr "Diff: linhas novas"
1000
1296 -#: gitk:11467
1001 msgid "diff new lines"
1002 msgstr "diff linhas novas"
1003
1300 -#: gitk:11471
1004 msgid "Diff: hunk header"
1005 msgstr "Diff: cabeçalho do excerto"
1006
1304 -#: gitk:11473
1007 msgid "diff hunk header"
1008 msgstr "diff cabeçalho do excerto"
1009
1308 -#: gitk:11477
1010 msgid "Marked line bg"
1011 msgstr "Fundo da linha marcada"
1012
1312 -#: gitk:11479
1013 msgid "marked line background"
1014 msgstr "fundo da linha marcada"
1015
1316 -#: gitk:11483
1016 msgid "Select bg"
1017 msgstr "Selecionar fundo"
1018
1320 -#: gitk:11492
1019 msgid "Fonts: press to choose"
1020 msgstr "Tipo de letra: pressione para escolher"
1021
1324 -#: gitk:11494
1022 msgid "Main font"
1023 msgstr "Tipo de letra principal"
1024
1328 -#: gitk:11495
1025 msgid "Diff display font"
1026 msgstr "Tipo de letra ao mostrar diferenças"
1027
1332 -#: gitk:11496
1028 msgid "User interface font"
1029 msgstr "Tipo de letra da interface de utilizador"
1030
1336 -#: gitk:11518
1031 msgid "Gitk preferences"
1032 msgstr "Preferências do gitk"
1033
1340 -#: gitk:11527
1034 msgid "General"
1035 msgstr "Geral"
1036
1344 -#: gitk:11528
1037 msgid "Colors"
1038 msgstr "Cores"
1039
1348 -#: gitk:11529
1040 msgid "Fonts"
1041 msgstr "Tipos de letra"
1042
1352 -#: gitk:11579
1043 #, tcl-format
1044 msgid "Gitk: choose color for %s"
1045 msgstr "Gitk: escolher cor de %s"
1046
1357 -#: gitk:12092
1047 msgid ""
1048 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1049 " Gitk requires at least Tcl/Tk 8.4."
@@ -1362,15 +1051,12 @@ msgstr ""
1051 "Não é possível executar o gitk com esta versão do Tcl/Tk.\n"
1052 "O gitk requer pelo menos Tcl/Tk 8.4."
1053
1365 -#: gitk:12302
1054 msgid "Cannot find a git repository here."
1055 msgstr "Não foi encontrado nenhum repositório git aqui."
1056
1369 -#: gitk:12349
1057 #, tcl-format
1058 msgid "Ambiguous argument '%s': both revision and filename"
1059 msgstr "Argumento '%s' ambíguo: pode ser uma revisão ou um ficheiro"
1060
1374 -#: gitk:12361
1061 msgid "Bad arguments to gitk:"
1062 msgstr "Argumentos do gitk incorretos:"
po/ru.po
+57 -338
@@ -13,363 +13,280 @@ msgstr ""
13 "POT-Creation-Date: 2016-12-15 00:18+0200\n"
14 "PO-Revision-Date: 2016-12-14 22:23+0000\n"
15 "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
16 -"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
16 +"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/"
17 +"ru/)\n"
18 "MIME-Version: 1.0\n"
19 "Content-Type: text/plain; charset=UTF-8\n"
20 "Content-Transfer-Encoding: 8bit\n"
21 "Language: ru\n"
21 -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
22 +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
23 +"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
24 +"(n%100>=11 && n%100<=14)? 2 : 3);\n"
25
23 -#: gitk:140
26 msgid "Couldn't get list of unmerged files:"
27 msgstr "Невозможно получить список файлов незавершённой операции слияния:"
28
27 -#: gitk:212 gitk:2403
29 msgid "Color words"
30 msgstr "Цветные слова"
31
31 -#: gitk:217 gitk:2403 gitk:8249 gitk:8282
32 msgid "Markup words"
33 msgstr "Помеченые слова"
34
35 -#: gitk:324
35 msgid "Error parsing revisions:"
36 msgstr "Ошибка при разборе редакции:"
37
39 -#: gitk:380
38 msgid "Error executing --argscmd command:"
39 msgstr "Ошибка выполнения команды заданной --argscmd:"
40
43 -#: gitk:393
41 msgid "No files selected: --merge specified but no files are unmerged."
45 -msgstr "Файлы не выбраны: указан --merge, но не было найдено ни одного файла где эта операция должна быть завершена."
42 +msgstr ""
43 +"Файлы не выбраны: указан --merge, но не было найдено ни одного файла где эта "
44 +"операция должна быть завершена."
45
47 -#: gitk:396
46 msgid ""
47 "No files selected: --merge specified but no unmerged files are within file "
48 "limit."
51 -msgstr "Файлы не выбраны: указан --merge, но в рамках указанного ограничения на имена файлов нет ни одного где эта операция должна быть завершена."
49 +msgstr ""
50 +"Файлы не выбраны: указан --merge, но в рамках указанного ограничения на "
51 +"имена файлов нет ни одного где эта операция должна быть завершена."
52
53 -#: gitk:418 gitk:566
53 msgid "Error executing git log:"
54 msgstr "Ошибка запуска git log:"
55
57 -#: gitk:436 gitk:582
56 msgid "Reading"
57 msgstr "Чтение"
58
61 -#: gitk:496 gitk:4549
59 msgid "Reading commits..."
60 msgstr "Чтение коммитов..."
61
65 -#: gitk:499 gitk:1641 gitk:4552
62 msgid "No commits selected"
63 msgstr "Ничего не выбрано"
64
69 -#: gitk:1449 gitk:4069 gitk:12583
65 msgid "Command line"
66 msgstr "Командная строка"
67
73 -#: gitk:1515
68 msgid "Can't parse git log output:"
69 msgstr "Ошибка обработки вывода команды git log:"
70
77 -#: gitk:1744
71 msgid "No commit information available"
72 msgstr "Нет информации о коммите"
73
81 -#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668
74 msgid "OK"
75 msgstr "Ok"
76
85 -#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791
86 -#: gitk:11389 gitk:11669
77 msgid "Cancel"
78 msgstr "Отмена"
79
90 -#: gitk:2087
80 msgid "&Update"
81 msgstr "Обновить"
82
94 -#: gitk:2088
83 msgid "&Reload"
84 msgstr "Перечитать"
85
98 -#: gitk:2089
86 msgid "Reread re&ferences"
87 msgstr "Обновить список ссылок"
88
102 -#: gitk:2090
89 msgid "&List references"
90 msgstr "Список ссылок"
91
106 -#: gitk:2092
92 msgid "Start git &gui"
93 msgstr "Запустить git gui"
94
110 -#: gitk:2094
95 msgid "&Quit"
96 msgstr "Завершить"
97
114 -#: gitk:2086
98 msgid "&File"
99 msgstr "Файл"
100
118 -#: gitk:2098
101 msgid "&Preferences"
102 msgstr "Настройки"
103
122 -#: gitk:2097
104 msgid "&Edit"
105 msgstr "Редактировать"
106
126 -#: gitk:2102
107 msgid "&New view..."
108 msgstr "Новое представление..."
109
130 -#: gitk:2103
110 msgid "&Edit view..."
111 msgstr "Редактировать представление..."
112
134 -#: gitk:2104
113 msgid "&Delete view"
114 msgstr "Удалить представление"
115
138 -#: gitk:2106
116 msgid "&All files"
117 msgstr "Все файлы"
118
142 -#: gitk:2101
119 msgid "&View"
120 msgstr "Представление"
121
146 -#: gitk:2111 gitk:2121
122 msgid "&About gitk"
123 msgstr "О gitk"
124
150 -#: gitk:2112 gitk:2126
125 msgid "&Key bindings"
126 msgstr "Назначения клавиатуры"
127
154 -#: gitk:2110 gitk:2125
128 msgid "&Help"
129 msgstr "Подсказка"
130
158 -#: gitk:2203 gitk:8681
131 msgid "SHA1 ID:"
132 msgstr "SHA1 ID:"
133
162 -#: gitk:2247
134 msgid "Row"
135 msgstr "Строка"
136
166 -#: gitk:2285
137 msgid "Find"
138 msgstr "Поиск"
139
170 -#: gitk:2313
140 msgid "commit"
141 msgstr "коммит"
142
174 -#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851
175 -#: gitk:6936
143 msgid "containing:"
144 msgstr "содержащее:"
145
179 -#: gitk:2320 gitk:3550 gitk:3555 gitk:4787
146 msgid "touching paths:"
147 msgstr "касательно файлов:"
148
183 -#: gitk:2321 gitk:4801
149 msgid "adding/removing string:"
150 msgstr "добавив/удалив строку:"
151
187 -#: gitk:2322 gitk:4803
152 msgid "changing lines matching:"
153 msgstr "изменяя совпадающие строки:"
154
191 -#: gitk:2331 gitk:2333 gitk:4790
155 msgid "Exact"
156 msgstr "Точно"
157
195 -#: gitk:2333 gitk:4878 gitk:6747
158 msgid "IgnCase"
159 msgstr "Игнорировать большие/маленькие"
160
199 -#: gitk:2333 gitk:4760 gitk:4876 gitk:6743
161 msgid "Regexp"
162 msgstr "Регулярные выражения"
163
203 -#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940
164 msgid "All fields"
165 msgstr "Во всех полях"
166
207 -#: gitk:2336 gitk:4895 gitk:4928 gitk:6810
167 msgid "Headline"
168 msgstr "Заголовок"
169
211 -#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413
170 msgid "Comments"
171 msgstr "Комментарии"
172
215 -#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859
216 -#: gitk:8874
173 msgid "Author"
174 msgstr "Автор"
175
220 -#: gitk:2337 gitk:4895 gitk:6810 gitk:7350
176 msgid "Committer"
177 msgstr "Коммитер"
178
224 -#: gitk:2371
179 msgid "Search"
180 msgstr "Найти"
181
228 -#: gitk:2379
182 msgid "Diff"
183 msgstr "Сравнить"
184
232 -#: gitk:2381
185 msgid "Old version"
186 msgstr "Старая версия"
187
236 -#: gitk:2383
188 msgid "New version"
189 msgstr "Новая версия"
190
240 -#: gitk:2386
191 msgid "Lines of context"
192 msgstr "Строк контекста"
193
244 -#: gitk:2396
194 msgid "Ignore space change"
195 msgstr "Игнорировать пробелы"
196
248 -#: gitk:2400 gitk:2402 gitk:7983 gitk:8235
197 msgid "Line diff"
198 msgstr "Изменения строк"
199
252 -#: gitk:2467
200 msgid "Patch"
201 msgstr "Патч"
202
256 -#: gitk:2469
203 msgid "Tree"
204 msgstr "Файлы"
205
260 -#: gitk:2639 gitk:2660
206 msgid "Diff this -> selected"
207 msgstr "Сравнить этот коммит с выделенным"
208
264 -#: gitk:2640 gitk:2661
209 msgid "Diff selected -> this"
210 msgstr "Сравнить выделенный с этим коммитом"
211
268 -#: gitk:2641 gitk:2662
212 msgid "Make patch"
213 msgstr "Создать патч"
214
272 -#: gitk:2642 gitk:9283
215 msgid "Create tag"
216 msgstr "Создать метку"
217
276 -#: gitk:2643
218 msgid "Copy commit summary"
219 msgstr "Копировать информацию о коммите"
220
280 -#: gitk:2644 gitk:9414
221 msgid "Write commit to file"
222 msgstr "Сохранить коммит в файл"
223
284 -#: gitk:2645
224 msgid "Create new branch"
225 msgstr "Создать ветку"
226
288 -#: gitk:2646
227 msgid "Cherry-pick this commit"
228 msgstr "Копировать этот коммит в текущую ветку"
229
292 -#: gitk:2647
230 msgid "Reset HEAD branch to here"
231 msgstr "Установить HEAD на этот коммит"
232
296 -#: gitk:2648
233 msgid "Mark this commit"
234 msgstr "Пометить этот коммит"
235
300 -#: gitk:2649
236 msgid "Return to mark"
237 msgstr "Вернуться на пометку"
238
304 -#: gitk:2650
239 msgid "Find descendant of this and mark"
240 msgstr "Найти и пометить потомка этого коммита"
241
308 -#: gitk:2651
242 msgid "Compare with marked commit"
243 msgstr "Сравнить с помеченным коммитом"
244
312 -#: gitk:2652 gitk:2663
245 msgid "Diff this -> marked commit"
246 msgstr "Сравнить выделенное с помеченным коммитом"
247
316 -#: gitk:2653 gitk:2664
248 msgid "Diff marked commit -> this"
249 msgstr "Сравнить помеченный с этим коммитом"
250
320 -#: gitk:2654
251 msgid "Revert this commit"
252 msgstr "Обратить изменения этого коммита"
253
324 -#: gitk:2670
254 msgid "Check out this branch"
255 msgstr "Перейти на эту ветку"
256
328 -#: gitk:2671
257 msgid "Rename this branch"
258 msgstr "Переименовать эту ветку"
259
332 -#: gitk:2672
260 msgid "Remove this branch"
261 msgstr "Удалить эту ветку"
262
336 -#: gitk:2673
263 msgid "Copy branch name"
264 msgstr "Копировать имя ветки"
265
340 -#: gitk:2680
266 msgid "Highlight this too"
267 msgstr "Подсветить этот тоже"
268
344 -#: gitk:2681
269 msgid "Highlight this only"
270 msgstr "Подсветить только этот"
271
348 -#: gitk:2682
272 msgid "External diff"
273 msgstr "Программа сравнения"
274
352 -#: gitk:2683
275 msgid "Blame parent commit"
276 msgstr "Авторы изменений родительского коммита"
277
356 -#: gitk:2684
278 msgid "Copy path"
279 msgstr "Копировать путь"
280
360 -#: gitk:2691
281 msgid "Show origin of this line"
282 msgstr "Показать источник этой строки"
283
364 -#: gitk:2692
284 msgid "Run git gui blame on this line"
285 msgstr "Запустить git gui blame для этой строки"
286
368 -#: gitk:3036
287 msgid "About gitk"
288 msgstr "О gitk"
289
372 -#: gitk:3038
290 msgid ""
291 "\n"
292 "Gitk - a commit viewer for git\n"
@@ -377,995 +294,797 @@ msgid ""
294 "Copyright © 2005-2016 Paul Mackerras\n"
295 "\n"
296 "Use and redistribute under the terms of the GNU General Public License"
380 -msgstr "\nGitk — программа просмотра истории репозиториев git\n\n© 2005-2016 Paul Mackerras\n\nИспользование и распространение согласно условиям GNU General Public License"
297 +msgstr ""
298 +"\n"
299 +"Gitk — программа просмотра истории репозиториев git\n"
300 +"\n"
301 +"© 2005-2016 Paul Mackerras\n"
302 +"\n"
303 +"Использование и распространение согласно условиям GNU General Public License"
304
382 -#: gitk:3046 gitk:3113 gitk:10004
305 msgid "Close"
306 msgstr "Закрыть"
307
386 -#: gitk:3067
308 msgid "Gitk key bindings"
309 msgstr "Назначения клавиатуры в Gitk"
310
390 -#: gitk:3070
311 msgid "Gitk key bindings:"
312 msgstr "Назначения клавиатуры в Gitk:"
313
394 -#: gitk:3072
314 #, tcl-format
315 msgid "<%s-Q>\t\tQuit"
316 msgstr "<%s-Q>\t\tЗавершить"
317
399 -#: gitk:3073
318 #, tcl-format
319 msgid "<%s-W>\t\tClose window"
320 msgstr "<%s-W>\t\tЗакрыть окно"
321
404 -#: gitk:3074
322 msgid "<Home>\t\tMove to first commit"
323 msgstr "<Home>\t\tПерейти к первому коммиту"
324
408 -#: gitk:3075
325 msgid "<End>\t\tMove to last commit"
326 msgstr "<End>\t\tПерейти к последнему коммиту"
327
412 -#: gitk:3076
328 msgid "<Up>, p, k\tMove up one commit"
329 msgstr "<Up>, p, k\tПерейти на один коммит вверх"
330
416 -#: gitk:3077
331 msgid "<Down>, n, j\tMove down one commit"
332 msgstr "<Down>, n, j\tПерейти на один коммит вниз"
333
420 -#: gitk:3078
334 msgid "<Left>, z, h\tGo back in history list"
335 msgstr "<Left>, z, h\tПоказать ранее посещённое состояние"
336
424 -#: gitk:3079
337 msgid "<Right>, x, l\tGo forward in history list"
338 msgstr "<Right>, x, l\tПоказать следующий посещённый коммит"
339
428 -#: gitk:3080
340 #, tcl-format
341 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
342 msgstr "<%s-n>\tПерейти на n родителя от текущего коммита"
343
433 -#: gitk:3081
344 msgid "<PageUp>\tMove up one page in commit list"
345 msgstr "<PageUp>\tПерейти на страницу выше в списке коммитов"
346
437 -#: gitk:3082
347 msgid "<PageDown>\tMove down one page in commit list"
348 msgstr "<PageDown>\tПерейти на страницу ниже в списке коммитов"
349
441 -#: gitk:3083
350 #, tcl-format
351 msgid "<%s-Home>\tScroll to top of commit list"
352 msgstr "<%s-Home>\tПерейти на начало списка коммитов"
353
446 -#: gitk:3084
354 #, tcl-format
355 msgid "<%s-End>\tScroll to bottom of commit list"
356 msgstr "<%s-End>\tПерейти на конец списка коммитов"
357
451 -#: gitk:3085
358 #, tcl-format
359 msgid "<%s-Up>\tScroll commit list up one line"
360 msgstr "<%s-Up>\tПровернуть список коммитов вверх"
361
456 -#: gitk:3086
362 #, tcl-format
363 msgid "<%s-Down>\tScroll commit list down one line"
364 msgstr "<%s-Down>\tПровернуть список коммитов вниз"
365
461 -#: gitk:3087
366 #, tcl-format
367 msgid "<%s-PageUp>\tScroll commit list up one page"
368 msgstr "<%s-PageUp>\tПровернуть список коммитов на страницу вверх"
369
466 -#: gitk:3088
370 #, tcl-format
371 msgid "<%s-PageDown>\tScroll commit list down one page"
372 msgstr "<%s-PageDown>\tПровернуть список коммитов на страницу вниз"
373
471 -#: gitk:3089
374 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
375 msgstr "<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых коммитов)"
376
475 -#: gitk:3090
377 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
378 msgstr "<Shift-Down>\tПоиск (вниз, среди старых коммитов)"
379
479 -#: gitk:3091
380 msgid "<Delete>, b\tScroll diff view up one page"
381 msgstr "<Delete>, b\tПрокрутить список изменений на страницу выше"
382
483 -#: gitk:3092
383 msgid "<Backspace>\tScroll diff view up one page"
384 msgstr "<Backspace>\tПрокрутить список изменений на страницу выше"
385
487 -#: gitk:3093
386 msgid "<Space>\t\tScroll diff view down one page"
387 msgstr "<Leertaste>\t\tПрокрутить список изменений на страницу ниже"
388
491 -#: gitk:3094
389 msgid "u\t\tScroll diff view up 18 lines"
390 msgstr "u\t\tПрокрутить список изменений на 18 строк вверх"
391
495 -#: gitk:3095
392 msgid "d\t\tScroll diff view down 18 lines"
393 msgstr "d\t\tПрокрутить список изменений на 18 строк вниз"
394
499 -#: gitk:3096
395 #, tcl-format
396 msgid "<%s-F>\t\tFind"
397 msgstr "<%s-F>\t\tПоиск"
398
504 -#: gitk:3097
399 #, tcl-format
400 msgid "<%s-G>\t\tMove to next find hit"
401 msgstr "<%s-G>\t\tПерейти к следующему найденному коммиту"
402
509 -#: gitk:3098
403 msgid "<Return>\tMove to next find hit"
404 msgstr "<Return>\tПерейти к следующему найденному коммиту"
405
513 -#: gitk:3099
406 msgid "g\t\tGo to commit"
407 msgstr "g\t\tПерейти на коммит"
408
517 -#: gitk:3100
409 msgid "/\t\tFocus the search box"
410 msgstr "/\t\tПерейти к полю поиска"
411
521 -#: gitk:3101
412 msgid "?\t\tMove to previous find hit"
413 msgstr "?\t\tПерейти к предыдущему найденному коммиту"
414
525 -#: gitk:3102
415 msgid "f\t\tScroll diff view to next file"
416 msgstr "f\t\tПрокрутить список изменений к следующему файлу"
417
529 -#: gitk:3103
418 #, tcl-format
419 msgid "<%s-S>\t\tSearch for next hit in diff view"
420 msgstr "<%s-S>\t\tПродолжить поиск в списке изменений"
421
534 -#: gitk:3104
422 #, tcl-format
423 msgid "<%s-R>\t\tSearch for previous hit in diff view"
424 msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений"
425
539 -#: gitk:3105
426 #, tcl-format
427 msgid "<%s-KP+>\tIncrease font size"
428 msgstr "<%s-KP+>\tУвеличить размер шрифта"
429
544 -#: gitk:3106
430 #, tcl-format
431 msgid "<%s-plus>\tIncrease font size"
432 msgstr "<%s-plus>\tУвеличить размер шрифта"
433
549 -#: gitk:3107
434 #, tcl-format
435 msgid "<%s-KP->\tDecrease font size"
436 msgstr "<%s-KP->\tУменьшить размер шрифта"
437
554 -#: gitk:3108
438 #, tcl-format
439 msgid "<%s-minus>\tDecrease font size"
440 msgstr "<%s-minus>\tУменьшить размер шрифта"
441
559 -#: gitk:3109
442 msgid "<F5>\t\tUpdate"
443 msgstr "<F5>\t\tОбновить"
444
563 -#: gitk:3574 gitk:3583
445 #, tcl-format
446 msgid "Error creating temporary directory %s:"
447 msgstr "Ошибка создания временного каталога %s:"
448
568 -#: gitk:3596
449 #, tcl-format
450 msgid "Error getting \"%s\" from %s:"
451 msgstr "Ошибка получения «%s» из %s:"
452
573 -#: gitk:3659
453 msgid "command failed:"
454 msgstr "ошибка выполнения команды:"
455
577 -#: gitk:3808
456 msgid "No such commit"
457 msgstr "Коммит не найден"
458
581 -#: gitk:3822
459 msgid "git gui blame: command failed:"
460 msgstr "git gui blame: ошибка выполнения команды:"
461
585 -#: gitk:3853
462 #, tcl-format
463 msgid "Couldn't read merge head: %s"
464 msgstr "Ошибка чтения MERGE_HEAD: %s"
465
590 -#: gitk:3861
466 #, tcl-format
467 msgid "Error reading index: %s"
468 msgstr "Ошибка чтения индекса: %s"
469
595 -#: gitk:3886
470 #, tcl-format
471 msgid "Couldn't start git blame: %s"
472 msgstr "Ошибка запуска git blame: %s"
473
600 -#: gitk:3889 gitk:6778
474 msgid "Searching"
475 msgstr "Поиск"
476
604 -#: gitk:3921
477 #, tcl-format
478 msgid "Error running git blame: %s"
479 msgstr "Ошибка выполнения git blame: %s"
480
609 -#: gitk:3949
481 #, tcl-format
482 msgid "That line comes from commit %s, which is not in this view"
612 -msgstr "Эта строка принадлежит коммиту %s, который не показан в этом представлении"
483 +msgstr ""
484 +"Эта строка принадлежит коммиту %s, который не показан в этом представлении"
485
614 -#: gitk:3963
486 msgid "External diff viewer failed:"
487 msgstr "Ошибка выполнения программы сравнения:"
488
618 -#: gitk:4067
489 msgid "All files"
490 msgstr "Все файлы"
491
622 -#: gitk:4091
492 msgid "View"
493 msgstr "Представление"
494
626 -#: gitk:4094
495 msgid "Gitk view definition"
496 msgstr "Gitk определение представлений"
497
630 -#: gitk:4098
498 msgid "Remember this view"
499 msgstr "Запомнить представление"
500
634 -#: gitk:4099
501 msgid "References (space separated list):"
502 msgstr "Ссылки (разделённые пробелом):"
503
638 -#: gitk:4100
504 msgid "Branches & tags:"
505 msgstr "Ветки и метки"
506
642 -#: gitk:4101
507 msgid "All refs"
508 msgstr "Все ссылки"
509
646 -#: gitk:4102
510 msgid "All (local) branches"
511 msgstr "Все (локальные) ветки"
512
650 -#: gitk:4103
513 msgid "All tags"
514 msgstr "Все метки"
515
654 -#: gitk:4104
516 msgid "All remote-tracking branches"
517 msgstr "Все внешние отслеживаемые ветки"
518
658 -#: gitk:4105
519 msgid "Commit Info (regular expressions):"
520 msgstr "Информация о коммите (регулярные выражения):"
521
662 -#: gitk:4106
522 msgid "Author:"
523 msgstr "Автор:"
524
666 -#: gitk:4107
525 msgid "Committer:"
526 msgstr "Коммитер:"
527
670 -#: gitk:4108
528 msgid "Commit Message:"
529 msgstr "Сообщение коммита:"
530
674 -#: gitk:4109
531 msgid "Matches all Commit Info criteria"
532 msgstr "Совпадает со всеми условиями информации о коммите"
533
678 -#: gitk:4110
534 msgid "Matches no Commit Info criteria"
535 msgstr "Не совпадает с условиями информации о коммите"
536
682 -#: gitk:4111
537 msgid "Changes to Files:"
538 msgstr "Изменения файлов:"
539
686 -#: gitk:4112
540 msgid "Fixed String"
541 msgstr "Обычная строка"
542
690 -#: gitk:4113
543 msgid "Regular Expression"
544 msgstr "Регулярное выражение:"
545
694 -#: gitk:4114
546 msgid "Search string:"
547 msgstr "Строка для поиска:"
548
698 -#: gitk:4115
549 msgid ""
550 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
551 "15:27:38\"):"
702 -msgstr "Даты коммита («2 недели назад», «2009-03-17 15:27:38», «17 марта 2009 15:27:38»):"
552 +msgstr ""
553 +"Даты коммита («2 недели назад», «2009-03-17 15:27:38», «17 марта 2009 "
554 +"15:27:38»):"
555
704 -#: gitk:4116
556 msgid "Since:"
557 msgstr "С даты:"
558
708 -#: gitk:4117
559 msgid "Until:"
560 msgstr "По дату:"
561
712 -#: gitk:4118
562 msgid "Limit and/or skip a number of revisions (positive integer):"
563 msgstr "Ограничить и/или пропустить количество редакций (положительное число):"
564
716 -#: gitk:4119
565 msgid "Number to show:"
566 msgstr "Показать количество:"
567
720 -#: gitk:4120
568 msgid "Number to skip:"
569 msgstr "Пропустить количество:"
570
724 -#: gitk:4121
571 msgid "Miscellaneous options:"
572 msgstr "Различные опции:"
573
728 -#: gitk:4122
574 msgid "Strictly sort by date"
575 msgstr "Строгая сортировка по дате"
576
732 -#: gitk:4123
577 msgid "Mark branch sides"
578 msgstr "Отметить стороны веток"
579
736 -#: gitk:4124
580 msgid "Limit to first parent"
581 msgstr "Ограничить первым предком"
582
740 -#: gitk:4125
583 msgid "Simple history"
584 msgstr "Упрощенная история"
585
744 -#: gitk:4126
586 msgid "Additional arguments to git log:"
587 msgstr "Дополнительные аргументы для git log:"
588
748 -#: gitk:4127
589 msgid "Enter files and directories to include, one per line:"
590 msgstr "Файлы и каталоги для ограничения истории, по одному на строку:"
591
752 -#: gitk:4128
592 msgid "Command to generate more commits to include:"
593 msgstr "Дополнительная команда для списка коммитов:"
594
756 -#: gitk:4252
595 msgid "Gitk: edit view"
596 msgstr "Gitk: изменить представление"
597
760 -#: gitk:4260
598 msgid "-- criteria for selecting revisions"
599 msgstr "— критерий поиска редакций"
600
764 -#: gitk:4265
601 msgid "View Name"
602 msgstr "Имя представления"
603
768 -#: gitk:4340
604 msgid "Apply (F5)"
605 msgstr "Применить (F5)"
606
772 -#: gitk:4378
607 msgid "Error in commit selection arguments:"
608 msgstr "Ошибка в параметрах выбора коммитов:"
609
776 -#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525
610 msgid "None"
611 msgstr "Ни одного"
612
780 -#: gitk:5045 gitk:5050
613 msgid "Descendant"
614 msgstr "Порождённое"
615
784 -#: gitk:5046
616 msgid "Not descendant"
617 msgstr "Не порождённое"
618
788 -#: gitk:5053 gitk:5058
619 msgid "Ancestor"
620 msgstr "Предок"
621
792 -#: gitk:5054
622 msgid "Not ancestor"
623 msgstr "Не предок"
624
796 -#: gitk:5348
625 msgid "Local changes checked in to index but not committed"
626 msgstr "Проиндексированные изменения"
627
800 -#: gitk:5384
628 msgid "Local uncommitted changes, not checked in to index"
629 msgstr "Непроиндексированные изменения"
630
804 -#: gitk:7158
631 msgid "and many more"
632 msgstr "и многое другое"
633
808 -#: gitk:7161
634 msgid "many"
635 msgstr "много"
636
812 -#: gitk:7352
637 msgid "Tags:"
638 msgstr "Метки:"
639
816 -#: gitk:7369 gitk:7375 gitk:8854
640 msgid "Parent"
641 msgstr "Предок"
642
820 -#: gitk:7380
643 msgid "Child"
644 msgstr "Потомок"
645
824 -#: gitk:7389
646 msgid "Branch"
647 msgstr "Ветка"
648
828 -#: gitk:7392
649 msgid "Follows"
650 msgstr "Следует за"
651
832 -#: gitk:7395
652 msgid "Precedes"
653 msgstr "Предшествует"
654
836 -#: gitk:7990
655 #, tcl-format
656 msgid "Error getting diffs: %s"
657 msgstr "Ошибка получения изменений: %s"
658
841 -#: gitk:8679
659 msgid "Goto:"
660 msgstr "Перейти к:"
661
845 -#: gitk:8700
662 #, tcl-format
663 msgid "Short SHA1 id %s is ambiguous"
664 msgstr "Сокращённый SHA1 идентификатор %s неоднозначен"
665
850 -#: gitk:8707
666 #, tcl-format
667 msgid "Revision %s is not known"
668 msgstr "Редакция %s не найдена"
669
855 -#: gitk:8717
670 #, tcl-format
671 msgid "SHA1 id %s is not known"
672 msgstr "SHA1 идентификатор %s не найден"
673
860 -#: gitk:8719
674 #, tcl-format
675 msgid "Revision %s is not in the current view"
676 msgstr "Редакция %s не найдена в текущем представлении"
677
865 -#: gitk:8861 gitk:8876
678 msgid "Date"
679 msgstr "Дата"
680
869 -#: gitk:8864
681 msgid "Children"
682 msgstr "Потомки"
683
873 -#: gitk:8927
684 #, tcl-format
685 msgid "Reset %s branch to here"
686 msgstr "Сбросить ветку %s на этот коммит"
687
878 -#: gitk:8929
688 msgid "Detached head: can't reset"
689 msgstr "Коммит не принадлежит ни одной ветке, сбросить невозможно"
690
882 -#: gitk:9034 gitk:9040
691 msgid "Skipping merge commit "
692 msgstr "Пропускаю коммит-слияние"
693
886 -#: gitk:9049 gitk:9054
694 msgid "Error getting patch ID for "
695 msgstr "Не удалось получить идентификатор патча для "
696
890 -#: gitk:9050 gitk:9055
697 msgid " - stopping\n"
698 msgstr " — останов\n"
699
894 -#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094
700 msgid "Commit "
701 msgstr "Коммит"
702
898 -#: gitk:9064
703 msgid ""
704 " is the same patch as\n"
705 " "
902 -msgstr " такой же патч, как и\n "
706 +msgstr ""
707 +" такой же патч, как и\n"
708 +" "
709
904 -#: gitk:9072
710 msgid ""
711 " differs from\n"
712 " "
908 -msgstr " отличается от\n "
713 +msgstr ""
714 +" отличается от\n"
715 +" "
716
910 -#: gitk:9074
717 msgid ""
718 "Diff of commits:\n"
719 "\n"
914 -msgstr "Различия коммитов:\n\n"
720 +msgstr ""
721 +"Различия коммитов:\n"
722 +"\n"
723
916 -#: gitk:9086 gitk:9095
724 #, tcl-format
725 msgid " has %s children - stopping\n"
726 msgstr " является %s потомком — останов\n"
727
921 -#: gitk:9114
728 #, tcl-format
729 msgid "Error writing commit to file: %s"
730 msgstr "Произошла ошибка при записи коммита в файл: %s"
731
926 -#: gitk:9120
732 #, tcl-format
733 msgid "Error diffing commits: %s"
734 msgstr "Произошла ошибка при выводе различий коммитов: %s"
735
931 -#: gitk:9166
736 msgid "Top"
737 msgstr "Верх"
738
935 -#: gitk:9167
739 msgid "From"
740 msgstr "От"
741
939 -#: gitk:9172
742 msgid "To"
743 msgstr "До"
744
943 -#: gitk:9196
745 msgid "Generate patch"
746 msgstr "Создать патч"
747
947 -#: gitk:9198
748 msgid "From:"
749 msgstr "От:"
750
951 -#: gitk:9207
751 msgid "To:"
752 msgstr "До:"
753
955 -#: gitk:9216
754 msgid "Reverse"
755 msgstr "В обратном порядке"
756
959 -#: gitk:9218 gitk:9428
757 msgid "Output file:"
758 msgstr "Файл для сохранения:"
759
963 -#: gitk:9224
760 msgid "Generate"
761 msgstr "Создать"
762
967 -#: gitk:9262
763 msgid "Error creating patch:"
764 msgstr "Ошибка создания патча:"
765
971 -#: gitk:9285 gitk:9416 gitk:9504
766 msgid "ID:"
767 msgstr "ID:"
768
975 -#: gitk:9294
769 msgid "Tag name:"
770 msgstr "Имя метки:"
771
979 -#: gitk:9297
772 msgid "Tag message is optional"
773 msgstr "Описание метки указывать не обязательно"
774
983 -#: gitk:9299
775 msgid "Tag message:"
776 msgstr "Описание метки:"
777
987 -#: gitk:9303 gitk:9474
778 msgid "Create"
779 msgstr "Создать"
780
991 -#: gitk:9321
781 msgid "No tag name specified"
782 msgstr "Не задано имя метки"
783
995 -#: gitk:9325
784 #, tcl-format
785 msgid "Tag \"%s\" already exists"
786 msgstr "Метка «%s» уже существует"
787
1000 -#: gitk:9335
788 msgid "Error creating tag:"
789 msgstr "Ошибка создания метки:"
790
1004 -#: gitk:9425
791 msgid "Command:"
792 msgstr "Команда:"
793
1008 -#: gitk:9433
794 msgid "Write"
795 msgstr "Запись"
796
1012 -#: gitk:9451
797 msgid "Error writing commit:"
798 msgstr "Произошла ошибка при записи коммита:"
799
1016 -#: gitk:9473
800 msgid "Create branch"
801 msgstr "Создать ветку"
802
1020 -#: gitk:9489
803 #, tcl-format
804 msgid "Rename branch %s"
805 msgstr "Переименовать ветку %s"
806
1025 -#: gitk:9490
807 msgid "Rename"
808 msgstr "Переименовать"
809
1029 -#: gitk:9514
810 msgid "Name:"
811 msgstr "Имя:"
812
1033 -#: gitk:9538
813 msgid "Please specify a name for the new branch"
814 msgstr "Укажите имя для новой ветки"
815
1037 -#: gitk:9543
816 #, tcl-format
817 msgid "Branch '%s' already exists. Overwrite?"
818 msgstr "Ветка «%s» уже существует. Переписать?"
819
1042 -#: gitk:9587
820 msgid "Please specify a new name for the branch"
821 msgstr "Укажите имя для новой ветки"
822
1046 -#: gitk:9650
823 #, tcl-format
824 msgid "Commit %s is already included in branch %s -- really re-apply it?"
825 msgstr "Коммит %s уже включён в ветку %s. Продолжить операцию?"
826
1051 -#: gitk:9655
827 msgid "Cherry-picking"
828 msgstr "Копирование коммита"
829
1055 -#: gitk:9664
830 #, tcl-format
831 msgid ""
832 "Cherry-pick failed because of local changes to file '%s'.\n"
833 "Please commit, reset or stash your changes and try again."
1060 -msgstr "Копирование коммита невозможно из-за изменений в файле «%s».\nЗакоммитьте, сбросьте или спрячьте изменения и повторите операцию."
834 +msgstr ""
835 +"Копирование коммита невозможно из-за изменений в файле «%s».\n"
836 +"Закоммитьте, сбросьте или спрячьте изменения и повторите операцию."
837
1062 -#: gitk:9670
838 msgid ""
839 "Cherry-pick failed because of merge conflict.\n"
840 "Do you wish to run git citool to resolve it?"
1066 -msgstr "Копирование изменений невозможно из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?"
841 +msgstr ""
842 +"Копирование изменений невозможно из-за незавершённой операции слияния.\n"
843 +"Запустить git citool для завершения этой операции?"
844
1068 -#: gitk:9686 gitk:9744
845 msgid "No changes committed"
846 msgstr "Изменения не закоммичены"
847
1072 -#: gitk:9713
848 #, tcl-format
849 msgid "Commit %s is not included in branch %s -- really revert it?"
850 msgstr "Коммит %s не включён в ветку %s. Продолжить операцию?"
851
1077 -#: gitk:9718
852 msgid "Reverting"
853 msgstr "Обращение изменений"
854
1081 -#: gitk:9726
855 #, tcl-format
856 msgid ""
857 "Revert failed because of local changes to the following files:%s Please "
858 "commit, reset or stash your changes and try again."
1086 -msgstr "Возврат изменений коммита не удался из-за локальных изменений в указанных файлах: %s\nЗакоммитьте, сбросьте или спрячьте изменения и повторите операцию."
859 +msgstr ""
860 +"Возврат изменений коммита не удался из-за локальных изменений в указанных "
861 +"файлах: %s\n"
862 +"Закоммитьте, сбросьте или спрячьте изменения и повторите операцию."
863
1088 -#: gitk:9730
864 msgid ""
865 "Revert failed because of merge conflict.\n"
866 " Do you wish to run git citool to resolve it?"
1092 -msgstr "Возврат изменений невозможен из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?"
867 +msgstr ""
868 +"Возврат изменений невозможен из-за незавершённой операции слияния.\n"
869 +"Запустить git citool для завершения этой операции?"
870
1094 -#: gitk:9773
871 msgid "Confirm reset"
872 msgstr "Подтвердите операцию перехода"
873
1098 -#: gitk:9775
874 #, tcl-format
875 msgid "Reset branch %s to %s?"
876 msgstr "Сбросить ветку %s на коммит %s?"
877
1103 -#: gitk:9777
878 msgid "Reset type:"
879 msgstr "Тип операции перехода:"
880
1107 -#: gitk:9780
881 msgid "Soft: Leave working tree and index untouched"
882 msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными"
883
1111 -#: gitk:9783
884 msgid "Mixed: Leave working tree untouched, reset index"
885 msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс"
886
1115 -#: gitk:9786
887 msgid ""
888 "Hard: Reset working tree and index\n"
889 "(discard ALL local changes)"
1119 -msgstr "Жесткий: переписать индекс и рабочий каталог\n(все изменения в рабочем каталоге будут потеряны)"
890 +msgstr ""
891 +"Жесткий: переписать индекс и рабочий каталог\n"
892 +"(все изменения в рабочем каталоге будут потеряны)"
893
1121 -#: gitk:9803
894 msgid "Resetting"
895 msgstr "Сброс"
896
1125 -#: gitk:9876
897 #, tcl-format
898 msgid "A local branch named %s exists already"
899 msgstr "Локальная ветка с именем %s уже существует"
900
1130 -#: gitk:9884
901 msgid "Checking out"
902 msgstr "Переход"
903
1134 -#: gitk:9943
904 msgid "Cannot delete the currently checked-out branch"
905 msgstr "Активная ветка не может быть удалена"
906
1138 -#: gitk:9949
907 #, tcl-format
908 msgid ""
909 "The commits on branch %s aren't on any other branch.\n"
910 "Really delete branch %s?"
1143 -msgstr "Коммиты из ветки %s не принадлежат больше никакой другой ветке.\nДействительно удалить ветку %s?"
911 +msgstr ""
912 +"Коммиты из ветки %s не принадлежат больше никакой другой ветке.\n"
913 +"Действительно удалить ветку %s?"
914
1145 -#: gitk:9980
915 #, tcl-format
916 msgid "Tags and heads: %s"
917 msgstr "Метки и ветки: %s"
918
1150 -#: gitk:9997
919 msgid "Filter"
920 msgstr "Фильтровать"
921
1154 -#: gitk:10293
922 msgid ""
923 "Error reading commit topology information; branch and preceding/following "
924 "tag information will be incomplete."
1158 -msgstr "Ошибка чтения истории проекта; информация о ветках и коммитах вокруг меток (до/после) может быть неполной."
925 +msgstr ""
926 +"Ошибка чтения истории проекта; информация о ветках и коммитах вокруг меток "
927 +"(до/после) может быть неполной."
928
1160 -#: gitk:11270
929 msgid "Tag"
930 msgstr "Метка"
931
1164 -#: gitk:11274
932 msgid "Id"
933 msgstr "Id"
934
1168 -#: gitk:11357
935 msgid "Gitk font chooser"
936 msgstr "Шрифт Gitk"
937
1172 -#: gitk:11374
938 msgid "B"
939 msgstr "Ж"
940
1176 -#: gitk:11377
941 msgid "I"
942 msgstr "К"
943
1180 -#: gitk:11495
944 msgid "Commit list display options"
945 msgstr "Параметры показа списка коммитов"
946
1184 -#: gitk:11498
947 msgid "Maximum graph width (lines)"
948 msgstr "Макс. ширина графа (строк)"
949
1188 -#: gitk:11502
950 #, no-tcl-format
951 msgid "Maximum graph width (% of pane)"
952 msgstr "Макс. ширина графа (% ширины панели)"
953
1193 -#: gitk:11505
954 msgid "Show local changes"
955 msgstr "Показывать изменения в рабочем каталоге"
956
1197 -#: gitk:11508
957 msgid "Auto-select SHA1 (length)"
958 msgstr "Автоматически выделить SHA1 (длинна)"
959
1201 -#: gitk:11512
960 msgid "Hide remote refs"
961 msgstr "Скрыть внешние ссылки"
962
1205 -#: gitk:11516
963 msgid "Diff display options"
964 msgstr "Параметры показа изменений"
965
1209 -#: gitk:11518
966 msgid "Tab spacing"
967 msgstr "Ширина табуляции"
968
1213 -#: gitk:11521
969 msgid "Display nearby tags/heads"
970 msgstr "Показывать близкие метки/ветки"
971
1217 -#: gitk:11524
972 msgid "Maximum # tags/heads to show"
973 msgstr "Показывать максимальное количество меток/веток"
974
1221 -#: gitk:11527
975 msgid "Limit diffs to listed paths"
976 msgstr "Ограничить показ изменений выбранными файлами"
977
1225 -#: gitk:11530
978 msgid "Support per-file encodings"
979 msgstr "Поддержка кодировок в отдельных файлах"
980
1229 -#: gitk:11536 gitk:11683
981 msgid "External diff tool"
982 msgstr "Программа для показа изменений"
983
1233 -#: gitk:11537
984 msgid "Choose..."
985 msgstr "Выберите..."
986
1237 -#: gitk:11542
987 msgid "General options"
988 msgstr "Общие опции"
989
1241 -#: gitk:11545
990 msgid "Use themed widgets"
991 msgstr "Использовать стили виджетов"
992
1245 -#: gitk:11547
993 msgid "(change requires restart)"
994 msgstr "(изменение потребует перезапуск)"
995
1249 -#: gitk:11549
996 msgid "(currently unavailable)"
997 msgstr "(недоступно в данный момент)"
998
1253 -#: gitk:11560
999 msgid "Colors: press to choose"
1000 msgstr "Цвета: нажмите для выбора"
1001
1257 -#: gitk:11563
1002 msgid "Interface"
1003 msgstr "Интерфейс"
1004
1261 -#: gitk:11564
1005 msgid "interface"
1006 msgstr "интерфейс"
1007
1265 -#: gitk:11567
1008 msgid "Background"
1009 msgstr "Фон"
1010
1269 -#: gitk:11568 gitk:11598
1011 msgid "background"
1012 msgstr "фон"
1013
1273 -#: gitk:11571
1014 msgid "Foreground"
1015 msgstr "Передний план"
1016
1277 -#: gitk:11572
1017 msgid "foreground"
1018 msgstr "передний план"
1019
1281 -#: gitk:11575
1020 msgid "Diff: old lines"
1021 msgstr "Изменения: старый текст"
1022
1285 -#: gitk:11576
1023 msgid "diff old lines"
1024 msgstr "старый текст изменения"
1025
1289 -#: gitk:11580
1026 msgid "Diff: new lines"
1027 msgstr "Изменения: новый текст"
1028
1293 -#: gitk:11581
1029 msgid "diff new lines"
1030 msgstr "новый текст изменения"
1031
1297 -#: gitk:11585
1032 msgid "Diff: hunk header"
1033 msgstr "Изменения: заголовок блока"
1034
1301 -#: gitk:11587
1035 msgid "diff hunk header"
1036 msgstr "заголовок блока изменений"
1037
1305 -#: gitk:11591
1038 msgid "Marked line bg"
1039 msgstr "Фон выбранной строки"
1040
1309 -#: gitk:11593
1041 msgid "marked line background"
1042 msgstr "фон выбранной строки"
1043
1313 -#: gitk:11597
1044 msgid "Select bg"
1045 msgstr "Выберите фон"
1046
1317 -#: gitk:11606
1047 msgid "Fonts: press to choose"
1048 msgstr "Шрифт: нажмите для выбора"
1049
1321 -#: gitk:11608
1050 msgid "Main font"
1051 msgstr "Основной шрифт"
1052
1325 -#: gitk:11609
1053 msgid "Diff display font"
1054 msgstr "Шрифт показа изменений"
1055
1329 -#: gitk:11610
1056 msgid "User interface font"
1057 msgstr "Шрифт интерфейса"
1058
1333 -#: gitk:11632
1059 msgid "Gitk preferences"
1060 msgstr "Настройки Gitk"
1061
1337 -#: gitk:11641
1062 msgid "General"
1063 msgstr "Общие"
1064
1341 -#: gitk:11642
1065 msgid "Colors"
1066 msgstr "Цвета"
1067
1345 -#: gitk:11643
1068 msgid "Fonts"
1069 msgstr "Шрифты"
1070
1349 -#: gitk:11693
1071 #, tcl-format
1072 msgid "Gitk: choose color for %s"
1073 msgstr "Gitk: выберите цвет для %s"
1074
1354 -#: gitk:12206
1075 msgid ""
1076 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1077 " Gitk requires at least Tcl/Tk 8.4."
1358 -msgstr "К сожалению gitk не может работать с этой версий Tcl/Tk.\nТребуется как минимум Tcl/Tk 8.4."
1078 +msgstr ""
1079 +"К сожалению gitk не может работать с этой версий Tcl/Tk.\n"
1080 +"Требуется как минимум Tcl/Tk 8.4."
1081
1360 -#: gitk:12416
1082 msgid "Cannot find a git repository here."
1083 msgstr "Git-репозитарий не найден в текущем каталоге."
1084
1364 -#: gitk:12463
1085 #, tcl-format
1086 msgid "Ambiguous argument '%s': both revision and filename"
1087 msgstr "Неоднозначный аргумент «%s»: существует как редакция и как имя файла"
1088
1369 -#: gitk:12475
1089 msgid "Bad arguments to gitk:"
1090 msgstr "Неправильные аргументы для gitk:"
po/sv.po
-326
@@ -20,33 +20,26 @@ msgstr ""
20 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
21 "X-Generator: Gtranslator 3.38.0\n"
22
23 -#: gitk:139
23 msgid "Couldn't get list of unmerged files:"
24 msgstr "Kunde inte hämta lista över ej sammanslagna filer:"
25
27 -#: gitk:211 gitk:2406
26 msgid "Color words"
27 msgstr "Färga ord"
28
31 -#: gitk:216 gitk:2406 gitk:8307 gitk:8340
29 msgid "Markup words"
30 msgstr "Märk upp ord"
31
35 -#: gitk:323
32 msgid "Error parsing revisions:"
33 msgstr "Fel vid tolkning av revisioner:"
34
39 -#: gitk:379
35 msgid "Error executing --argscmd command:"
36 msgstr "Fel vid körning av --argscmd-kommando:"
37
43 -#: gitk:392
38 msgid "No files selected: --merge specified but no files are unmerged."
39 msgstr ""
40 "Inga filer valdes: --merge angavs men det finns inga filer som inte har "
41 "slagits samman."
42
49 -#: gitk:395
43 msgid ""
44 "No files selected: --merge specified but no unmerged files are within file "
45 "limit."
@@ -54,326 +47,243 @@ msgstr ""
47 "Inga filer valdes: --merge angavs men det finns inga filer inom "
48 "filbegränsningen."
49
57 -#: gitk:417 gitk:565
50 msgid "Error executing git log:"
51 msgstr "Fel vid körning av git log:"
52
61 -#: gitk:435 gitk:581
53 msgid "Reading"
54 msgstr "Läser"
55
65 -#: gitk:495 gitk:4572
56 msgid "Reading commits..."
57 msgstr "Läser incheckningar..."
58
69 -#: gitk:498 gitk:1640 gitk:4575
59 msgid "No commits selected"
60 msgstr "Inga incheckningar markerade"
61
73 -#: gitk:1448 gitk:4092 gitk:12674
62 msgid "Command line"
63 msgstr "Kommandorad"
64
77 -#: gitk:1514
65 msgid "Can't parse git log output:"
66 msgstr "Kan inte tolka utdata från git log:"
67
81 -#: gitk:1743
68 msgid "No commit information available"
69 msgstr "Ingen incheckningsinformation är tillgänglig"
70
85 -#: gitk:1910 gitk:1939 gitk:4362 gitk:9847 gitk:11451 gitk:11751
71 msgid "OK"
72 msgstr "OK"
73
89 -#: gitk:1941 gitk:4364 gitk:9283 gitk:9362 gitk:9492 gitk:9578 gitk:9849
90 -#: gitk:11452 gitk:11752
74 msgid "Cancel"
75 msgstr "Avbryt"
76
94 -#: gitk:2090
77 msgid "&Update"
78 msgstr "&Uppdatera"
79
98 -#: gitk:2091
80 msgid "&Reload"
81 msgstr "Läs &om"
82
102 -#: gitk:2092
83 msgid "Reread re&ferences"
84 msgstr "Läs om &referenser"
85
106 -#: gitk:2093
86 msgid "&List references"
87 msgstr "&Visa referenser"
88
110 -#: gitk:2095
89 msgid "Start git &gui"
90 msgstr "Starta git &gui"
91
114 -#: gitk:2097
92 msgid "&Quit"
93 msgstr "&Avsluta"
94
118 -#: gitk:2089
95 msgid "&File"
96 msgstr "&Arkiv"
97
122 -#: gitk:2101
98 msgid "&Preferences"
99 msgstr "&Inställningar"
100
126 -#: gitk:2100
101 msgid "&Edit"
102 msgstr "&Redigera"
103
130 -#: gitk:2105
104 msgid "&New view..."
105 msgstr "&Ny vy..."
106
134 -#: gitk:2106
107 msgid "&Edit view..."
108 msgstr "&Ändra vy..."
109
138 -#: gitk:2107
110 msgid "&Delete view"
111 msgstr "&Ta bort vy"
112
142 -#: gitk:2109
113 msgid "&All files"
114 msgstr "&Alla filer"
115
146 -#: gitk:2104
116 msgid "&View"
117 msgstr "&Visa"
118
150 -#: gitk:2114 gitk:2124
119 msgid "&About gitk"
120 msgstr "&Om gitk"
121
154 -#: gitk:2115 gitk:2129
122 msgid "&Key bindings"
123 msgstr "&Tangentbordsbindningar"
124
158 -#: gitk:2113 gitk:2128
125 msgid "&Help"
126 msgstr "&Hjälp"
127
162 -#: gitk:2206 gitk:8739
128 msgid "SHA1 ID:"
129 msgstr "SHA1-id:"
130
166 -#: gitk:2250
131 msgid "Row"
132 msgstr "Rad"
133
170 -#: gitk:2288
134 msgid "Find"
135 msgstr "Sök"
136
174 -#: gitk:2316
137 msgid "commit"
138 msgstr "incheckning"
139
178 -#: gitk:2320 gitk:2322 gitk:4734 gitk:4757 gitk:4781 gitk:6802 gitk:6874
179 -#: gitk:6959
140 msgid "containing:"
141 msgstr "som innehåller:"
142
183 -#: gitk:2323 gitk:3573 gitk:3578 gitk:4810
143 msgid "touching paths:"
144 msgstr "som rör sökväg:"
145
187 -#: gitk:2324 gitk:4824
146 msgid "adding/removing string:"
147 msgstr "som lägger/till tar bort sträng:"
148
191 -#: gitk:2325 gitk:4826
149 msgid "changing lines matching:"
150 msgstr "ändrar rader som matchar:"
151
195 -#: gitk:2334 gitk:2336 gitk:4813
152 msgid "Exact"
153 msgstr "Exakt"
154
199 -#: gitk:2336 gitk:4901 gitk:6770
155 msgid "IgnCase"
156 msgstr "IgnVersaler"
157
203 -#: gitk:2336 gitk:4783 gitk:4899 gitk:6766
158 msgid "Regexp"
159 msgstr "Reg.uttr."
160
207 -#: gitk:2338 gitk:2339 gitk:4921 gitk:4951 gitk:4958 gitk:6895 gitk:6963
161 msgid "All fields"
162 msgstr "Alla fält"
163
211 -#: gitk:2339 gitk:4918 gitk:4951 gitk:6833
164 msgid "Headline"
165 msgstr "Rubrik"
166
215 -#: gitk:2340 gitk:4918 gitk:6833 gitk:6963 gitk:7471
167 msgid "Comments"
168 msgstr "Kommentarer"
169
219 -#: gitk:2340 gitk:4918 gitk:4923 gitk:4958 gitk:6833 gitk:7406 gitk:8917
220 -#: gitk:8932
170 msgid "Author"
171 msgstr "Författare"
172
224 -#: gitk:2340 gitk:4918 gitk:6833 gitk:7408
173 msgid "Committer"
174 msgstr "Incheckare"
175
228 -#: gitk:2374
176 msgid "Search"
177 msgstr "Sök"
178
232 -#: gitk:2382
179 msgid "Diff"
180 msgstr "Diff"
181
236 -#: gitk:2384
182 msgid "Old version"
183 msgstr "Gammal version"
184
240 -#: gitk:2386
185 msgid "New version"
186 msgstr "Ny version"
187
244 -#: gitk:2389
188 msgid "Lines of context"
189 msgstr "Rader sammanhang"
190
248 -#: gitk:2399
191 msgid "Ignore space change"
192 msgstr "Ignorera ändringar i blanksteg"
193
252 -#: gitk:2403 gitk:2405 gitk:8041 gitk:8293
194 msgid "Line diff"
195 msgstr "Rad-diff"
196
256 -#: gitk:2478
197 msgid "Patch"
198 msgstr "Patch"
199
260 -#: gitk:2480
200 msgid "Tree"
201 msgstr "Träd"
202
264 -#: gitk:2650 gitk:2671
203 msgid "Diff this -> selected"
204 msgstr "Diff denna -> markerad"
205
268 -#: gitk:2651 gitk:2672
206 msgid "Diff selected -> this"
207 msgstr "Diff markerad -> denna"
208
272 -#: gitk:2652 gitk:2673
209 msgid "Make patch"
210 msgstr "Skapa patch"
211
276 -#: gitk:2653 gitk:9341
212 msgid "Create tag"
213 msgstr "Skapa tagg"
214
280 -#: gitk:2654
215 msgid "Copy commit reference"
216 msgstr "Kopiera incheckningsreferens"
217
284 -#: gitk:2655 gitk:9472
218 msgid "Write commit to file"
219 msgstr "Skriv incheckning till fil"
220
288 -#: gitk:2656
221 msgid "Create new branch"
222 msgstr "Skapa ny gren"
223
292 -#: gitk:2657
224 msgid "Cherry-pick this commit"
225 msgstr "Plocka denna incheckning"
226
296 -#: gitk:2658
227 msgid "Reset HEAD branch to here"
228 msgstr "Återställ HEAD-grenen hit"
229
300 -#: gitk:2659
230 msgid "Mark this commit"
231 msgstr "Markera denna incheckning"
232
304 -#: gitk:2660
233 msgid "Return to mark"
234 msgstr "Återgå till markering"
235
308 -#: gitk:2661
236 msgid "Find descendant of this and mark"
237 msgstr "Hitta efterföljare till denna och markera"
238
312 -#: gitk:2662
239 msgid "Compare with marked commit"
240 msgstr "Jämför med markerad incheckning"
241
316 -#: gitk:2663 gitk:2674
242 msgid "Diff this -> marked commit"
243 msgstr "Diff denna -> markerad incheckning"
244
320 -#: gitk:2664 gitk:2675
245 msgid "Diff marked commit -> this"
246 msgstr "Diff markerad incheckning -> denna"
247
324 -#: gitk:2665
248 msgid "Revert this commit"
249 msgstr "Ångra denna incheckning"
250
328 -#: gitk:2681
251 msgid "Check out this branch"
252 msgstr "Checka ut denna gren"
253
332 -#: gitk:2682
254 msgid "Rename this branch"
255 msgstr "Byt namn på denna gren"
256
336 -#: gitk:2683
257 msgid "Remove this branch"
258 msgstr "Ta bort denna gren"
259
340 -#: gitk:2684
260 msgid "Copy branch name"
261 msgstr "Kopiera namn på gren"
262
344 -#: gitk:2691
263 msgid "Highlight this too"
264 msgstr "Markera även detta"
265
348 -#: gitk:2692
266 msgid "Highlight this only"
267 msgstr "Markera bara detta"
268
352 -#: gitk:2693
269 msgid "External diff"
270 msgstr "Extern diff"
271
356 -#: gitk:2694
272 msgid "Blame parent commit"
273 msgstr "Klandra föräldraincheckning"
274
360 -#: gitk:2695
275 msgid "Copy path"
276 msgstr "Kopiera sökväg"
277
364 -#: gitk:2702
278 msgid "Show origin of this line"
279 msgstr "Visa ursprunget för den här raden"
280
368 -#: gitk:2703
281 msgid "Run git gui blame on this line"
282 msgstr "Kör git gui blame på den här raden"
283
372 -#: gitk:3057
284 msgid "About gitk"
285 msgstr "Om gitk"
286
376 -#: gitk:3059
287 msgid ""
288 "\n"
289 "Gitk - a commit viewer for git\n"
@@ -389,323 +299,249 @@ msgstr ""
299 "\n"
300 "Använd och vidareförmedla enligt villkoren i GNU General Public License"
301
392 -#: gitk:3067 gitk:3134 gitk:10062
302 msgid "Close"
303 msgstr "Stäng"
304
396 -#: gitk:3088
305 msgid "Gitk key bindings"
306 msgstr "Tangentbordsbindningar för Gitk"
307
400 -#: gitk:3091
308 msgid "Gitk key bindings:"
309 msgstr "Tangentbordsbindningar för Gitk:"
310
404 -#: gitk:3093
311 #, tcl-format
312 msgid "<%s-Q>\t\tQuit"
313 msgstr "<%s-Q>\t\tAvsluta"
314
409 -#: gitk:3094
315 #, tcl-format
316 msgid "<%s-W>\t\tClose window"
317 msgstr "<%s-W>\t\tStäng fönster"
318
414 -#: gitk:3095
319 msgid "<Home>\t\tMove to first commit"
320 msgstr "<Home>\t\tGå till första incheckning"
321
418 -#: gitk:3096
322 msgid "<End>\t\tMove to last commit"
323 msgstr "<End>\t\tGå till sista incheckning"
324
422 -#: gitk:3097
325 msgid "<Up>, p, k\tMove up one commit"
326 msgstr "<Upp>, p, k\tGå en incheckning upp"
327
426 -#: gitk:3098
328 msgid "<Down>, n, j\tMove down one commit"
329 msgstr "<Ned>, n, j\tGå en incheckning ned"
330
430 -#: gitk:3099
331 msgid "<Left>, z, h\tGo back in history list"
332 msgstr "<Vänster>, z, h\tGå bakåt i historiken"
333
434 -#: gitk:3100
334 msgid "<Right>, x, l\tGo forward in history list"
335 msgstr "<Höger>, x, l\tGå framåt i historiken"
336
438 -#: gitk:3101
337 #, tcl-format
338 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
339 msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan"
340
443 -#: gitk:3102
341 msgid "<PageUp>\tMove up one page in commit list"
342 msgstr "<PageUp>\tGå upp en sida i incheckningslistan"
343
447 -#: gitk:3103
344 msgid "<PageDown>\tMove down one page in commit list"
345 msgstr "<PageDown>\tGå ned en sida i incheckningslistan"
346
451 -#: gitk:3104
347 #, tcl-format
348 msgid "<%s-Home>\tScroll to top of commit list"
349 msgstr "<%s-Home>\tRulla till början av incheckningslistan"
350
456 -#: gitk:3105
351 #, tcl-format
352 msgid "<%s-End>\tScroll to bottom of commit list"
353 msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
354
461 -#: gitk:3106
355 #, tcl-format
356 msgid "<%s-Up>\tScroll commit list up one line"
357 msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
358
466 -#: gitk:3107
359 #, tcl-format
360 msgid "<%s-Down>\tScroll commit list down one line"
361 msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
362
471 -#: gitk:3108
363 #, tcl-format
364 msgid "<%s-PageUp>\tScroll commit list up one page"
365 msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
366
476 -#: gitk:3109
367 #, tcl-format
368 msgid "<%s-PageDown>\tScroll commit list down one page"
369 msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
370
481 -#: gitk:3110
371 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
372 msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
373
485 -#: gitk:3111
374 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
375 msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
376
489 -#: gitk:3112
377 msgid "<Delete>, b\tScroll diff view up one page"
378 msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
379
493 -#: gitk:3113
380 msgid "<Backspace>\tScroll diff view up one page"
381 msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
382
497 -#: gitk:3114
383 msgid "<Space>\t\tScroll diff view down one page"
384 msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
385
501 -#: gitk:3115
386 msgid "u\t\tScroll diff view up 18 lines"
387 msgstr "u\t\tRulla diffvisningen upp 18 rader"
388
505 -#: gitk:3116
389 msgid "d\t\tScroll diff view down 18 lines"
390 msgstr "d\t\tRulla diffvisningen ned 18 rader"
391
509 -#: gitk:3117
392 #, tcl-format
393 msgid "<%s-F>\t\tFind"
394 msgstr "<%s-F>\t\tSök"
395
514 -#: gitk:3118
396 #, tcl-format
397 msgid "<%s-G>\t\tMove to next find hit"
398 msgstr "<%s-G>\t\tGå till nästa sökträff"
399
519 -#: gitk:3119
400 msgid "<Return>\tMove to next find hit"
401 msgstr "<Return>\t\tGå till nästa sökträff"
402
523 -#: gitk:3120
403 msgid "g\t\tGo to commit"
404 msgstr "g\t\tGå till incheckning"
405
527 -#: gitk:3121
406 msgid "/\t\tFocus the search box"
407 msgstr "/\t\tFokusera sökrutan"
408
531 -#: gitk:3122
409 msgid "?\t\tMove to previous find hit"
410 msgstr "?\t\tGå till föregående sökträff"
411
535 -#: gitk:3123
412 msgid "f\t\tScroll diff view to next file"
413 msgstr "f\t\tRulla diffvisningen till nästa fil"
414
539 -#: gitk:3124
415 #, tcl-format
416 msgid "<%s-S>\t\tSearch for next hit in diff view"
417 msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen"
418
544 -#: gitk:3125
419 #, tcl-format
420 msgid "<%s-R>\t\tSearch for previous hit in diff view"
421 msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen"
422
549 -#: gitk:3126
423 #, tcl-format
424 msgid "<%s-KP+>\tIncrease font size"
425 msgstr "<%s-Num+>\tÖka teckenstorlek"
426
554 -#: gitk:3127
427 #, tcl-format
428 msgid "<%s-plus>\tIncrease font size"
429 msgstr "<%s-plus>\tÖka teckenstorlek"
430
559 -#: gitk:3128
431 #, tcl-format
432 msgid "<%s-KP->\tDecrease font size"
433 msgstr "<%s-Num->\tMinska teckenstorlek"
434
564 -#: gitk:3129
435 #, tcl-format
436 msgid "<%s-minus>\tDecrease font size"
437 msgstr "<%s-minus>\tMinska teckenstorlek"
438
569 -#: gitk:3130
439 msgid "<F5>\t\tUpdate"
440 msgstr "<F5>\t\tUppdatera"
441
573 -#: gitk:3597 gitk:3606
442 #, tcl-format
443 msgid "Error creating temporary directory %s:"
444 msgstr "Fel vid skapande av temporär katalog %s:"
445
578 -#: gitk:3619
446 #, tcl-format
447 msgid "Error getting \"%s\" from %s:"
448 msgstr "Fel vid hämtning av ”%s” från %s:"
449
583 -#: gitk:3682
450 msgid "command failed:"
451 msgstr "kommando misslyckades:"
452
587 -#: gitk:3831
453 msgid "No such commit"
454 msgstr "Incheckning saknas"
455
591 -#: gitk:3845
456 msgid "git gui blame: command failed:"
457 msgstr "git gui blame: kommando misslyckades:"
458
595 -#: gitk:3876
459 #, tcl-format
460 msgid "Couldn't read merge head: %s"
461 msgstr "Kunde inte läsa sammanslagningshuvud: %s"
462
600 -#: gitk:3884
463 #, tcl-format
464 msgid "Error reading index: %s"
465 msgstr "Fel vid läsning av index: %s"
466
605 -#: gitk:3909
467 #, tcl-format
468 msgid "Couldn't start git blame: %s"
469 msgstr "Kunde inte starta git blame: %s"
470
610 -#: gitk:3912 gitk:6801
471 msgid "Searching"
472 msgstr "Söker"
473
614 -#: gitk:3944
474 #, tcl-format
475 msgid "Error running git blame: %s"
476 msgstr "Fel vid körning av git blame: %s"
477
619 -#: gitk:3972
478 #, tcl-format
479 msgid "That line comes from commit %s, which is not in this view"
480 msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy"
481
624 -#: gitk:3986
482 msgid "External diff viewer failed:"
483 msgstr "Externt diff-verktyg misslyckades:"
484
628 -#: gitk:4090
485 msgid "All files"
486 msgstr "Alla filer"
487
632 -#: gitk:4114
488 msgid "View"
489 msgstr "Visa"
490
636 -#: gitk:4117
491 msgid "Gitk view definition"
492 msgstr "Definition av Gitk-vy"
493
640 -#: gitk:4121
494 msgid "Remember this view"
495 msgstr "Spara denna vy"
496
644 -#: gitk:4122
497 msgid "References (space separated list):"
498 msgstr "Referenser (blankstegsavdelad lista):"
499
648 -#: gitk:4123
500 msgid "Branches & tags:"
501 msgstr "Grenar & taggar:"
502
652 -#: gitk:4124
503 msgid "All refs"
504 msgstr "Alla referenser"
505
656 -#: gitk:4125
506 msgid "All (local) branches"
507 msgstr "Alla (lokala) grenar"
508
660 -#: gitk:4126
509 msgid "All tags"
510 msgstr "Alla taggar"
511
664 -#: gitk:4127
512 msgid "All remote-tracking branches"
513 msgstr "Alla fjärrspårande grenar"
514
668 -#: gitk:4128
515 msgid "Commit Info (regular expressions):"
516 msgstr "Incheckningsinfo (reguljära uttryck):"
517
672 -#: gitk:4129
518 msgid "Author:"
519 msgstr "Författare:"
520
676 -#: gitk:4130
521 msgid "Committer:"
522 msgstr "Incheckare:"
523
680 -#: gitk:4131
524 msgid "Commit Message:"
525 msgstr "Incheckningsmeddelande:"
526
684 -#: gitk:4132
527 msgid "Matches all Commit Info criteria"
528 msgstr "Motsvarar alla kriterier för incheckningsinfo"
529
688 -#: gitk:4133
530 msgid "Matches no Commit Info criteria"
531 msgstr "Motsvarar inga kriterier för incheckningsinfo"
532
692 -#: gitk:4134
533 msgid "Changes to Files:"
534 msgstr "Ändringar av filer:"
535
696 -#: gitk:4135
536 msgid "Fixed String"
537 msgstr "Fast sträng"
538
700 -#: gitk:4136
539 msgid "Regular Expression"
540 msgstr "Reguljärt uttryck"
541
704 -#: gitk:4137
542 msgid "Search string:"
543 msgstr "Söksträng:"
544
708 -#: gitk:4138
545 msgid ""
546 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
547 "15:27:38\"):"
@@ -713,205 +549,156 @@ msgstr ""
549 "Incheckningsdatum (”2 weeks ago”, ”2009-03-17 15:27:38”, ”March 17, 2009 "
550 "15:27:38”):"
551
716 -#: gitk:4139
552 msgid "Since:"
553 msgstr "Från:"
554
720 -#: gitk:4140
555 msgid "Until:"
556 msgstr "Till:"
557
724 -#: gitk:4141
558 msgid "Limit and/or skip a number of revisions (positive integer):"
559 msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):"
560
728 -#: gitk:4142
561 msgid "Number to show:"
562 msgstr "Antal att visa:"
563
732 -#: gitk:4143
564 msgid "Number to skip:"
565 msgstr "Antal att hoppa över:"
566
736 -#: gitk:4144
567 msgid "Miscellaneous options:"
568 msgstr "Diverse alternativ:"
569
740 -#: gitk:4145
570 msgid "Strictly sort by date"
571 msgstr "Strikt datumsortering"
572
744 -#: gitk:4146
573 msgid "Mark branch sides"
574 msgstr "Markera sidogrenar"
575
748 -#: gitk:4147
576 msgid "Limit to first parent"
577 msgstr "Begränsa till första förälder"
578
752 -#: gitk:4148
579 msgid "Simple history"
580 msgstr "Enkel historik"
581
756 -#: gitk:4149
582 msgid "Additional arguments to git log:"
583 msgstr "Ytterligare argument till git log:"
584
760 -#: gitk:4150
585 msgid "Enter files and directories to include, one per line:"
586 msgstr "Ange filer och kataloger att ta med, en per rad:"
587
764 -#: gitk:4151
588 msgid "Command to generate more commits to include:"
589 msgstr "Kommando för att generera fler incheckningar att ta med:"
590
768 -#: gitk:4275
591 msgid "Gitk: edit view"
592 msgstr "Gitk: redigera vy"
593
772 -#: gitk:4283
594 msgid "-- criteria for selecting revisions"
595 msgstr " - kriterier för val av revisioner"
596
776 -#: gitk:4288
597 msgid "View Name"
598 msgstr "Namn på vy"
599
780 -#: gitk:4363
600 msgid "Apply (F5)"
601 msgstr "Använd (F5)"
602
784 -#: gitk:4401
603 msgid "Error in commit selection arguments:"
604 msgstr "Fel i argument för val av incheckningar:"
605
788 -#: gitk:4456 gitk:4509 gitk:4971 gitk:4985 gitk:6255 gitk:12615 gitk:12616
606 msgid "None"
607 msgstr "Inget"
608
792 -#: gitk:5068 gitk:5073
609 msgid "Descendant"
610 msgstr "Avkomling"
611
796 -#: gitk:5069
612 msgid "Not descendant"
613 msgstr "Inte avkomling"
614
800 -#: gitk:5076 gitk:5081
615 msgid "Ancestor"
616 msgstr "Förfader"
617
804 -#: gitk:5077
618 msgid "Not ancestor"
619 msgstr "Inte förfader"
620
808 -#: gitk:5371
621 msgid "Local changes checked in to index but not committed"
622 msgstr "Lokala ändringar sparade i indexet men inte incheckade"
623
812 -#: gitk:5407
624 msgid "Local uncommitted changes, not checked in to index"
625 msgstr "Lokala ändringar, ej sparade i indexet"
626
816 -#: gitk:7155
627 msgid "Error starting web browser:"
628 msgstr "Fel när webbläsaren skulle startas:"
629
820 -#: gitk:7216
630 msgid "and many more"
631 msgstr "med många flera"
632
824 -#: gitk:7219
633 msgid "many"
634 msgstr "många"
635
828 -#: gitk:7410
636 msgid "Tags:"
637 msgstr "Taggar:"
638
832 -#: gitk:7427 gitk:7433 gitk:8912
639 msgid "Parent"
640 msgstr "Förälder"
641
836 -#: gitk:7438
642 msgid "Child"
643 msgstr "Barn"
644
840 -#: gitk:7447
645 msgid "Branch"
646 msgstr "Gren"
647
844 -#: gitk:7450
648 msgid "Follows"
649 msgstr "Följer"
650
848 -#: gitk:7453
651 msgid "Precedes"
652 msgstr "Föregår"
653
852 -#: gitk:8048
654 #, tcl-format
655 msgid "Error getting diffs: %s"
656 msgstr "Fel vid hämtning av diff: %s"
657
857 -#: gitk:8737
658 msgid "Goto:"
659 msgstr "Gå till:"
660
861 -#: gitk:8758
661 #, tcl-format
662 msgid "Short SHA1 id %s is ambiguous"
663 msgstr "Förkortat SHA1-id %s är tvetydigt"
664
866 -#: gitk:8765
665 #, tcl-format
666 msgid "Revision %s is not known"
667 msgstr "Revisionen %s är inte känd"
668
871 -#: gitk:8775
669 #, tcl-format
670 msgid "SHA1 id %s is not known"
671 msgstr "SHA-id:t %s är inte känt"
672
876 -#: gitk:8777
673 #, tcl-format
674 msgid "Revision %s is not in the current view"
675 msgstr "Revisionen %s finns inte i den nuvarande vyn"
676
881 -#: gitk:8919 gitk:8934
677 msgid "Date"
678 msgstr "Datum"
679
885 -#: gitk:8922
680 msgid "Children"
681 msgstr "Barn"
682
889 -#: gitk:8985
683 #, tcl-format
684 msgid "Reset %s branch to here"
685 msgstr "Återställ grenen %s hit"
686
894 -#: gitk:8987
687 msgid "Detached head: can't reset"
688 msgstr "Frånkopplad head: kan inte återställa"
689
898 -#: gitk:9092 gitk:9098
690 msgid "Skipping merge commit "
691 msgstr "Hoppar över sammanslagningsincheckning "
692
902 -#: gitk:9107 gitk:9112
693 msgid "Error getting patch ID for "
694 msgstr "Fel vid hämtning av patch-id för "
695
906 -#: gitk:9108 gitk:9113
696 msgid " - stopping\n"
697 msgstr " - stannar\n"
698
910 -#: gitk:9118 gitk:9121 gitk:9129 gitk:9143 gitk:9152
699 msgid "Commit "
700 msgstr "Incheckning "
701
914 -#: gitk:9122
702 msgid ""
703 " is the same patch as\n"
704 " "
@@ -919,7 +706,6 @@ msgstr ""
706 " är samma patch som\n"
707 " "
708
922 -#: gitk:9130
709 msgid ""
710 " differs from\n"
711 " "
@@ -927,7 +713,6 @@ msgstr ""
713 " skiljer sig från\n"
714 " "
715
930 -#: gitk:9132
716 msgid ""
717 "Diff of commits:\n"
718 "\n"
@@ -935,148 +720,114 @@ msgstr ""
720 "Skillnad mellan incheckningar:\n"
721 "\n"
722
938 -#: gitk:9144 gitk:9153
723 #, tcl-format
724 msgid " has %s children - stopping\n"
725 msgstr " har %s barn - stannar\n"
726
943 -#: gitk:9172
727 #, tcl-format
728 msgid "Error writing commit to file: %s"
729 msgstr "Fel vid skrivning av incheckning till fil: %s"
730
948 -#: gitk:9178
731 #, tcl-format
732 msgid "Error diffing commits: %s"
733 msgstr "Fel vid jämförelse av incheckningar: %s"
734
953 -#: gitk:9224
735 msgid "Top"
736 msgstr "Topp"
737
957 -#: gitk:9225
738 msgid "From"
739 msgstr "Från"
740
961 -#: gitk:9230
741 msgid "To"
742 msgstr "Till"
743
965 -#: gitk:9254
744 msgid "Generate patch"
745 msgstr "Generera patch"
746
969 -#: gitk:9256
747 msgid "From:"
748 msgstr "Från:"
749
973 -#: gitk:9265
750 msgid "To:"
751 msgstr "Till:"
752
977 -#: gitk:9274
753 msgid "Reverse"
754 msgstr "Vänd"
755
981 -#: gitk:9276 gitk:9486
756 msgid "Output file:"
757 msgstr "Utdatafil:"
758
985 -#: gitk:9282
759 msgid "Generate"
760 msgstr "Generera"
761
989 -#: gitk:9320
762 msgid "Error creating patch:"
763 msgstr "Fel vid generering av patch:"
764
993 -#: gitk:9343 gitk:9474 gitk:9562
765 msgid "ID:"
766 msgstr "Id:"
767
997 -#: gitk:9352
768 msgid "Tag name:"
769 msgstr "Taggnamn:"
770
1001 -#: gitk:9355
771 msgid "Tag message is optional"
772 msgstr "Taggmeddelandet är valfritt"
773
1005 -#: gitk:9357
774 msgid "Tag message:"
775 msgstr "Taggmeddelande:"
776
1009 -#: gitk:9361 gitk:9532
777 msgid "Create"
778 msgstr "Skapa"
779
1013 -#: gitk:9379
780 msgid "No tag name specified"
781 msgstr "Inget taggnamn angavs"
782
1017 -#: gitk:9383
783 #, tcl-format
784 msgid "Tag \"%s\" already exists"
785 msgstr "Taggen ”%s” finns redan"
786
1022 -#: gitk:9393
787 msgid "Error creating tag:"
788 msgstr "Fel vid skapande av tagg:"
789
1026 -#: gitk:9483
790 msgid "Command:"
791 msgstr "Kommando:"
792
1030 -#: gitk:9491
793 msgid "Write"
794 msgstr "Skriv"
795
1034 -#: gitk:9509
796 msgid "Error writing commit:"
797 msgstr "Fel vid skrivning av incheckning:"
798
1038 -#: gitk:9531
799 msgid "Create branch"
800 msgstr "Skapa gren"
801
1042 -#: gitk:9547
802 #, tcl-format
803 msgid "Rename branch %s"
804 msgstr "Byt namn på grenen %s"
805
1047 -#: gitk:9548
806 msgid "Rename"
807 msgstr "Byt namn"
808
1051 -#: gitk:9572
809 msgid "Name:"
810 msgstr "Namn:"
811
1055 -#: gitk:9596
812 msgid "Please specify a name for the new branch"
813 msgstr "Ange ett namn för den nya grenen"
814
1059 -#: gitk:9601
815 #, tcl-format
816 msgid "Branch '%s' already exists. Overwrite?"
817 msgstr "Grenen ”%s” finns redan. Skriva över?"
818
1064 -#: gitk:9645
819 msgid "Please specify a new name for the branch"
820 msgstr "Ange ett nytt namn för grenen"
821
1068 -#: gitk:9708
822 #, tcl-format
823 msgid "Commit %s is already included in branch %s -- really re-apply it?"
824 msgstr ""
825 "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras "
826 "på nytt?"
827
1075 -#: gitk:9713
828 msgid "Cherry-picking"
829 msgstr "Plockar"
830
1079 -#: gitk:9722
831 #, tcl-format
832 msgid ""
833 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1086,7 +837,6 @@ msgstr ""
837 "Checka in, återställ eller spara undan (stash) dina ändringar och försök "
838 "igen."
839
1089 -#: gitk:9728
840 msgid ""
841 "Cherry-pick failed because of merge conflict.\n"
842 "Do you wish to run git citool to resolve it?"
@@ -1094,20 +844,16 @@ msgstr ""
844 "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n"
845 "Vill du köra git citool för att lösa den?"
846
1097 -#: gitk:9744 gitk:9802
847 msgid "No changes committed"
848 msgstr "Inga ändringar incheckade"
849
1101 -#: gitk:9771
850 #, tcl-format
851 msgid "Commit %s is not included in branch %s -- really revert it?"
852 msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?"
853
1106 -#: gitk:9776
854 msgid "Reverting"
855 msgstr "Ångrar"
856
1110 -#: gitk:9784
857 #, tcl-format
858 msgid ""
859 "Revert failed because of local changes to the following files:%s Please "
@@ -1117,7 +863,6 @@ msgstr ""
863 "Checka in, återställ eller spara undan (stash) dina ändringar och försök "
864 "igen."
865
1120 -#: gitk:9788
866 msgid ""
867 "Revert failed because of merge conflict.\n"
868 " Do you wish to run git citool to resolve it?"
@@ -1125,28 +870,22 @@ msgstr ""
870 "Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n"
871 " Vill du köra git citool för att lösa den?"
872
1128 -#: gitk:9831
873 msgid "Confirm reset"
874 msgstr "Bekräfta återställning"
875
1132 -#: gitk:9833
876 #, tcl-format
877 msgid "Reset branch %s to %s?"
878 msgstr "Återställa grenen %s till %s?"
879
1137 -#: gitk:9835
880 msgid "Reset type:"
881 msgstr "Typ av återställning:"
882
1141 -#: gitk:9838
883 msgid "Soft: Leave working tree and index untouched"
884 msgstr "Mjuk: Rör inte utcheckning och index"
885
1145 -#: gitk:9841
886 msgid "Mixed: Leave working tree untouched, reset index"
887 msgstr "Blandad: Rör inte utcheckning, återställ index"
888
1149 -#: gitk:9844
889 msgid ""
890 "Hard: Reset working tree and index\n"
891 "(discard ALL local changes)"
@@ -1154,24 +893,19 @@ msgstr ""
893 "Hård: Återställ utcheckning och index\n"
894 "(förkastar ALLA lokala ändringar)"
895
1157 -#: gitk:9861
896 msgid "Resetting"
897 msgstr "Återställer"
898
1161 -#: gitk:9934
899 #, tcl-format
900 msgid "A local branch named %s exists already"
901 msgstr "Det finns redan en lokal gren som heter %s"
902
1166 -#: gitk:9942
903 msgid "Checking out"
904 msgstr "Checkar ut"
905
1170 -#: gitk:10001
906 msgid "Cannot delete the currently checked-out branch"
907 msgstr "Kan inte ta bort den just nu utcheckade grenen"
908
1174 -#: gitk:10007
909 #, tcl-format
910 msgid ""
911 "The commits on branch %s aren't on any other branch.\n"
@@ -1180,16 +914,13 @@ msgstr ""
914 "Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
915 "Vill du verkligen ta bort grenen %s?"
916
1183 -#: gitk:10038
917 #, tcl-format
918 msgid "Tags and heads: %s"
919 msgstr "Taggar och huvuden: %s"
920
1188 -#: gitk:10055
921 msgid "Filter"
922 msgstr "Filter"
923
1192 -#: gitk:10356
924 msgid ""
925 "Error reading commit topology information; branch and preceding/following "
926 "tag information will be incomplete."
@@ -1197,221 +928,167 @@ msgstr ""
928 "Fel vid läsning av information om incheckningstopologi; information om "
929 "grenar och föregående/senare taggar kommer inte vara komplett."
930
1200 -#: gitk:11333
931 msgid "Tag"
932 msgstr "Tagg"
933
1204 -#: gitk:11337
934 msgid "Id"
935 msgstr "Id"
936
1208 -#: gitk:11420
937 msgid "Gitk font chooser"
938 msgstr "Teckensnittsväljare för Gitk"
939
1212 -#: gitk:11437
940 msgid "B"
941 msgstr "F"
942
1216 -#: gitk:11440
943 msgid "I"
944 msgstr "K"
945
1220 -#: gitk:11558
946 msgid "Commit list display options"
947 msgstr "Alternativ för incheckningslistvy"
948
1224 -#: gitk:11561
949 msgid "Maximum graph width (lines)"
950 msgstr "Maximal grafbredd (rader)"
951
1228 -#: gitk:11565
952 #, no-tcl-format
953 msgid "Maximum graph width (% of pane)"
954 msgstr "Maximal grafbredd (% av ruta)"
955
1233 -#: gitk:11568
956 msgid "Show local changes"
957 msgstr "Visa lokala ändringar"
958
1237 -#: gitk:11571
959 msgid "Auto-select SHA1 (length)"
960 msgstr "Välj SHA1 (längd) automatiskt"
961
1241 -#: gitk:11575
962 msgid "Hide remote refs"
963 msgstr "Dölj fjärr-referenser"
964
1245 -#: gitk:11579
965 msgid "Diff display options"
966 msgstr "Alternativ för diffvy"
967
1249 -#: gitk:11581
968 msgid "Tab spacing"
969 msgstr "Blanksteg för tabulatortecken"
970
1253 -#: gitk:11584
971 msgid "Display nearby tags/heads"
972 msgstr "Visa närliggande taggar/huvuden"
973
1257 -#: gitk:11587
974 msgid "Maximum # tags/heads to show"
975 msgstr "Maximalt antal taggar/huvuden att visa"
976
1261 -#: gitk:11590
977 msgid "Limit diffs to listed paths"
978 msgstr "Begränsa diff till listade sökvägar"
979
1265 -#: gitk:11593
980 msgid "Support per-file encodings"
981 msgstr "Stöd för filspecifika teckenkodningar"
982
1269 -#: gitk:11599 gitk:11766
983 msgid "External diff tool"
984 msgstr "Externt diff-verktyg"
985
1273 -#: gitk:11600
986 msgid "Choose..."
987 msgstr "Välj..."
988
1277 -#: gitk:11607
989 msgid "Web browser"
990 msgstr "Webbläsare"
991
1281 -#: gitk:11612
992 msgid "General options"
993 msgstr "Allmänna inställningar"
994
1285 -#: gitk:11615
995 msgid "Use themed widgets"
996 msgstr "Använd tema på fönsterelement"
997
1289 -#: gitk:11617
998 msgid "(change requires restart)"
999 msgstr "(ändringen kräver omstart)"
1000
1293 -#: gitk:11619
1001 msgid "(currently unavailable)"
1002 msgstr "(för närvarande inte tillgängligt)"
1003
1297 -#: gitk:11631
1004 msgid "Colors: press to choose"
1005 msgstr "Färger: tryck för att välja"
1006
1301 -#: gitk:11634
1007 msgid "Interface"
1008 msgstr "Gränssnitt"
1009
1305 -#: gitk:11635
1010 msgid "interface"
1011 msgstr "gränssnitt"
1012
1309 -#: gitk:11638
1013 msgid "Background"
1014 msgstr "Bakgrund"
1015
1313 -#: gitk:11639 gitk:11681
1016 msgid "background"
1017 msgstr "bakgrund"
1018
1317 -#: gitk:11642
1019 msgid "Foreground"
1020 msgstr "Förgrund"
1021
1321 -#: gitk:11643
1022 msgid "foreground"
1023 msgstr "förgrund"
1024
1325 -#: gitk:11646
1025 msgid "Diff: old lines"
1026 msgstr "Diff: gamla rader"
1027
1329 -#: gitk:11647
1028 msgid "diff old lines"
1029 msgstr "diff gamla rader"
1030
1333 -#: gitk:11651
1031 msgid "Diff: old lines bg"
1032 msgstr "Diff: gamla rader bg"
1033
1337 -#: gitk:11653
1034 msgid "diff old lines bg"
1035 msgstr "diff gamla rader bg"
1036
1341 -#: gitk:11657
1037 msgid "Diff: new lines"
1038 msgstr "Diff: nya rader"
1039
1345 -#: gitk:11658
1040 msgid "diff new lines"
1041 msgstr "diff nya rader"
1042
1349 -#: gitk:11662
1043 msgid "Diff: new lines bg"
1044 msgstr "Diff: nya rader bg"
1045
1353 -#: gitk:11664
1046 msgid "diff new lines bg"
1047 msgstr "diff nya rader bg"
1048
1357 -#: gitk:11668
1049 msgid "Diff: hunk header"
1050 msgstr "Diff: delhuvud"
1051
1361 -#: gitk:11670
1052 msgid "diff hunk header"
1053 msgstr "diff delhuvud"
1054
1365 -#: gitk:11674
1055 msgid "Marked line bg"
1056 msgstr "Markerad rad bakgrund"
1057
1369 -#: gitk:11676
1058 msgid "marked line background"
1059 msgstr "markerad rad bakgrund"
1060
1373 -#: gitk:11680
1061 msgid "Select bg"
1062 msgstr "Markerad bakgrund"
1063
1377 -#: gitk:11689
1064 msgid "Fonts: press to choose"
1065 msgstr "Teckensnitt: tryck för att välja"
1066
1381 -#: gitk:11691
1067 msgid "Main font"
1068 msgstr "Huvudteckensnitt"
1069
1385 -#: gitk:11692
1070 msgid "Diff display font"
1071 msgstr "Teckensnitt för diffvisning"
1072
1389 -#: gitk:11693
1073 msgid "User interface font"
1074 msgstr "Teckensnitt för användargränssnitt"
1075
1393 -#: gitk:11715
1076 msgid "Gitk preferences"
1077 msgstr "Inställningar för Gitk"
1078
1397 -#: gitk:11724
1079 msgid "General"
1080 msgstr "Allmänt"
1081
1401 -#: gitk:11725
1082 msgid "Colors"
1083 msgstr "Färger"
1084
1405 -#: gitk:11726
1085 msgid "Fonts"
1086 msgstr "Teckensnitt"
1087
1409 -#: gitk:11776
1088 #, tcl-format
1089 msgid "Gitk: choose color for %s"
1090 msgstr "Gitk: välj färg för %s"
1091
1414 -#: gitk:12289
1092 msgid ""
1093 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1094 " Gitk requires at least Tcl/Tk 8.4."
@@ -1419,15 +1096,12 @@ msgstr ""
1096 "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
1097 " Gitk kräver åtminstone Tcl/Tk 8.4."
1098
1422 -#: gitk:12507
1099 msgid "Cannot find a git repository here."
1100 msgstr "Hittar inget git-arkiv här."
1101
1426 -#: gitk:12554
1102 #, tcl-format
1103 msgid "Ambiguous argument '%s': both revision and filename"
1104 msgstr "Tvetydigt argument ”%s”: både revision och filnamn"
1105
1431 -#: gitk:12566
1106 msgid "Bad arguments to gitk:"
1107 msgstr "Felaktiga argument till gitk:"
po/ta.po
+25 -364
@@ -17,360 +17,270 @@ msgstr ""
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
20 -#: gitk:274
20 msgid "Couldn't get list of unmerged files:"
21 msgstr "ஒருங்கிணைக்கப்படாத கோப்புகளின் பட்டியலைப் பெற முடியவில்லை:"
22
24 -#: gitk:346 gitk:2565
23 msgid "Color words"
24 msgstr "வண்ண சொற்கள்"
25
28 -#: gitk:351 gitk:2565 gitk:8476 gitk:8509
26 msgid "Markup words"
27 msgstr "குறிக்கப்பட்ட சொற்கள்"
28
32 -#: gitk:458
29 msgid "Error parsing revisions:"
30 msgstr "பிழைகளை பாகுபடுத்துதல்:"
31
36 -#: gitk:524
32 msgid "Error executing --argscmd command:"
33 msgstr "--argscmd கட்டளையை இயக்குவதில் பிழை:"
34
40 -#: gitk:537
35 msgid "No files selected: --merge specified but no files are unmerged."
36 msgstr ""
43 -"கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை: --ஒன்றிணை குறிப்பிடப்பட்டுள்ளது, "
44 -"ஆனால் கோப்புகள் எதுவும் அவிழ்க்கப்படவில்லை."
37 +"கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை: --ஒன்றிணை குறிப்பிடப்பட்டுள்ளது, ஆனால் கோப்புகள் "
38 +"எதுவும் அவிழ்க்கப்படவில்லை."
39
46 -#: gitk:540
40 msgid ""
41 "No files selected: --merge specified but no unmerged files are within file "
42 "limit."
43 msgstr ""
51 -"கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை: --ஒன்றிணை குறிப்பிடப்பட்டுள்ளது, "
52 -"ஆனால் அவிழ்க்கப்படாத கோப்புகள் எதுவும் கோப்பு வரம்பிற்குள் இல்லை."
44 +"கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை: --ஒன்றிணை குறிப்பிடப்பட்டுள்ளது, ஆனால் "
45 +"அவிழ்க்கப்படாத கோப்புகள் எதுவும் கோப்பு வரம்பிற்குள் இல்லை."
46
54 -#: gitk:565 gitk:720
47 msgid "Error executing git log:"
48 msgstr "அறிவிலி பதிவை இயக்குவதில் பிழை:"
49
58 -#: gitk:583 gitk:736
50 msgid "Reading"
51 msgstr "படித்தல்"
52
62 -#: gitk:643 gitk:4736
53 msgid "Reading commits..."
54 msgstr "உறுதிமொழிகளைப் படித்தல்..."
55
66 -#: gitk:646 gitk:1795 gitk:4739
56 msgid "No commits selected"
57 msgstr "எந்த உறுதிமொழிகளும் தேர்ந்தெடுக்கப்படவில்லை"
58
70 -#: gitk:1603 gitk:4256 gitk:12883
59 msgid "Command line"
60 msgstr "கட்டளை வரி"
61
74 -#: gitk:1669
62 msgid "Can't parse git log output:"
63 msgstr "அறிவிலி பதிவு வெளியீட்டை அலச முடியாது:"
64
78 -#: gitk:1898
65 msgid "No commit information available"
66 msgstr "உறுதிமொழி செய்தி எதுவும் கிடைக்கவில்லை"
67
82 -#: gitk:2065 gitk:2094 gitk:4526 gitk:10016 gitk:11626 gitk:11946
68 msgid "OK"
69 msgstr "சரி"
70
86 -#: gitk:2096 gitk:4528 gitk:9452 gitk:9531 gitk:9661 gitk:9747 gitk:10018
87 -#: gitk:11627 gitk:11947
71 msgid "Cancel"
72 msgstr "நீக்கறல்"
73
91 -#: gitk:2249
74 msgid "&Update"
75 msgstr "புதுப்பித்தல்"
76
95 -#: gitk:2250
77 msgid "&Reload"
78 msgstr "மீண்டும் ஏற்று"
79
99 -#: gitk:2251
80 msgid "Reread re&ferences"
81 msgstr "குறிப்புகளை மீண்டும் படி"
82
103 -#: gitk:2252
83 msgid "&List references"
84 msgstr "பட்டியல் குறிப்புகள்"
85
107 -#: gitk:2254
86 msgid "Start git &gui"
87 msgstr "அறிவிலி இடைமுகத்தைத் தொடங்கு"
88
111 -#: gitk:2256
89 msgid "&Quit"
90 msgstr "வெளியேறு"
91
115 -#: gitk:2248
92 msgid "&File"
93 msgstr "கோப்பு"
94
119 -#: gitk:2260
95 msgid "&Preferences"
96 msgstr "விருப்பத்தேர்வுகள்"
97
123 -#: gitk:2259
98 msgid "&Edit"
99 msgstr "திருத்து"
100
127 -#: gitk:2264
101 msgid "&New view..."
102 msgstr "புதிய பார்வை..."
103
131 -#: gitk:2265
104 msgid "&Edit view..."
105 msgstr "பார்வையைத் திருத்து..."
106
135 -#: gitk:2266
107 msgid "&Delete view"
108 msgstr "பார்வையை நீக்கு"
109
139 -#: gitk:2268
110 msgid "&All files"
111 msgstr "அனைத்து கோப்புகளும்"
112
143 -#: gitk:2263
113 msgid "&View"
114 msgstr "காண்க"
115
147 -#: gitk:2273 gitk:2283
116 msgid "&About gitk"
117 msgstr "அறிவிலிகே பற்றி"
118
151 -#: gitk:2274 gitk:2288
119 msgid "&Key bindings"
120 msgstr "முக்கிய பிணைப்புகள்"
121
155 -#: gitk:2272 gitk:2287
122 msgid "&Help"
123 msgstr "உதவி"
124
159 -#: gitk:2365 gitk:8908
125 msgid "Commit ID:"
126 msgstr "உறுதிமொழி அடையாளம்:"
127
163 -#: gitk:2409
128 msgid "Row"
129 msgstr "நிரை"
130
167 -#: gitk:2447
131 msgid "Find"
132 msgstr "கண்டுபிடி"
133
171 -#: gitk:2475
134 msgid "commit"
135 msgstr "உறுதிமொழி"
136
175 -#: gitk:2479 gitk:2481 gitk:4898 gitk:4921 gitk:4945 gitk:6966 gitk:7038
176 -#: gitk:7123
137 msgid "containing:"
138 msgstr "கொண்டிருக்கிறது:"
139
180 -#: gitk:2482 gitk:3737 gitk:3742 gitk:4974
140 msgid "touching paths:"
141 msgstr "தொடும் பாதைகள்:"
142
184 -#: gitk:2483 gitk:4988
143 msgid "adding/removing string:"
144 msgstr "சரத்தைச் சேர்ப்பது/அகற்றுவது:"
145
188 -#: gitk:2484 gitk:4990
146 msgid "changing lines matching:"
147 msgstr "பொருந்தக்கூடிய வரிகளை மாற்றுதல்:"
148
192 -#: gitk:2493 gitk:2495 gitk:4977
149 msgid "Exact"
150 msgstr "சரியான"
151
196 -#: gitk:2495 gitk:5065 gitk:6934
152 msgid "IgnCase"
153 msgstr "வழக்குதவிர்"
154
200 -#: gitk:2495 gitk:4947 gitk:5063 gitk:6930
155 msgid "Regexp"
156 msgstr "வழக்கவெளி"
157
204 -#: gitk:2497 gitk:2498 gitk:5085 gitk:5115 gitk:5122 gitk:7059 gitk:7127
158 msgid "All fields"
159 msgstr "அனைத்து புலங்களும்"
160
208 -#: gitk:2498 gitk:5082 gitk:5115 gitk:6997
161 msgid "Headline"
162 msgstr "தலைப்பு"
163
212 -#: gitk:2499 gitk:5082 gitk:6997 gitk:7127 gitk:7639
164 msgid "Comments"
165 msgstr "கருத்துகள்"
166
216 -#: gitk:2499 gitk:5082 gitk:5087 gitk:5122 gitk:6997 gitk:7574 gitk:9086
217 -#: gitk:9101
167 msgid "Author"
168 msgstr "நூலாசிரியர்"
169
221 -#: gitk:2499 gitk:5082 gitk:6997 gitk:7576
170 msgid "Committer"
171 msgstr "உறுதிமொழிபவர்"
172
225 -#: gitk:2533
173 msgid "Search"
174 msgstr "தேடு"
175
229 -#: gitk:2541
176 msgid "Diff"
177 msgstr "வேறுபாடு"
178
233 -#: gitk:2543
179 msgid "Old version"
180 msgstr "பழைய பதிப்பு"
181
237 -#: gitk:2545
182 msgid "New version"
183 msgstr "புதிய பதிப்பு"
184
241 -#: gitk:2548
185 msgid "Lines of context"
186 msgstr "சூழலின் வரிகள்"
187
245 -#: gitk:2558
188 msgid "Ignore space change"
189 msgstr "இடைவெளி மாற்றத்தை புறக்கணி"
190
249 -#: gitk:2562 gitk:2564 gitk:8209 gitk:8462
191 msgid "Line diff"
192 msgstr "வரி வேறுபாடு"
193
253 -#: gitk:2637
194 msgid "Patch"
195 msgstr "ஒட்டு"
196
257 -#: gitk:2639
197 msgid "Tree"
198 msgstr "மரம்"
199
261 -#: gitk:2814 gitk:2835
200 msgid "Diff this -> selected"
201 msgstr "இதை வேறுபடுத்துங்கள் -> தேர்ந்தெடுக்கப்பட்டது"
202
265 -#: gitk:2815 gitk:2836
203 msgid "Diff selected -> this"
204 msgstr "வேறுபாடு தேர்ந்தெடுக்கப்பட்டது -> இது"
205
269 -#: gitk:2816 gitk:2837
206 msgid "Make patch"
207 msgstr "ஒட்டு செய்"
208
273 -#: gitk:2817 gitk:9510
209 msgid "Create tag"
210 msgstr "குறிச்சொல்லை உருவாக்கு"
211
277 -#: gitk:2818
212 msgid "Copy commit reference"
213 msgstr "உறுதிமொழி குறிப்பு நகலெடு"
214
281 -#: gitk:2819 gitk:9641
215 msgid "Write commit to file"
216 msgstr "கோப்பில் உறவை எழுதுங்கள்"
217
285 -#: gitk:2820
218 msgid "Create new branch"
219 msgstr "புதிய கிளையை உருவாக்கு"
220
289 -#: gitk:2821
221 msgid "Cherry-pick this commit"
222 msgstr "கனி-எடு இந்த உறுதிமொழி"
223
293 -#: gitk:2822
224 msgid "Reset HEAD branch to here"
225 msgstr "தலை கிளையை இங்கே மீட்டமை"
226
297 -#: gitk:2823
227 msgid "Mark this commit"
228 msgstr "இந்த உறுதிமொழியைக் குறி"
229
301 -#: gitk:2824
230 msgid "Return to mark"
231 msgstr "மார்க்குக்குத் திரும்பு"
232
305 -#: gitk:2825
233 msgid "Find descendant of this and mark"
234 msgstr "இதன் வழித்தோன்றலைக் கண்டுபிடித்து குறி"
235
309 -#: gitk:2826
236 msgid "Compare with marked commit"
237 msgstr "குறிக்கப்பட்ட உறுதிப்பாட்டுடன் ஒப்பிடுக"
238
313 -#: gitk:2827 gitk:2838
239 msgid "Diff this -> marked commit"
240 msgstr "இதை வேறுபடுத்துங்கள் -> குறிக்கப்பட்ட உறுதிமொழி"
241
317 -#: gitk:2828 gitk:2839
242 msgid "Diff marked commit -> this"
243 msgstr "வேறுபாடு குறிக்கப்பட்ட உறுதிமொழி -> இது"
244
321 -#: gitk:2829
245 msgid "Revert this commit"
246 msgstr "இந்த உறுதிப்பாட்டை மாற்றவும்"
247
325 -#: gitk:2845
248 msgid "Check out this branch"
249 msgstr "இந்த கிளையைப் பாருங்கள்"
250
329 -#: gitk:2846
251 msgid "Rename this branch"
252 msgstr "இந்த கிளையை மறுபெயரிடு"
253
333 -#: gitk:2847
254 msgid "Remove this branch"
255 msgstr "இந்த கிளையை அகற்று"
256
337 -#: gitk:2848
257 msgid "Copy branch name"
258 msgstr "கிளை பெயரை நகலெடு"
259
341 -#: gitk:2855
260 msgid "Highlight this too"
261 msgstr "இதை முன்னிலைப்படுத்து"
262
345 -#: gitk:2856
263 msgid "Highlight this only"
264 msgstr "இதை முன்னிலைப்படுத்து"
265
349 -#: gitk:2857
266 msgid "External diff"
267 msgstr "வெளிப்புற வேறுபாடு"
268
353 -#: gitk:2858
269 msgid "Blame parent commit"
270 msgstr "பெற்றோரை குற்றம் சாட்டு"
271
357 -#: gitk:2859
272 msgid "Copy path"
273 msgstr "நகல் பாதை"
274
361 -#: gitk:2866
275 msgid "Show origin of this line"
276 msgstr "இந்த வரியின் தோற்றத்தைக் காட்டு"
277
365 -#: gitk:2867
278 msgid "Run git gui blame on this line"
279 msgstr "இந்த வரியில் அறிவிலி இடைமுகம் பழியை இயக்கு"
280
369 -#: gitk:3221
281 msgid "About gitk"
282 msgstr "அறிவிலிகே பற்றி"
283
373 -#: gitk:3223
284 msgid ""
285 "\n"
286 "Gitk - a commit viewer for git\n"
@@ -386,697 +296,533 @@ msgstr ""
296 "\n"
297 "குனு பொது பொதுமக்கள் உரிமத்தின் விதிமுறைகளின் கீழ் பயன்படுத்தவும் மறுபகிர்வு செய்யவும்"
298
389 -#: gitk:3231 gitk:3298 gitk:10231
299 msgid "Close"
300 msgstr "மூடு"
301
393 -#: gitk:3252
302 msgid "Gitk key bindings"
303 msgstr "அறிவிலிகே விசை பிணைப்புகள்"
304
397 -#: gitk:3255
305 msgid "Gitk key bindings:"
306 msgstr "அறிவிலிகே விசை பிணைப்புகள்:"
307
401 -#: gitk:3257
308 #, tcl-format
309 msgid "<%s-Q>\t\tQuit"
310 msgstr "<%s-Q>\t\tவெளியேறு"
311
406 -#: gitk:3258
312 #, tcl-format
313 msgid "<%s-W>\t\tClose window"
314 msgstr "<%s-w>\t\tசாளரத்தை மூடு"
315
411 -#: gitk:3259
316 msgid "<Home>\t\tMove to first commit"
317 msgstr "<வீடு> முதல் உறுதிமொழிக்கு நகர்த்து"
318
415 -#: gitk:3260
319 msgid "<End>\t\tMove to last commit"
320 msgstr "<முடி> கடைசி உறுதிமொழிக்கு நகர்த்து"
321
419 -#: gitk:3261
322 msgid "<Up>, p, k\tMove up one commit"
323 msgstr "<மேலே>, பி, கே\tஒரு உறுதிமொழியை மேலே நகர்த்து"
324
423 -#: gitk:3262
325 msgid "<Down>, n, j\tMove down one commit"
326 msgstr "<கீழ்>, n, j\tஒரு உறுதிமொழியை கீழே நகர்த்து"
327
427 -#: gitk:3263
328 msgid "<Left>, z, h\tGo back in history list"
329 msgstr "<இடது>, z, h\tவரலாற்று பட்டியலில் திரும்பிச் செல்"
330
431 -#: gitk:3264
331 msgid "<Right>, x, l\tGo forward in history list"
332 msgstr "<வலது>, x, l\tவரலாற்று பட்டியலில் முன்னோக்கி செல்"
333
435 -#: gitk:3265
334 #, tcl-format
335 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
438 -msgstr ""
439 -"<%s-n> வரலாற்று பட்டியலில் தற்போதைய உறுதிப்பாட்டின் n- வது பெற்றோரிடம் "
440 -"செல்"
336 +msgstr "<%s-n> வரலாற்று பட்டியலில் தற்போதைய உறுதிப்பாட்டின் n- வது பெற்றோரிடம் செல்"
337
442 -#: gitk:3266
338 msgid "<PageUp>\tMove up one page in commit list"
339 msgstr "<பக்கம்மேல்>\tஉறுதிமொழி பட்டியலில் ஒரு பக்கத்தை நகர்த்து"
340
446 -#: gitk:3267
341 msgid "<PageDown>\tMove down one page in commit list"
342 msgstr "<பக்கம்கீழ்>\tஉறுதிமொழி பட்டியலில் ஒரு பக்கத்தை நகர்த்து"
343
450 -#: gitk:3268
344 #, tcl-format
345 msgid "<%s-Home>\tScroll to top of commit list"
346 msgstr "<%s-வீடு>\tஉறுதிமொழி பட்டியலை மேல் பகுதிக்கு உருட்டவும்"
347
455 -#: gitk:3269
348 #, tcl-format
349 msgid "<%s-End>\tScroll to bottom of commit list"
350 msgstr "<%s-முடி> உறுதிமொழி பட்டியலின் கீழ் பகுதிக்கு உருட்டவும்"
351
460 -#: gitk:3270
352 #, tcl-format
353 msgid "<%s-Up>\tScroll commit list up one line"
354 msgstr "<%s-மேலே>\tஉறுதிமொழி பட்டியலை ஒரு வரி மேலே உருட்டவும்"
355
465 -#: gitk:3271
356 #, tcl-format
357 msgid "<%s-Down>\tScroll commit list down one line"
358 msgstr "<%s-கீழ்>\tஉறுதிமொழி பட்டியலை ஒரு வரி கீழே உருட்டவும்"
359
470 -#: gitk:3272
360 #, tcl-format
361 msgid "<%s-PageUp>\tScroll commit list up one page"
362 msgstr "<%s-பக்கம்மேலே>\tஉறுதிமொழி பட்டியலை ஒரு பக்கம் மேலே உருட்டவும்"
363
475 -#: gitk:3273
364 #, tcl-format
365 msgid "<%s-PageDown>\tScroll commit list down one page"
366 msgstr "<%s-பக்கம்கீழ்>\tஉறுதிமொழி பட்டியலை ஒரு பக்கம் கீழே உருட்டவும்"
367
480 -#: gitk:3274
368 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
369 msgstr "<உயர்த்து-மேலே>\tபின்னோக்கி கண்டுபிடி (மேல்நோக்கி, பின்னர் உறுதிமொழிகள்)"
370
484 -#: gitk:3275
371 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
486 -msgstr ""
487 -"<உயர்த்து-கீழே>\tமுன்னோக்குகளைக் கண்டறியவும் (கீழ்நோக்கி, முந்தைய "
488 -"உறுதிமொழிகள்)"
372 +msgstr "<உயர்த்து-கீழே>\tமுன்னோக்குகளைக் கண்டறியவும் (கீழ்நோக்கி, முந்தைய உறுதிமொழிகள்)"
373
490 -#: gitk:3276
374 msgid "<Delete>, b\tScroll diff view up one page"
375 msgstr "<நீக்கு>, b\tசுருள் வேறுபாடு ஒரு பக்கத்தை மேலே காண்க"
376
494 -#: gitk:3277
377 msgid "<Backspace>\tScroll diff view up one page"
378 msgstr "<பின்வெளி>\tசுருள் வேறுபாடு ஒரு பக்கத்தை மேலே காண்க"
379
498 -#: gitk:3278
380 msgid "<Space>\t\tScroll diff view down one page"
381 msgstr "<Space>\t\tசுருள் வேறுபாடு ஒரு பக்கத்தைக் கீழே காண்க"
382
502 -#: gitk:3279
383 msgid "u\t\tScroll diff view up 18 lines"
384 msgstr "u\t\tசுருள் வேறுபாடு 18 வரிகளை மேலே காண்க"
385
506 -#: gitk:3280
386 msgid "d\t\tScroll diff view down 18 lines"
387 msgstr "d\t\tசுருள் வேறுபாடு 18 வரிகளைக் கீழே காண்க"
388
510 -#: gitk:3281
389 #, tcl-format
390 msgid "<%s-F>\t\tFind"
391 msgstr "<%s-F>\t\tகண்டுபிடி"
392
515 -#: gitk:3282
393 #, tcl-format
394 msgid "<%s-G>\t\tMove to next find hit"
395 msgstr "<%s-G>\t\tஅடுத்த கண்டுபிடிப்பு வெற்றிக்கு செல்"
396
520 -#: gitk:3283
397 msgid "<Return>\tMove to next find hit"
398 msgstr "<திரும்பு>\tஅடுத்ததைக் கண்டுபிடி"
399
524 -#: gitk:3284
400 msgid "g\t\tGo to commit"
401 msgstr "g\t\tஉறுதிமொழிக்கு செல்"
402
528 -#: gitk:3285
403 msgid "/\t\tFocus the search box"
404 msgstr "/\t\tதேடல் பெட்டியில் கவனம் செலுத்து"
405
532 -#: gitk:3286
406 msgid "?\t\tMove to previous find hit"
407 msgstr "?\t\tமுந்தைய கண்டுபிடிப்பு வெற்றிக்கு செல்"
408
536 -#: gitk:3287
409 msgid "f\t\tScroll diff view to next file"
410 msgstr "f\t\tஅடுத்த கோப்பிற்கு உருள் வேறுபாடு பார்வை"
411
540 -#: gitk:3288
412 #, tcl-format
413 msgid "<%s-S>\t\tSearch for next hit in diff view"
414 msgstr "<%s-S>\t\tவேறுபாடு பார்வையில் அடுத்த வெற்றியைத் தேடுங்கள்"
415
545 -#: gitk:3289
416 #, tcl-format
417 msgid "<%s-R>\t\tSearch for previous hit in diff view"
418 msgstr "<%s-r> வேறுபட்ட பார்வையில் முந்தைய வெற்றியைத் தேடுங்கள்"
419
550 -#: gitk:3290
420 #, tcl-format
421 msgid "<%s-KP+>\tIncrease font size"
422 msgstr "<%s-KP+>\tஎழுத்துரு அளவை அதிகரி"
423
555 -#: gitk:3291
424 #, tcl-format
425 msgid "<%s-plus>\tIncrease font size"
426 msgstr "<%s-plus>\tஎழுத்துரு அளவை அதிகரி"
427
560 -#: gitk:3292
428 #, tcl-format
429 msgid "<%s-KP->\tDecrease font size"
430 msgstr "<%s-KP->\tஎழுத்துரு அளவைக் குறை"
431
565 -#: gitk:3293
432 #, tcl-format
433 msgid "<%s-minus>\tDecrease font size"
434 msgstr "<%s-minus>\tஎழுத்துரு அளவைக் குறை"
435
570 -#: gitk:3294
436 msgid "<F5>\t\tUpdate"
437 msgstr "<F5>\t\tபுதுப்பிப்பு"
438
574 -#: gitk:3761 gitk:3770
439 #, tcl-format
440 msgid "Error creating temporary directory %s:"
441 msgstr "தற்காலிக அடைவு %s ஐ உருவாக்குவது பிழை:"
442
579 -#: gitk:3783
443 #, tcl-format
444 msgid "Error getting \"%s\" from %s:"
445 msgstr "%s இலிருந்து \" %s\" பெறுவது பிழை:"
446
584 -#: gitk:3846
447 msgid "command failed:"
448 msgstr "கட்டளை தோல்வியுற்றது:"
449
588 -#: gitk:3995
450 msgid "No such commit"
451 msgstr "அத்தகைய உறுதிமொழி இல்லை"
452
592 -#: gitk:4009
453 msgid "git gui blame: command failed:"
454 msgstr "அறிவிலி இடைமுக பழி: கட்டளை தோல்வியுற்றது:"
455
596 -#: gitk:4040
456 #, tcl-format
457 msgid "Couldn't read merge head: %s"
458 msgstr "ஒன்றிணைப்பு தலையைப் படிக்க முடியவில்லை: %s"
459
601 -#: gitk:4048
460 #, tcl-format
461 msgid "Error reading index: %s"
462 msgstr "பிழை வாசிப்பு குறியீடு: %s"
463
606 -#: gitk:4073
464 #, tcl-format
465 msgid "Couldn't start git blame: %s"
466 msgstr "அறிவிலி பழியைத் தொடங்க முடியவில்லை: %s"
467
611 -#: gitk:4076 gitk:6965
468 msgid "Searching"
469 msgstr "தேடுகிறது"
470
615 -#: gitk:4108
471 #, tcl-format
472 msgid "Error running git blame: %s"
473 msgstr "பிழை இயங்கும் அறிவிலி பழி: %s"
474
620 -#: gitk:4136
475 #, tcl-format
476 msgid "That line comes from commit %s, which is not in this view"
623 -msgstr ""
624 -"அந்த வரி உறுதிமொழி %s என்பதிலிருந்து வருகிறது, இது இந்த பார்வையில் இல்லை"
477 +msgstr "அந்த வரி உறுதிமொழி %s என்பதிலிருந்து வருகிறது, இது இந்த பார்வையில் இல்லை"
478
626 -#: gitk:4150
479 msgid "External diff viewer failed:"
480 msgstr "வெளிப்புற வேறுபாடு பார்வையாளர் தோல்வியுற்றது:"
481
630 -#: gitk:4254
482 msgid "All files"
483 msgstr "அனைத்து கோப்புகளும்"
484
634 -#: gitk:4278
485 msgid "View"
486 msgstr "காண்க"
487
638 -#: gitk:4281
488 msgid "Gitk view definition"
489 msgstr "அறிவிலிகே பார்வை வரையறை"
490
642 -#: gitk:4285
491 msgid "Remember this view"
492 msgstr "இந்த பார்வையை நினைவில் கொள்ளுங்கள்"
493
646 -#: gitk:4286
494 msgid "References (space separated list):"
495 msgstr "குறிப்புகள் (இடைவெளி பிரிக்கப்பட்ட பட்டியல்):"
496
650 -#: gitk:4287
497 msgid "Branches & tags:"
498 msgstr "கிளைகள் மற்றும் குறிச்சொற்கள்:"
499
654 -#: gitk:4288
500 msgid "All refs"
501 msgstr "அனைத்து குறிப்புகள்"
502
658 -#: gitk:4289
503 msgid "All (local) branches"
504 msgstr "அனைத்து (உள்ளக) கிளைகளும்"
505
662 -#: gitk:4290
506 msgid "All tags"
507 msgstr "அனைத்து குறிச்சொற்களும்"
508
666 -#: gitk:4291
509 msgid "All remote-tracking branches"
510 msgstr "அனைத்து தொலை-கண்காணிப்பு கிளைகளும்"
511
670 -#: gitk:4292
512 msgid "Commit Info (regular expressions):"
513 msgstr "உறுதிமொழி செய்தி (வழக்கமான வெளிப்பாடுகள்):"
514
674 -#: gitk:4293
515 msgid "Author:"
516 msgstr "ஆசிரியர்:"
517
678 -#: gitk:4294
518 msgid "Committer:"
519 msgstr "உறுதிமொழிபவர்:"
520
682 -#: gitk:4295
521 msgid "Commit Message:"
522 msgstr "உறுதிமொழி செய்தி:"
523
686 -#: gitk:4296
524 msgid "Matches all Commit Info criteria"
525 msgstr "அனைத்து உறுதிமொழி செய்தி அளவுகோல்களையும் பொருத்துகிறது"
526
690 -#: gitk:4297
527 msgid "Matches no Commit Info criteria"
528 msgstr "உறுதிமொழி செய்தி அளவுகோல்களுடன் பொருந்தவில்லை"
529
694 -#: gitk:4298
530 msgid "Changes to Files:"
531 msgstr "கோப்புகளில் மாற்றங்கள்:"
532
698 -#: gitk:4299
533 msgid "Fixed String"
534 msgstr "நிலையான சரம்"
535
702 -#: gitk:4300
536 msgid "Regular Expression"
537 msgstr "வழக்கமான வெளிப்பாடு"
538
706 -#: gitk:4301
539 msgid "Search string:"
540 msgstr "தேடல் சரம்:"
541
710 -#: gitk:4302
542 msgid ""
543 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
544 "15:27:38\"):"
545 msgstr ""
715 -"உறுதிமொழி தேதிகள் (\"2 வாரங்களுக்கு முன்பு\", \"2009-01-16 15:27:38\", \"மார்ச் 17, "
716 -"2009 15:27:38\"):"
546 +"உறுதிமொழி தேதிகள் (\"2 வாரங்களுக்கு முன்பு\", \"2009-01-16 15:27:38\", \"மார்ச் "
547 +"17, 2009 15:27:38\"):"
548
718 -#: gitk:4303
549 msgid "Since:"
550 msgstr "பின்னர்:"
551
722 -#: gitk:4304
552 msgid "Until:"
553 msgstr "வரை:"
554
726 -#: gitk:4305
555 msgid "Limit and/or skip a number of revisions (positive integer):"
728 -msgstr ""
729 -"பல திருத்தங்களை (நேர்மறை முழு எண்) கட்டுப்படுத்து மற்றும்/அல்லது தவிர்:"
556 +msgstr "பல திருத்தங்களை (நேர்மறை முழு எண்) கட்டுப்படுத்து மற்றும்/அல்லது தவிர்:"
557
731 -#: gitk:4306
558 msgid "Number to show:"
559 msgstr "காண்பிக்க எண்:"
560
735 -#: gitk:4307
561 msgid "Number to skip:"
562 msgstr "தவிர்க்க எண்:"
563
739 -#: gitk:4308
564 msgid "Miscellaneous options:"
565 msgstr "இதர விருப்பங்கள்:"
566
743 -#: gitk:4309
567 msgid "Strictly sort by date"
568 msgstr "கண்டிப்பாக தேதியின்படி வரிசைப்படுத்து"
569
747 -#: gitk:4310
570 msgid "Mark branch sides"
571 msgstr "கிளை பக்கங்களைக் குறி"
572
751 -#: gitk:4311
573 msgid "Limit to first parent"
574 msgstr "முதல் பெற்றோருக்கு வரம்பு"
575
755 -#: gitk:4312
576 msgid "Simple history"
577 msgstr "எளிய வரலாறு"
578
759 -#: gitk:4313
579 msgid "Additional arguments to git log:"
580 msgstr "அறிவிலி பதிவுக்கு கூடுதல் வாதங்கள்:"
581
763 -#: gitk:4314
582 msgid "Enter files and directories to include, one per line:"
583 msgstr "சேர்க்க கோப்புகள் மற்றும் கோப்பகங்களை உள்ளிடவும், ஒரு வரிக்கு ஒன்று:"
584
767 -#: gitk:4315
585 msgid "Command to generate more commits to include:"
586 msgstr "சேர்க்க கூடுதல் உறுதிமொழிகளை உருவாக்க கட்டளை:"
587
771 -#: gitk:4439
588 msgid "Gitk: edit view"
589 msgstr "அறிவிலிகே: திருத்து பார்வை"
590
775 -#: gitk:4447
591 msgid "-- criteria for selecting revisions"
592 msgstr "-- திருத்தங்களைத் தேர்ந்தெடுப்பதற்கான அளவுகோல்கள்"
593
779 -#: gitk:4452
594 msgid "View Name"
595 msgstr "பெயரைக் காண்க"
596
783 -#: gitk:4527
597 msgid "Apply (F5)"
598 msgstr "இடு (F5)"
599
787 -#: gitk:4565
600 msgid "Error in commit selection arguments:"
601 msgstr "உறுதிமொழி தேர்வு வாதங்களில் பிழை:"
602
791 -#: gitk:4620 gitk:4673 gitk:5135 gitk:5149 gitk:6419 gitk:12820 gitk:12821
603 msgid "None"
604 msgstr "எதுவுமில்லை"
605
795 -#: gitk:5232 gitk:5237
606 msgid "Descendant"
607 msgstr "வழித்தோன்றல்"
608
799 -#: gitk:5233
609 msgid "Not descendant"
610 msgstr "வழித்தோன்றல் அல்ல"
611
803 -#: gitk:5240 gitk:5245
612 msgid "Ancestor"
613 msgstr "மூதாதையர்"
614
807 -#: gitk:5241
615 msgid "Not ancestor"
616 msgstr "மூதாதையர் அல்ல"
617
811 -#: gitk:5535
618 msgid "Local changes checked in to index but not committed"
813 -msgstr ""
814 -"உள்ளக மாற்றங்கள் குறியீட்டில் சரிபார்க்கப்பட்டன, ஆனால் உறுதிமொழியவில்லை"
619 +msgstr "உள்ளக மாற்றங்கள் குறியீட்டில் சரிபார்க்கப்பட்டன, ஆனால் உறுதிமொழியவில்லை"
620
816 -#: gitk:5571
621 msgid "Local uncommitted changes, not checked in to index"
622 msgstr "உள்ளக உறுதிமொழியாத மாற்றங்கள், குறியீட்டில் சரிபார்க்கப்படவில்லை"
623
820 -#: gitk:7319
624 msgid "Error starting web browser:"
625 msgstr "வலை உலாவியைத் தொடங்குவதில் பிழை:"
626
824 -#: gitk:7380
627 msgid "and many more"
628 msgstr "மற்றும் மேலும் பல"
629
828 -#: gitk:7383
630 msgid "many"
631 msgstr "பல"
632
832 -#: gitk:7578
633 msgid "Tags:"
634 msgstr "குறிச்சொற்கள்:"
635
836 -#: gitk:7595 gitk:7601 gitk:9081
636 msgid "Parent"
637 msgstr "பெற்றோர்"
638
840 -#: gitk:7606
639 msgid "Child"
640 msgstr "குழந்தை"
641
844 -#: gitk:7615
642 msgid "Branch"
643 msgstr "கிளை"
644
848 -#: gitk:7618
645 msgid "Follows"
646 msgstr "பின்வருமாறு"
647
852 -#: gitk:7621
648 msgid "Precedes"
649 msgstr "முன்னால்"
650
856 -#: gitk:8216
651 #, tcl-format
652 msgid "Error getting diffs: %s"
653 msgstr "வேறுபாடு பெறுவதில் பிழை: %s"
654
861 -#: gitk:8906
655 msgid "Goto:"
656 msgstr "செல்:"
657
865 -#: gitk:8927
658 #, tcl-format
659 msgid "Short commit ID %s is ambiguous"
660 msgstr "குறுகிய உறுதிமொழி அடையாளம் %s தெளிவற்றவை"
661
870 -#: gitk:8934
662 #, tcl-format
663 msgid "Revision %s is not known"
664 msgstr "திருத்தம் %s தெரியவில்லை"
665
875 -#: gitk:8944
666 #, tcl-format
667 msgid "Commit ID %s is not known"
668 msgstr "உறுதிமொழி அடையாளம் %s அறியப்படவில்லை"
669
880 -#: gitk:8946
670 #, tcl-format
671 msgid "Revision %s is not in the current view"
672 msgstr "திருத்தம் %s தற்போதைய பார்வையில் இல்லை"
673
885 -#: gitk:9088 gitk:9103
674 msgid "Date"
675 msgstr "திகதி"
676
889 -#: gitk:9091
677 msgid "Children"
678 msgstr "குழந்தைகள்"
679
893 -#: gitk:9154
680 #, tcl-format
681 msgid "Reset %s branch to here"
682 msgstr "%s கிளையை இங்கே மீட்டமை"
683
898 -#: gitk:9156
684 msgid "Detached head: can't reset"
685 msgstr "பிரிக்கப்பட்ட தலை: மீட்டமைக்க முடியாது"
686
902 -#: gitk:9261 gitk:9267
687 msgid "Skipping merge commit "
688 msgstr "ஒன்றிணை உறுதிமொழியை தவர்கிறது "
689
906 -#: gitk:9276 gitk:9281
690 msgid "Error getting patch ID for "
691 msgstr "ஒட்டு அடையாளத்தைப் பெறுவதில் பிழை"
692
910 -#: gitk:9277 gitk:9282
693 msgid " - stopping\n"
694 msgstr "- நிறுத்துதல்\n"
695
914 -#: gitk:9287 gitk:9290 gitk:9298 gitk:9312 gitk:9321
696 msgid "Commit "
697 msgstr "உறுதிமொழி"
698
918 -#: gitk:9291
699 msgid ""
700 " is the same patch as\n"
701 " "
922 -msgstr "அதே ஒட்டு\n"
702 +msgstr ""
703 +"அதே ஒட்டு\n"
704 " "
705
925 -#: gitk:9299
706 msgid ""
707 " differs from\n"
708 " "
929 -msgstr "இருந்து வேறுபடுகிறது\n"
709 +msgstr ""
710 +"இருந்து வேறுபடுகிறது\n"
711 " "
712
932 -#: gitk:9301
713 msgid ""
714 "Diff of commits:\n"
715 "\n"
936 -msgstr "உறுதிமொழியின் வேறுபாடு:\n"
716 +msgstr ""
717 +"உறுதிமொழியின் வேறுபாடு:\n"
718 "\n"
719
939 -#: gitk:9313 gitk:9322
720 #, tcl-format
721 msgid " has %s children - stopping\n"
722 msgstr "%s குழந்தைகள் உள்ளனர் - நிறுத்துதல்\n"
723
944 -#: gitk:9341
724 #, tcl-format
725 msgid "Error writing commit to file: %s"
726 msgstr "உறுதிமொழி கோப்பில் எழுதுதல் பிழை: %s"
727
949 -#: gitk:9347
728 #, tcl-format
729 msgid "Error diffing commits: %s"
730 msgstr "உறுதிமொழிகள் வேறுபாடு பிழை: %s"
731
954 -#: gitk:9393
732 msgid "Top"
733 msgstr "மேலே"
734
958 -#: gitk:9394
735 msgid "From"
736 msgstr "இருந்து"
737
962 -#: gitk:9399
738 msgid "To"
739 msgstr "பெறுநர்"
740
966 -#: gitk:9423
741 msgid "Generate patch"
742 msgstr "ஒட்டை உருவாக்கு"
743
970 -#: gitk:9425
744 msgid "From:"
745 msgstr "இருந்து:"
746
974 -#: gitk:9434
747 msgid "To:"
748 msgstr "இதற்கு:"
749
978 -#: gitk:9443
750 msgid "Reverse"
751 msgstr "தலைகீழ்"
752
982 -#: gitk:9445 gitk:9655
753 msgid "Output file:"
754 msgstr "வெளியீட்டு கோப்பு:"
755
986 -#: gitk:9451
756 msgid "Generate"
757 msgstr "உருவாக்கு"
758
990 -#: gitk:9489
759 msgid "Error creating patch:"
760 msgstr "ஒட்டை உருவாக்கு பிழை:"
761
994 -#: gitk:9512 gitk:9643 gitk:9731
762 msgid "ID:"
763 msgstr "அடையாளம்:"
764
998 -#: gitk:9521
765 msgid "Tag name:"
766 msgstr "குறிச்சொல் பெயர்:"
767
1002 -#: gitk:9524
768 msgid "Tag message is optional"
769 msgstr "குறிச்சொல் செய்தி விருப்பமானது"
770
1006 -#: gitk:9526
771 msgid "Tag message:"
772 msgstr "குறிச்சொல் செய்தி:"
773
1010 -#: gitk:9530 gitk:9701
774 msgid "Create"
775 msgstr "உருவாக்கு"
776
1014 -#: gitk:9548
777 msgid "No tag name specified"
778 msgstr "குறிச்சொல் பெயர் குறிப்பிடப்படவில்லை"
779
1018 -#: gitk:9552
780 #, tcl-format
781 msgid "Tag \"%s\" already exists"
782 msgstr "குறிச்சொல் \"%s\" ஏற்கனவே உள்ளது"
783
1023 -#: gitk:9562
784 msgid "Error creating tag:"
785 msgstr "குறிச்சொல்லை உருவாக்கு பிழை:"
786
1027 -#: gitk:9652
787 msgid "Command:"
788 msgstr "கட்டளை:"
789
1031 -#: gitk:9660
790 msgid "Write"
791 msgstr "எழுது"
792
1035 -#: gitk:9678
793 msgid "Error writing commit:"
794 msgstr "பிழை எழுதுதல் உறுதிமொழி:"
795
1039 -#: gitk:9700
796 msgid "Create branch"
797 msgstr "கிளையை உருவாக்கு"
798
1043 -#: gitk:9716
799 #, tcl-format
800 msgid "Rename branch %s"
801 msgstr "%s கிளையை மறுபெயரிடு"
802
1048 -#: gitk:9717
803 msgid "Rename"
804 msgstr "மறுபெயரிடு"
805
1052 -#: gitk:9741
806 msgid "Name:"
807 msgstr "பெயர்:"
808
1056 -#: gitk:9765
809 msgid "Please specify a name for the new branch"
810 msgstr "புதிய கிளைக்கு ஒரு பெயரைக் குறிப்பிடு"
811
1060 -#: gitk:9770
812 #, tcl-format
813 msgid "Branch '%s' already exists. Overwrite?"
814 msgstr "கிளை '%s' ஏற்கனவே உள்ளது. மேலெழுதவா?"
815
1065 -#: gitk:9814
816 msgid "Please specify a new name for the branch"
817 msgstr "கிளைக்கு ஒரு புதிய பெயரைக் குறிப்பிடு"
818
1069 -#: gitk:9877
819 #, tcl-format
820 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1072 -msgstr ""
1073 -"உறுதிமொழி %s ஏற்கனவே கிளை %s சேர்க்கப்பட்டுள்ளன-உண்மையில் அதை மீண்டும் இடவா?"
821 +msgstr "உறுதிமொழி %s ஏற்கனவே கிளை %s சேர்க்கப்பட்டுள்ளன-உண்மையில் அதை மீண்டும் இடவா?"
822
1075 -#: gitk:9882
823 msgid "Cherry-picking"
824 msgstr "கனி எடுக்கும்"
825
1079 -#: gitk:9891
826 #, tcl-format
827 msgid ""
828 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1085,7 +831,6 @@ msgstr ""
831 "'%s' கோப்பில் உள்ளக மாற்றங்கள் காரணமாக கனி-எடு தோல்வியடைந்தது. \n"
832 "தயவுசெய்து உங்கள் மாற்றங்களைச் உறுதிமொழி, மீட்டமை அல்லது சேமி பிறகு மீண்டும் முயற்சி."
833
1088 -#: gitk:9897
834 msgid ""
835 "Cherry-pick failed because of merge conflict.\n"
836 "Do you wish to run git citool to resolve it?"
@@ -1093,31 +838,24 @@ msgstr ""
838 "ஒன்றிணைக்கும் மோதல் காரணமாக கனி-எடு தோல்வியடைந்தது. \n"
839 "அதை தீர்க்க அறிவிலி சிஐகருவியை இயக்க விரும்புகிறீர்களா?"
840
1096 -#: gitk:9913 gitk:9971
841 msgid "No changes committed"
842 msgstr "எந்த மாற்றங்களும் உறுதிமொழியப்படவில்லை"
843
1100 -#: gitk:9940
844 #, tcl-format
845 msgid "Commit %s is not included in branch %s -- really revert it?"
1103 -msgstr ""
1104 -"உறுதிமொழி %s கிளை %s சேர்க்கப்படவில்லை - உண்மையில் அதை மீட்டெடுக்கவா?"
846 +msgstr "உறுதிமொழி %s கிளை %s சேர்க்கப்படவில்லை - உண்மையில் அதை மீட்டெடுக்கவா?"
847
1106 -#: gitk:9945
848 msgid "Reverting"
849 msgstr "மீட்டெடுத்தல்"
850
1110 -#: gitk:9953
851 #, tcl-format
852 msgid ""
853 "Revert failed because of local changes to the following files:%s Please "
854 "commit, reset or stash your changes and try again."
855 msgstr ""
1116 -"பின்வரும் கோப்புகளில் உள்ளக மாற்றங்கள் காரணமாக மீட்டெடு தோல்வியுற்றது:%s "
1117 -"தயவுசெய்து உங்கள் மாற்றங்களைச் உறுதிமொழி, மீட்டமை அல்லது "
1118 -"சேமி மற்றும் மீண்டும் முயற்சி."
856 +"பின்வரும் கோப்புகளில் உள்ளக மாற்றங்கள் காரணமாக மீட்டெடு தோல்வியுற்றது:%s தயவுசெய்து உங்கள் "
857 +"மாற்றங்களைச் உறுதிமொழி, மீட்டமை அல்லது சேமி மற்றும் மீண்டும் முயற்சி."
858
1120 -#: gitk:9957
859 msgid ""
860 "Revert failed because of merge conflict.\n"
861 " Do you wish to run git citool to resolve it?"
@@ -1125,30 +863,22 @@ msgstr ""
863 "ஒன்றிணைக்கும் மோதல் காரணமாக மீட்டெடு தோல்வியடைந்தது. \n"
864 "அதை தீர்க்க அறிவிலி சிஐகருவியை இயக்க விரும்புகிறீர்களா?"
865
1128 -#: gitk:10000
866 msgid "Confirm reset"
867 msgstr "மீட்டமைப்பை உறுதிப்படுத்து"
868
1132 -#: gitk:10002
869 #, tcl-format
870 msgid "Reset branch %s to %s?"
871 msgstr "%s கிளையை %s க்கு மீட்டமைக்கவா?"
872
1137 -#: gitk:10004
873 msgid "Reset type:"
874 msgstr "மீட்டமை வகை:"
875
1141 -#: gitk:10007
876 msgid "Soft: Leave working tree and index untouched"
1143 -msgstr ""
1144 -"மென்மை: வேலை செய்யும் மரம் மற்றும் குறியீட்டைத் தீண்டாமல் விடு"
877 +msgstr "மென்மை: வேலை செய்யும் மரம் மற்றும் குறியீட்டைத் தீண்டாமல் விடு"
878
1146 -#: gitk:10010
879 msgid "Mixed: Leave working tree untouched, reset index"
1148 -msgstr ""
1149 -"கலப்பு: வேலை செய்யும் மரத்தை தீண்டாமல் விடு, குறியீட்டை மீட்டமை"
880 +msgstr "கலப்பு: வேலை செய்யும் மரத்தை தீண்டாமல் விடு, குறியீட்டை மீட்டமை"
881
1151 -#: gitk:10013
882 msgid ""
883 "Hard: Reset working tree and index\n"
884 "(discard ALL local changes)"
@@ -1156,24 +886,19 @@ msgstr ""
886 "கடினம்: வேலை செய்யும் மரம் மற்றும் குறியீட்டை மீட்டமை \n"
887 "(அனைத்து உள்ளக மாற்றங்களையும் நிராகரி)"
888
1159 -#: gitk:10030
889 msgid "Resetting"
890 msgstr "மீட்டமைத்தல்"
891
1163 -#: gitk:10103
892 #, tcl-format
893 msgid "A local branch named %s exists already"
894 msgstr "%s என்ற உள்ளக கிளை ஏற்கனவே உள்ளது"
895
1168 -#: gitk:10111
896 msgid "Checking out"
897 msgstr "சரிபார்"
898
1172 -#: gitk:10170
899 msgid "Cannot delete the currently checked-out branch"
900 msgstr "தற்போது சரிபார்க்கப்பட்ட கிளையை நீக்க முடியாது"
901
1176 -#: gitk:10176
902 #, tcl-format
903 msgid ""
904 "The commits on branch %s aren't on any other branch.\n"
@@ -1182,254 +907,193 @@ msgstr ""
907 "கிளை %s மீதான உறுதிமொழிகள் வேறு எந்த கிளையிலும் இல்லை. \n"
908 "உண்மையில் கிளை %s நீக்கவா?"
909
1185 -#: gitk:10207
910 #, tcl-format
911 msgid "Tags and heads: %s"
912 msgstr "குறிச்சொற்கள் மற்றும் தலைகள்: %s"
913
1190 -#: gitk:10224
914 msgid "Filter"
915 msgstr "வடிப்பி"
916
1194 -#: gitk:10531
917 msgid ""
918 "Error reading commit topology information; branch and preceding/following "
919 "tag information will be incomplete."
920 msgstr ""
1199 -"உறுதிமொழி இடவியல் தகவலை படிப்பதில் பிழை; கிளை மற்றும் அதற்கு "
1200 -"முந்தைய/பின்வரும் குறிச்சொல் செய்தி முழுமையடையாது."
921 +"உறுதிமொழி இடவியல் தகவலை படிப்பதில் பிழை; கிளை மற்றும் அதற்கு முந்தைய/பின்வரும் "
922 +"குறிச்சொல் செய்தி முழுமையடையாது."
923
1202 -#: gitk:11508
924 msgid "Tag"
925 msgstr "குறிச்சொல்"
926
1206 -#: gitk:11512
927 msgid "Id"
928 msgstr "அடையாளம்"
929
1210 -#: gitk:11595
930 msgid "Gitk font chooser"
931 msgstr "அறிவிலிகே எழுத்துரு தேர்வு"
932
1214 -#: gitk:11612
933 msgid "B"
934 msgstr "பி"
935
1218 -#: gitk:11615
936 msgid "I"
937 msgstr "ஐ"
938
1222 -#: gitk:11734
939 msgid "Commit list display options"
940 msgstr "உறுதிமொழி பட்டியல் காட்சி விருப்பங்கள்"
941
1226 -#: gitk:11737
942 msgid "Maximum graph width (lines)"
943 msgstr "அதிகபட்ச வரைபட அகலம் (கோடுகள்)"
944
1230 -#: gitk:11741
945 #, no-tcl-format
946 msgid "Maximum graph width (% of pane)"
947 msgstr "அதிகபட்ச வரைபட அகலம் (பலகத்தின் %)"
948
1235 -#: gitk:11744
949 msgid "Show local changes"
950 msgstr "உள்ளக மாற்றங்களைக் காட்டு"
951
1239 -#: gitk:11747
952 msgid "Hide remote refs"
953 msgstr "தொலை குறிகளை மறை"
954
1243 -#: gitk:11751
955 msgid "Copy commit ID to clipboard"
956 msgstr "இடைநிலைப்பலகைக்கு அடையாளத்தை நகலெடு"
957
1247 -#: gitk:11755
958 msgid "Copy commit ID to X11 selection"
959 msgstr "உறுதிமொழி அடையாளத்தை ஃ11 பகுதிக்கு நகலெடு"
960
1251 -#: gitk:11760
961 msgid "Length of commit ID to copy"
962 msgstr "நகலெடுக்க உறுதிமொழி அடையாளத்தின் நீளம்"
963
1255 -#: gitk:11763
964 msgid "Diff display options"
965 msgstr "வேறுபாடு காட்சி விருப்பங்கள்"
966
1259 -#: gitk:11765
967 msgid "Tab spacing"
968 msgstr "தாவல் இடைவெளி"
969
1263 -#: gitk:11769
970 msgid "Wrap comment text"
971 msgstr "கருத்து உரையை மடி"
972
1267 -#: gitk:11774
973 msgid "Wrap other text"
974 msgstr "மற்ற உரையை மடி"
975
1271 -#: gitk:11779
976 msgid "Display nearby tags/heads"
977 msgstr "அருகிலுள்ள குறிச்சொற்கள்/தலைகளைக் காண்பி"
978
1275 -#: gitk:11782
979 msgid "Maximum # tags/heads to show"
980 msgstr "காண்பிக்க அதிகபட்ச # குறிச்சொற்கள்/தலைகள்"
981
1279 -#: gitk:11785
982 msgid "Limit diffs to listed paths"
983 msgstr "பட்டியலிடப்பட்ட பாதைகளுக்கு வரம்பு வேறுபடுகிறது"
984
1283 -#: gitk:11788
985 msgid "Support per-file encodings"
986 msgstr "ஒரு கோப்பு குறியீடுகளை ஆதரி"
987
1287 -#: gitk:11794 gitk:11961
988 msgid "External diff tool"
989 msgstr "வெளிப்புற வேறுபாடு கருவி"
990
1291 -#: gitk:11795
991 msgid "Choose..."
992 msgstr "தேர்வு..."
993
1295 -#: gitk:11802
994 msgid "Web browser"
995 msgstr "வலை உலாவி"
996
1299 -#: gitk:11807
997 msgid "General options"
998 msgstr "பொது விருப்பங்கள்"
999
1303 -#: gitk:11810
1000 msgid "Use themed widgets"
1001 msgstr "கருப்பொருள் நிரல்பலகைகளைப் பயன்படுத்து"
1002
1307 -#: gitk:11812
1003 msgid "(change requires restart)"
1004 msgstr "(மாற்றத்திற்கு மறுதொடக்கம் தேவை)"
1005
1311 -#: gitk:11814
1006 msgid "(currently unavailable)"
1007 msgstr "(தற்போது கிடைக்கவில்லை)"
1008
1315 -#: gitk:11826
1009 msgid "Colors: press to choose"
1010 msgstr "நிறங்கள்: தேர்வு செய்ய அழுத்தவும்"
1011
1319 -#: gitk:11829
1012 msgid "Interface"
1013 msgstr "இடைமுகம்"
1014
1323 -#: gitk:11830
1015 msgid "interface"
1016 msgstr "இடைமுகம்"
1017
1327 -#: gitk:11833
1018 msgid "Background"
1019 msgstr "பின்னணி"
1020
1331 -#: gitk:11834 gitk:11876
1021 msgid "background"
1022 msgstr "பின்னணி"
1023
1335 -#: gitk:11837
1024 msgid "Foreground"
1025 msgstr "முன்புறம்"
1026
1339 -#: gitk:11838
1027 msgid "foreground"
1028 msgstr "முன்புறம்"
1029
1343 -#: gitk:11841
1030 msgid "Diff: old lines"
1031 msgstr "வேறுபாடு: பழைய வரிகள்"
1032
1347 -#: gitk:11842
1033 msgid "diff old lines"
1034 msgstr "பழைய வரிகள் வேறுபாடு"
1035
1351 -#: gitk:11846
1036 msgid "Diff: old lines bg"
1037 msgstr "வேறுபாடு: பழைய வரிகள் பின்ணனி"
1038
1355 -#: gitk:11848
1039 msgid "diff old lines bg"
1040 msgstr "பழைய வரிகள் பின்ணனி வேறுபாடு"
1041
1359 -#: gitk:11852
1042 msgid "Diff: new lines"
1043 msgstr "வேறுபாடு: புதிய கோடுகள்"
1044
1363 -#: gitk:11853
1045 msgid "diff new lines"
1046 msgstr "புதிய வரிகள் வேறுபாடு"
1047
1367 -#: gitk:11857
1048 msgid "Diff: new lines bg"
1049 msgstr "வேறுபாடு: புதிய வரிகள் பின்ணனி"
1050
1371 -#: gitk:11859
1051 msgid "diff new lines bg"
1052 msgstr "புதிய வரிகளை பின்ணனி வேறுபாடு"
1053
1375 -#: gitk:11863
1054 msgid "Diff: hunk header"
1055 msgstr "வேறுபாடு: அங்க் தலைப்பு"
1056
1379 -#: gitk:11865
1057 msgid "diff hunk header"
1058 msgstr "அங்க் தலைப்பு வேறுபாடு"
1059
1383 -#: gitk:11869
1060 msgid "Marked line bg"
1061 msgstr "குறிக்கப்பட்ட வரி பின்னணி"
1062
1387 -#: gitk:11871
1063 msgid "marked line background"
1064 msgstr "குறிக்கப்பட்ட வரி பின்னணி"
1065
1391 -#: gitk:11875
1066 msgid "Select bg"
1067 msgstr "பின்னணி தேர்வு"
1068
1395 -#: gitk:11884
1069 msgid "Fonts: press to choose"
1070 msgstr "எழுத்துருக்கள்: தேர்வு செய்ய அழுத்து"
1071
1399 -#: gitk:11886
1072 msgid "Main font"
1073 msgstr "முதன்மையான எழுத்துரு"
1074
1403 -#: gitk:11887
1075 msgid "Diff display font"
1076 msgstr "காட்சி எழுத்துரு வேறுபாடு"
1077
1407 -#: gitk:11888
1078 msgid "User interface font"
1079 msgstr "பயனர் இடைமுக எழுத்துரு"
1080
1411 -#: gitk:11910
1081 msgid "Gitk preferences"
1082 msgstr "அறிவிலிகே விருப்பத்தேர்வுகள்"
1083
1415 -#: gitk:11919
1084 msgid "General"
1085 msgstr "பொது"
1086
1419 -#: gitk:11920
1087 msgid "Colors"
1088 msgstr "நிறங்கள்"
1089
1423 -#: gitk:11921
1090 msgid "Fonts"
1091 msgstr "எழுத்துருக்கள்"
1092
1427 -#: gitk:11971
1093 #, tcl-format
1094 msgid "Gitk: choose color for %s"
1095 msgstr "அறிவிலிகே: %s க்கு வண்ணத்தைத் தேர்வுசெய்க"
1096
1432 -#: gitk:12490
1097 msgid ""
1098 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1099 " Gitk requires at least Tcl/Tk 8.4."
@@ -1437,16 +1101,13 @@ msgstr ""
1101 "மன்னிக்கவும், டிசிஎல்/டிகேயின் இந்த பதிப்பைக் கொண்டு அறிவிலிகே இயக்க முடியாது. \n"
1102 "அறிவிலிகேவுக்கு குறைந்தபட்சம் டிசிஎல்/டிகே 8.4 தேவைப்படுகிறது."
1103
1440 -#: gitk:12711
1104 msgid "Cannot find a git repository here."
1105 msgstr "இங்கே ஒரு அறிவிலி களஞ்சியத்தைக் கண்டுபிடிக்க முடியவில்லை."
1106
1444 -#: gitk:12758
1107 #, tcl-format
1108 msgid "Ambiguous argument '%s': both revision and filename"
1109 msgstr "தெளிவற்ற வாதம் '%s': திருத்தம் மற்றும் கோப்பு பெயர்"
1110
1449 -#: gitk:12770
1111 msgid "Bad arguments to gitk:"
1112 msgstr "அறிவிலிகேவிற்கு மோசமான வாதங்கள்:"
1113
po/vi.po
-310
@@ -18,32 +18,25 @@ msgstr ""
18 "Plural-Forms: nplurals=1; plural=0;\n"
19 "X-Generator: Gtranslator 2.91.7\n"
20
21 -#: gitk:140
21 msgid "Couldn't get list of unmerged files:"
22 msgstr "Không thể lấy danh sách các tập-tin chưa được hòa trộn:"
23
25 -#: gitk:212 gitk:2381
24 msgid "Color words"
25 msgstr "Tô màu chữ"
26
29 -#: gitk:217 gitk:2381 gitk:8220 gitk:8253
27 msgid "Markup words"
28 msgstr "Đánh dấu chữ"
29
33 -#: gitk:324
30 msgid "Error parsing revisions:"
31 msgstr "Gặp lỗi khi phân tích điểm xét duyệt:"
32
37 -#: gitk:380
33 msgid "Error executing --argscmd command:"
34 msgstr "Gặp lỗi khi thực hiện lệnh --argscmd:"
35
41 -#: gitk:393
36 msgid "No files selected: --merge specified but no files are unmerged."
37 msgstr ""
38 "Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn."
39
46 -#: gitk:396
40 msgid ""
41 "No files selected: --merge specified but no unmerged files are within file "
42 "limit."
@@ -51,314 +44,234 @@ msgstr ""
44 "Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn "
45 "trong giới hạn tập tin."
46
54 -#: gitk:418 gitk:566
47 msgid "Error executing git log:"
48 msgstr "Gặp lỗi khi thực hiện lệnh git log:"
49
58 -#: gitk:436 gitk:582
50 msgid "Reading"
51 msgstr "Đang đọc"
52
62 -#: gitk:496 gitk:4525
53 msgid "Reading commits..."
54 msgstr "Đang đọc các lần chuyển giao…"
55
66 -#: gitk:499 gitk:1637 gitk:4528
56 msgid "No commits selected"
57 msgstr "Chưa chọn các lần chuyển giao"
58
70 -#: gitk:1445 gitk:4045 gitk:12432
59 msgid "Command line"
60 msgstr "Dòng lệnh"
61
74 -#: gitk:1511
62 msgid "Can't parse git log output:"
63 msgstr "Không thể phân tích kết xuất từ lệnh git log:"
64
78 -#: gitk:1740
65 msgid "No commit information available"
66 msgstr "Không có thông tin về lần chuyển giao nào"
67
82 -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
68 msgid "OK"
69 msgstr "Đồng ý"
70
86 -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
87 -#: gitk:11242 gitk:11522
71 msgid "Cancel"
72 msgstr "Thôi"
73
91 -#: gitk:2069
74 msgid "&Update"
75 msgstr "Cập nhật"
76
95 -#: gitk:2070
77 msgid "&Reload"
78 msgstr "Tải lại"
79
99 -#: gitk:2071
80 msgid "Reread re&ferences"
81 msgstr "Đọc lại tham chiếu"
82
103 -#: gitk:2072
83 msgid "&List references"
84 msgstr "Liệt kê các tham chiếu"
85
107 -#: gitk:2074
86 msgid "Start git &gui"
87 msgstr "Khởi chạy git gui"
88
111 -#: gitk:2076
89 msgid "&Quit"
90 msgstr "Thoát"
91
115 -#: gitk:2068
92 msgid "&File"
93 msgstr "Chính"
94
119 -#: gitk:2080
95 msgid "&Preferences"
96 msgstr "Tùy thích"
97
123 -#: gitk:2079
98 msgid "&Edit"
99 msgstr "Chỉnh sửa"
100
127 -#: gitk:2084
101 msgid "&New view..."
102 msgstr "Thêm trình bày mới…"
103
131 -#: gitk:2085
104 msgid "&Edit view..."
105 msgstr "Sửa cách trình bày…"
106
135 -#: gitk:2086
107 msgid "&Delete view"
108 msgstr "Xóa cách trình bày"
109
139 -#: gitk:2088 gitk:4043
110 msgid "&All files"
111 msgstr "Mọi tập tin"
112
143 -#: gitk:2083 gitk:4067
113 msgid "&View"
114 msgstr "Trình bày"
115
147 -#: gitk:2093 gitk:2103 gitk:3012
116 msgid "&About gitk"
117 msgstr "Giới thiệu về gitk"
118
151 -#: gitk:2094 gitk:2108
119 msgid "&Key bindings"
120 msgstr "Tổ hợp phím"
121
155 -#: gitk:2092 gitk:2107
122 msgid "&Help"
123 msgstr "Trợ giúp"
124
159 -#: gitk:2185 gitk:8652
125 msgid "SHA1 ID:"
126 msgstr "SHA1 ID:"
127
163 -#: gitk:2229
128 msgid "Row"
129 msgstr "Hàng"
130
167 -#: gitk:2267
131 msgid "Find"
132 msgstr "Tìm"
133
171 -#: gitk:2295
134 msgid "commit"
135 msgstr "lần chuyển giao"
136
175 -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
176 -#: gitk:6912
137 msgid "containing:"
138 msgstr "có chứa:"
139
180 -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
140 msgid "touching paths:"
141 msgstr "đang chạm đường dẫn:"
142
184 -#: gitk:2303 gitk:4777
143 msgid "adding/removing string:"
144 msgstr "thêm/gỡ bỏ chuỗi:"
145
188 -#: gitk:2304 gitk:4779
146 msgid "changing lines matching:"
147 msgstr "những dòng thay đổi khớp mẫu:"
148
192 -#: gitk:2313 gitk:2315 gitk:4766
149 msgid "Exact"
150 msgstr "Chính xác"
151
196 -#: gitk:2315 gitk:4854 gitk:6723
152 msgid "IgnCase"
153 msgstr "BquaHt"
154
200 -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
155 msgid "Regexp"
156 msgstr "BTCQ"
157
204 -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
158 msgid "All fields"
159 msgstr "Mọi trường"
160
208 -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
161 msgid "Headline"
162 msgstr "Nội dung chính"
163
212 -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
164 msgid "Comments"
165 msgstr "Ghi chú"
166
216 -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
217 -#: gitk:8845
167 msgid "Author"
168 msgstr "Tác giả"
169
221 -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
170 msgid "Committer"
171 msgstr "Người chuyển giao"
172
225 -#: gitk:2350
173 msgid "Search"
174 msgstr "Tìm kiếm"
175
229 -#: gitk:2358
176 msgid "Diff"
177 msgstr "So sánh"
178
233 -#: gitk:2360
179 msgid "Old version"
180 msgstr "Phiên bản cũ"
181
237 -#: gitk:2362
182 msgid "New version"
183 msgstr "Phiên bản mới"
184
241 -#: gitk:2364
185 msgid "Lines of context"
186 msgstr "Các dòng của nội dung"
187
245 -#: gitk:2374
188 msgid "Ignore space change"
189 msgstr "Không xét đến thay đổi do khoảng trắng"
190
249 -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
191 msgid "Line diff"
192 msgstr "Khác biệt theo dòng"
193
253 -#: gitk:2445
194 msgid "Patch"
195 msgstr "Vá"
196
257 -#: gitk:2447
197 msgid "Tree"
198 msgstr "Cây"
199
261 -#: gitk:2617 gitk:2637
200 msgid "Diff this -> selected"
201 msgstr "So sánh cái này -> cái đã chọn"
202
265 -#: gitk:2618 gitk:2638
203 msgid "Diff selected -> this"
204 msgstr "So sánh cái đã chọn -> cái này"
205
269 -#: gitk:2619 gitk:2639
206 msgid "Make patch"
207 msgstr "Tạo miếng vá"
208
273 -#: gitk:2620 gitk:9254
209 msgid "Create tag"
210 msgstr "Tạo thẻ"
211
277 -#: gitk:2621 gitk:9371
212 msgid "Write commit to file"
213 msgstr "Ghi lần chuyển giao ra tập tin"
214
281 -#: gitk:2622 gitk:9428
215 msgid "Create new branch"
216 msgstr "Tạo nhánh mới"
217
285 -#: gitk:2623
218 msgid "Cherry-pick this commit"
219 msgstr "Cherry-pick lần chuyển giao này"
220
289 -#: gitk:2624
221 msgid "Reset HEAD branch to here"
222 msgstr "Đặt lại HEAD của nhánh vào đây"
223
293 -#: gitk:2625
224 msgid "Mark this commit"
225 msgstr "Đánh dấu lần chuyển giao này"
226
297 -#: gitk:2626
227 msgid "Return to mark"
228 msgstr "Quay lại vị trí dấu"
229
301 -#: gitk:2627
230 msgid "Find descendant of this and mark"
231 msgstr "Tìm con cháu của cái này và cái đã đánh dấu"
232
305 -#: gitk:2628
233 msgid "Compare with marked commit"
234 msgstr "So sánh với lần chuyển giao đã đánh dấu"
235
309 -#: gitk:2629 gitk:2640
236 msgid "Diff this -> marked commit"
237 msgstr "So sánh cái này -> lần chuyển giao đã đánh dấu"
238
313 -#: gitk:2630 gitk:2641
239 msgid "Diff marked commit -> this"
240 msgstr "So sánh lần chuyển giao đã đánh dấu -> cái này"
241
317 -#: gitk:2631
242 msgid "Revert this commit"
243 msgstr "Hoàn lại lần chuyển giao này"
244
321 -#: gitk:2647
245 msgid "Check out this branch"
246 msgstr "Lấy ra nhánh này"
247
325 -#: gitk:2648
248 msgid "Remove this branch"
249 msgstr "Gỡ bỏ nhánh này"
250
329 -#: gitk:2649
251 msgid "Copy branch name"
252 msgstr "Chép tên nhánh"
253
333 -#: gitk:2656
254 msgid "Highlight this too"
255 msgstr "Cũng tô sáng nó"
256
337 -#: gitk:2657
257 msgid "Highlight this only"
258 msgstr "Chỉ tô sáng cái này"
259
341 -#: gitk:2658
260 msgid "External diff"
261 msgstr "diff từ bên ngoài"
262
345 -#: gitk:2659
263 msgid "Blame parent commit"
264 msgstr "Xem công trạng lần chuyển giao cha mẹ"
265
349 -#: gitk:2660
266 msgid "Copy path"
267 msgstr "Chép đường dẫn"
268
353 -#: gitk:2667
269 msgid "Show origin of this line"
270 msgstr "Hiển thị nguyên gốc của dòng này"
271
357 -#: gitk:2668
272 msgid "Run git gui blame on this line"
273 msgstr "Chạy lệnh git gui blame cho dòng này"
274
361 -#: gitk:3014
275 msgid ""
276 "\n"
277 "Gitk - a commit viewer for git\n"
@@ -374,318 +287,246 @@ msgstr ""
287 "\n"
288 "Dùng và phân phối lại phần mềm này theo các điều khoản của Giấy Phép Công GNU"
289
377 -#: gitk:3022 gitk:3089 gitk:9857
290 msgid "Close"
291 msgstr "Đóng"
292
381 -#: gitk:3043
293 msgid "Gitk key bindings"
294 msgstr "Tổ hợp phím gitk"
295
385 -#: gitk:3046
296 msgid "Gitk key bindings:"
297 msgstr "Tổ hợp phím gitk:"
298
389 -#: gitk:3048
299 #, tcl-format
300 msgid "<%s-Q>\t\tQuit"
301 msgstr "<%s-Q>\t\tThoát"
302
394 -#: gitk:3049
303 #, tcl-format
304 msgid "<%s-W>\t\tClose window"
305 msgstr "<%s-W>\t\tĐóng cửa sổ"
306
399 -#: gitk:3050
307 msgid "<Home>\t\tMove to first commit"
308 msgstr "<Home>\t\tChuyển đến lần chuyển giao đầu tiên"
309
403 -#: gitk:3051
310 msgid "<End>\t\tMove to last commit"
311 msgstr "<End>\t\tChuyển đến lần chuyển giao cuối"
312
407 -#: gitk:3052
313 msgid "<Up>, p, k\tMove up one commit"
314 msgstr "<Up>, p, k\tDi chuyển lên một lần chuyển giao"
315
411 -#: gitk:3053
316 msgid "<Down>, n, j\tMove down one commit"
317 msgstr "<Down>, n, j\tDi chuyển xuống một lần chuyển giao"
318
415 -#: gitk:3054
319 msgid "<Left>, z, h\tGo back in history list"
320 msgstr "<Left>, z, h\tQuay trở lại danh sách lịch sử"
321
419 -#: gitk:3055
322 msgid "<Right>, x, l\tGo forward in history list"
323 msgstr "<Right>, x, l\tDi chuyển tiếp trong danh sách lịch sử"
324
423 -#: gitk:3056
325 #, tcl-format
326 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
327 msgstr ""
328 "<%s-n>\tĐến cha thứ n của lần chuyển giao hiện tại trong danh sách lịch sử"
329
429 -#: gitk:3057
330 msgid "<PageUp>\tMove up one page in commit list"
331 msgstr "<PageUp>\tDi chuyển lên một trang trong danh sách lần chuyển giao"
332
433 -#: gitk:3058
333 msgid "<PageDown>\tMove down one page in commit list"
334 msgstr "<PageDown>\tDi chuyển xuống một trang trong danh sách lần chuyển giao"
335
437 -#: gitk:3059
336 #, tcl-format
337 msgid "<%s-Home>\tScroll to top of commit list"
338 msgstr "<%s-Home>\tCuộn lên trên cùng của danh sách lần chuyển giao"
339
442 -#: gitk:3060
340 #, tcl-format
341 msgid "<%s-End>\tScroll to bottom of commit list"
342 msgstr "<%s-End>\tCuộn xuống dưới cùng của danh sách lần chuyển giao"
343
447 -#: gitk:3061
344 #, tcl-format
345 msgid "<%s-Up>\tScroll commit list up one line"
346 msgstr "<%s-Up>\tCuộn danh sách lần chuyển giao lên một dòng"
347
452 -#: gitk:3062
348 #, tcl-format
349 msgid "<%s-Down>\tScroll commit list down one line"
350 msgstr "<%s-Down>\tCuộn danh sách lần chuyển giao xuống một dòng"
351
457 -#: gitk:3063
352 #, tcl-format
353 msgid "<%s-PageUp>\tScroll commit list up one page"
354 msgstr "<%s-PageUp>\tCuộn danh sách lần chuyển giao lên một trang"
355
462 -#: gitk:3064
356 #, tcl-format
357 msgid "<%s-PageDown>\tScroll commit list down one page"
358 msgstr "<%s-PageDown>\tCuộn danh sách lần chuyển giao xuống một trang"
359
467 -#: gitk:3065
360 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
361 msgstr "<Shift-Up>\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)"
362
471 -#: gitk:3066
363 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
364 msgstr ""
365 "<Shift-Down>\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)"
366
476 -#: gitk:3067
367 msgid "<Delete>, b\tScroll diff view up one page"
368 msgstr "<Delete>, b\tCuộn phần trình bày diff lên một trang"
369
480 -#: gitk:3068
370 msgid "<Backspace>\tScroll diff view up one page"
371 msgstr "<Backspace>\tCuộn phần trình bày diff lên một trang"
372
484 -#: gitk:3069
373 msgid "<Space>\t\tScroll diff view down one page"
374 msgstr "<Space>\t\tCuộn phần trình bày diff xuống một trang"
375
488 -#: gitk:3070
376 msgid "u\t\tScroll diff view up 18 lines"
377 msgstr "u\t\tCuộn phần trình bày diff lên 18 dòng"
378
492 -#: gitk:3071
379 msgid "d\t\tScroll diff view down 18 lines"
380 msgstr "d\t\tCuộn phần trình bày diff xuống 18 dòng"
381
496 -#: gitk:3072
382 #, tcl-format
383 msgid "<%s-F>\t\tFind"
384 msgstr "<%s-F>\t\tTìm kiếm"
385
501 -#: gitk:3073
386 #, tcl-format
387 msgid "<%s-G>\t\tMove to next find hit"
388 msgstr "<%s-G>\t\tDi chuyển đến chỗ gặp kế tiếp"
389
506 -#: gitk:3074
390 msgid "<Return>\tMove to next find hit"
391 msgstr "<Return>\t\tDi chuyển đến chỗ gặp kế tiếp"
392
510 -#: gitk:3075
393 msgid "g\t\tGo to commit"
394 msgstr "g\t\tChuyển đến lần chuyển giao"
395
514 -#: gitk:3076
396 msgid "/\t\tFocus the search box"
397 msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm"
398
518 -#: gitk:3077
399 msgid "?\t\tMove to previous find hit"
400 msgstr "?\t\tDi chuyển đến chỗ gặp kế trước"
401
522 -#: gitk:3078
402 msgid "f\t\tScroll diff view to next file"
403 msgstr "f\t\tCuộn phần trình bày diff sang tập-tin kế"
404
526 -#: gitk:3079
405 #, tcl-format
406 msgid "<%s-S>\t\tSearch for next hit in diff view"
407 msgstr "<%s-S>\t\tTìm đến chỗ khác biệt kế tiếp"
408
531 -#: gitk:3080
409 #, tcl-format
410 msgid "<%s-R>\t\tSearch for previous hit in diff view"
411 msgstr "<%s-R>\t\tTìm đến chỗ khác biệt kế trước"
412
536 -#: gitk:3081
413 #, tcl-format
414 msgid "<%s-KP+>\tIncrease font size"
415 msgstr "<%s-KP+>\tTăng cỡ chữ"
416
541 -#: gitk:3082
417 #, tcl-format
418 msgid "<%s-plus>\tIncrease font size"
419 msgstr "<%s-plus>\tTăng cỡ chữ"
420
546 -#: gitk:3083
421 #, tcl-format
422 msgid "<%s-KP->\tDecrease font size"
423 msgstr "<%s-KP->\tGiảm cỡ chữ"
424
551 -#: gitk:3084
425 #, tcl-format
426 msgid "<%s-minus>\tDecrease font size"
427 msgstr "<%s-minus>\tGiảm cỡ chữ"
428
556 -#: gitk:3085
429 msgid "<F5>\t\tUpdate"
430 msgstr "<F5>\t\tCập nhật"
431
560 -#: gitk:3550 gitk:3559
432 #, tcl-format
433 msgid "Error creating temporary directory %s:"
434 msgstr "Gặp lỗi khi tạo thư mục tạm %s:"
435
565 -#: gitk:3572
436 #, tcl-format
437 msgid "Error getting \"%s\" from %s:"
438 msgstr "Lỗi chào hỏi \"%s\" từ %s:"
439
570 -#: gitk:3635
440 msgid "command failed:"
441 msgstr "lệnh gặp lỗi:"
442
574 -#: gitk:3784
443 msgid "No such commit"
444 msgstr "Không có lần chuyển giao như vậy"
445
578 -#: gitk:3798
446 msgid "git gui blame: command failed:"
447 msgstr "git gui blame: lệnh gặp lỗi:"
448
582 -#: gitk:3829
449 #, tcl-format
450 msgid "Couldn't read merge head: %s"
451 msgstr "Không thể độc đầu của hòa trộn: %s"
452
453 # tcl-format
588 -#: gitk:3837
454 #, tcl-format
455 msgid "Error reading index: %s"
456 msgstr "Gặp lỗi khi đọc chỉ mục: %s"
457
593 -#: gitk:3862
458 #, tcl-format
459 msgid "Couldn't start git blame: %s"
460 msgstr "Không thể khởi chạy git blame: %s"
461
598 -#: gitk:3865 gitk:6754
462 msgid "Searching"
463 msgstr "Đang tìm kiếm"
464
602 -#: gitk:3897
465 #, tcl-format
466 msgid "Error running git blame: %s"
467 msgstr "Gặp lỗi khi chạy git blame: %s"
468
607 -#: gitk:3925
469 #, tcl-format
470 msgid "That line comes from commit %s, which is not in this view"
471 msgstr "Dòng đến từ lần chuyển giao %s, cái mà không trong trình bày này"
472
612 -#: gitk:3939
473 msgid "External diff viewer failed:"
474 msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:"
475
616 -#: gitk:4070
476 msgid "Gitk view definition"
477 msgstr "Định nghĩa cách trình bày gitk"
478
620 -#: gitk:4074
479 msgid "Remember this view"
480 msgstr "Nhớ cách trình bày này"
481
624 -#: gitk:4075
482 msgid "References (space separated list):"
483 msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):"
484
628 -#: gitk:4076
485 msgid "Branches & tags:"
486 msgstr "Nhánh & thẻ:"
487
632 -#: gitk:4077
488 msgid "All refs"
489 msgstr "Mọi tham chiếu"
490
636 -#: gitk:4078
491 msgid "All (local) branches"
492 msgstr "Mọi nhánh (nội bộ)"
493
640 -#: gitk:4079
494 msgid "All tags"
495 msgstr "Mọi thẻ"
496
644 -#: gitk:4080
497 msgid "All remote-tracking branches"
498 msgstr "Mọi nhánh remote-tracking"
499
648 -#: gitk:4081
500 msgid "Commit Info (regular expressions):"
501 msgstr "Thông tin chuyển giao (biểu thức chính quy):"
502
652 -#: gitk:4082
503 msgid "Author:"
504 msgstr "Tác giả:"
505
656 -#: gitk:4083
506 msgid "Committer:"
507 msgstr "Người chuyển giao:"
508
660 -#: gitk:4084
509 msgid "Commit Message:"
510 msgstr "Chú thích của lần chuyển giao:"
511
664 -#: gitk:4085
512 msgid "Matches all Commit Info criteria"
513 msgstr "Khớp mọi điều kiện Thông tin Chuyển giao"
514
668 -#: gitk:4086
515 msgid "Matches no Commit Info criteria"
516 msgstr "Khớp không điều kiện Thông tin Chuyển giao"
517
672 -#: gitk:4087
518 msgid "Changes to Files:"
519 msgstr "Đổi thành Tập tin:"
520
676 -#: gitk:4088
521 msgid "Fixed String"
522 msgstr "Chuỗi cố định"
523
680 -#: gitk:4089
524 msgid "Regular Expression"
525 msgstr "Biểu thức chính quy"
526
684 -#: gitk:4090
527 msgid "Search string:"
528 msgstr "Chuỗi tìm kiếm:"
529
688 -#: gitk:4091
530 msgid ""
531 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
532 "15:27:38\"):"
@@ -693,203 +534,155 @@ msgstr ""
534 "Ngày chuyển giao (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
535 "15:27:38\"):"
536
696 -#: gitk:4092
537 msgid "Since:"
538 msgstr "Kể từ:"
539
700 -#: gitk:4093
540 msgid "Until:"
541 msgstr "Đến:"
542
704 -#: gitk:4094
543 msgid "Limit and/or skip a number of revisions (positive integer):"
544 msgstr "Giới hạn và/hoặc bỏ số của điểm xét (số nguyên âm):"
545
708 -#: gitk:4095
546 msgid "Number to show:"
547 msgstr "Số lượng hiển thị:"
548
712 -#: gitk:4096
549 msgid "Number to skip:"
550 msgstr "Số lượng sẽ bỏ qua:"
551
716 -#: gitk:4097
552 msgid "Miscellaneous options:"
553 msgstr "Tùy chọn hỗn hợp:"
554
720 -#: gitk:4098
555 msgid "Strictly sort by date"
556 msgstr "Sắp xếp chặt chẽ theo ngày"
557
724 -#: gitk:4099
558 msgid "Mark branch sides"
559 msgstr "Đánh dấu các cạnh nhánh"
560
728 -#: gitk:4100
561 msgid "Limit to first parent"
562 msgstr "Giới hạn thành cha mẹ đầu tiên"
563
732 -#: gitk:4101
564 msgid "Simple history"
565 msgstr "Lịch sử dạng đơn giản"
566
736 -#: gitk:4102
567 msgid "Additional arguments to git log:"
568 msgstr "Đối số bổ xung cho lệnh git log:"
569
740 -#: gitk:4103
570 msgid "Enter files and directories to include, one per line:"
571 msgstr "Nhập vào các tập tin và thư mục bao gồm, mỗi dòng một cái:"
572
744 -#: gitk:4104
573 msgid "Command to generate more commits to include:"
574 msgstr "Lệnh tạo ra nhiều lần chuyển giao hơn bao gồm:"
575
748 -#: gitk:4228
576 msgid "Gitk: edit view"
577 msgstr "Gitk: sửa cách trình bày"
578
752 -#: gitk:4236
579 msgid "-- criteria for selecting revisions"
580 msgstr "-- tiêu chuẩn chọn điểm xét duyệt"
581
756 -#: gitk:4241
582 msgid "View Name"
583 msgstr "Tên cách trình bày"
584
760 -#: gitk:4316
585 msgid "Apply (F5)"
586 msgstr "Áp dụng (F5)"
587
764 -#: gitk:4354
588 msgid "Error in commit selection arguments:"
589 msgstr "Lỗi trong các đối số chọn chuyển giao:"
590
768 -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
591 msgid "None"
592 msgstr "Không"
593
772 -#: gitk:5021 gitk:5026
594 msgid "Descendant"
595 msgstr "Con cháu"
596
776 -#: gitk:5022
597 msgid "Not descendant"
598 msgstr "Không có con cháu"
599
780 -#: gitk:5029 gitk:5034
600 msgid "Ancestor"
601 msgstr "Tổ tiên chung"
602
784 -#: gitk:5030
603 msgid "Not ancestor"
604 msgstr "Không có chung tổ tiên"
605
788 -#: gitk:5324
606 msgid "Local changes checked in to index but not committed"
607 msgstr ""
608 "Có thay đổi nội bộ đã được đưa vào bảng mục lục, nhưng chưa được chuyển giao"
609
793 -#: gitk:5360
610 msgid "Local uncommitted changes, not checked in to index"
611 msgstr "Có thay đổi nội bộ, nhưng chưa được đưa vào bảng mục lục"
612
797 -#: gitk:7134
613 msgid "and many more"
614 msgstr "và nhiều nữa"
615
801 -#: gitk:7137
616 msgid "many"
617 msgstr "nhiều"
618
805 -#: gitk:7328
619 msgid "Tags:"
620 msgstr "Thẻ:"
621
809 -#: gitk:7345 gitk:7351 gitk:8825
622 msgid "Parent"
623 msgstr "Cha"
624
813 -#: gitk:7356
625 msgid "Child"
626 msgstr "Con"
627
817 -#: gitk:7365
628 msgid "Branch"
629 msgstr "Nhánh"
630
821 -#: gitk:7368
631 msgid "Follows"
632 msgstr "Đứng sau"
633
825 -#: gitk:7371
634 msgid "Precedes"
635 msgstr "Đứng trước"
636
637 # tcl-format
830 -#: gitk:7966
638 #, tcl-format
639 msgid "Error getting diffs: %s"
640 msgstr "Lỗi lấy diff: %s"
641
835 -#: gitk:8650
642 msgid "Goto:"
643 msgstr "Nhảy tới:"
644
839 -#: gitk:8671
645 #, tcl-format
646 msgid "Short SHA1 id %s is ambiguous"
647 msgstr "Định danh SHA1 dạng ngắn %s là chưa đủ rõ ràng"
648
844 -#: gitk:8678
649 #, tcl-format
650 msgid "Revision %s is not known"
651 msgstr "Không hiểu điểm xét duyệt %s"
652
849 -#: gitk:8688
653 #, tcl-format
654 msgid "SHA1 id %s is not known"
655 msgstr "Không hiểu định danh SHA1 %s"
656
854 -#: gitk:8690
657 #, tcl-format
658 msgid "Revision %s is not in the current view"
659 msgstr "Điểm %s không ở trong phần hiển thị hiện tại"
660
859 -#: gitk:8832 gitk:8847
661 msgid "Date"
662 msgstr "Ngày"
663
863 -#: gitk:8835
664 msgid "Children"
665 msgstr "Con cháu"
666
867 -#: gitk:8898
667 #, tcl-format
668 msgid "Reset %s branch to here"
669 msgstr "Đặt lại nhánh %s tại đây"
670
872 -#: gitk:8900
671 msgid "Detached head: can't reset"
672 msgstr "Head đã bị tách rời: không thể đặt lại"
673
876 -#: gitk:9005 gitk:9011
674 msgid "Skipping merge commit "
675 msgstr "Bỏ qua lần chuyển giao hòa trộn "
676
880 -#: gitk:9020 gitk:9025
677 msgid "Error getting patch ID for "
678 msgstr "Gặp lỗi khi lấy ID miếng vá cho "
679
884 -#: gitk:9021 gitk:9026
680 msgid " - stopping\n"
681 msgstr " - dừng\n"
682
888 -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
683 msgid "Commit "
684 msgstr "Commit "
685
892 -#: gitk:9035
686 msgid ""
687 " is the same patch as\n"
688 " "
@@ -897,7 +690,6 @@ msgstr ""
690 " là cùng một miếng vá với\n"
691 " "
692
900 -#: gitk:9043
693 msgid ""
694 " differs from\n"
695 " "
@@ -905,7 +697,6 @@ msgstr ""
697 " khác biệt từ\n"
698 " "
699
908 -#: gitk:9045
700 msgid ""
701 "Diff of commits:\n"
702 "\n"
@@ -913,131 +704,101 @@ msgstr ""
704 "Khác biệt của lần chuyển giao (commit):\n"
705 "\n"
706
916 -#: gitk:9057 gitk:9066
707 #, tcl-format
708 msgid " has %s children - stopping\n"
709 msgstr " có %s con - dừng\n"
710
921 -#: gitk:9085
711 #, tcl-format
712 msgid "Error writing commit to file: %s"
713 msgstr "Gặp lỗi trong quá trình ghi lần chuyển giao vào tập tin: %s"
714
926 -#: gitk:9091
715 #, tcl-format
716 msgid "Error diffing commits: %s"
717 msgstr "Gặp lỗi khi so sánh sự khác biệt giữa các lần chuyển giao: %s"
718
931 -#: gitk:9137
719 msgid "Top"
720 msgstr "Đỉnh"
721
935 -#: gitk:9138
722 msgid "From"
723 msgstr "Từ"
724
939 -#: gitk:9143
725 msgid "To"
726 msgstr "Đến"
727
943 -#: gitk:9167
728 msgid "Generate patch"
729 msgstr "Tạo miếng vá"
730
947 -#: gitk:9169
731 msgid "From:"
732 msgstr "Từ:"
733
951 -#: gitk:9178
734 msgid "To:"
735 msgstr "Đến:"
736
955 -#: gitk:9187
737 msgid "Reverse"
738 msgstr "Đảo ngược"
739
959 -#: gitk:9189 gitk:9385
740 msgid "Output file:"
741 msgstr "Tập tin kết xuất:"
742
963 -#: gitk:9195
743 msgid "Generate"
744 msgstr "Tạo"
745
967 -#: gitk:9233
746 msgid "Error creating patch:"
747 msgstr "Gặp lỗi khi tạo miếng vá:"
748
971 -#: gitk:9256 gitk:9373 gitk:9430
749 msgid "ID:"
750 msgstr "Mã số:"
751
975 -#: gitk:9265
752 msgid "Tag name:"
753 msgstr "Tên thẻ:"
754
979 -#: gitk:9268
755 msgid "Tag message is optional"
756 msgstr "Ghi chú thẻ chỉ là tùy chọn"
757
983 -#: gitk:9270
758 msgid "Tag message:"
759 msgstr "Ghi chú cho thẻ:"
760
987 -#: gitk:9274 gitk:9439
761 msgid "Create"
762 msgstr "Tạo"
763
991 -#: gitk:9292
764 msgid "No tag name specified"
765 msgstr "Chưa chỉ ra tên của thẻ"
766
995 -#: gitk:9296
767 #, tcl-format
768 msgid "Tag \"%s\" already exists"
769 msgstr "Thẻ “%s” đã có sẵn rồi"
770
1000 -#: gitk:9306
771 msgid "Error creating tag:"
772 msgstr "Gặp lỗi khi tạo thẻ:"
773
1004 -#: gitk:9382
774 msgid "Command:"
775 msgstr "Lệnh:"
776
1008 -#: gitk:9390
777 msgid "Write"
778 msgstr "Ghi"
779
1012 -#: gitk:9408
780 msgid "Error writing commit:"
781 msgstr "Gặp lỗi trong quá trình ghi chuyển giao:"
782
1016 -#: gitk:9435
783 msgid "Name:"
784 msgstr "Tên:"
785
1020 -#: gitk:9458
786 msgid "Please specify a name for the new branch"
787 msgstr "Vui lòng chỉ định tên cho nhánh mới"
788
1024 -#: gitk:9463
789 #, tcl-format
790 msgid "Branch '%s' already exists. Overwrite?"
791 msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?"
792
1029 -#: gitk:9530
793 #, tcl-format
794 msgid "Commit %s is already included in branch %s -- really re-apply it?"
795 msgstr ""
796 "Lần chuyển giao %s đã sẵn được bao gồm trong nhánh %s -- bạn có thực sự muốn "
797 "áp dụng lại nó không?"
798
1036 -#: gitk:9535
799 msgid "Cherry-picking"
800 msgstr "Đang cherry-pick"
801
1040 -#: gitk:9544
802 #, tcl-format
803 msgid ""
804 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1046,7 +807,6 @@ msgstr ""
807 "Cherry-pick gặp lỗi bởi vì các thay đổi nội bộ tập tin “%s”.\n"
808 "Xin hãy chuyển giao, reset hay stash các thay đổi của bạn sau đó thử lại."
809
1049 -#: gitk:9550
810 msgid ""
811 "Cherry-pick failed because of merge conflict.\n"
812 "Do you wish to run git citool to resolve it?"
@@ -1054,22 +814,18 @@ msgstr ""
814 "Cherry-pick gặp lỗi bởi vì xung đột trong hòa trộn.\n"
815 "Bạn có muốn chạy lệnh “git citool” để giải quyết vấn đề này không?"
816
1057 -#: gitk:9566 gitk:9624
817 msgid "No changes committed"
818 msgstr "Không có thay đổi nào cần chuyển giao"
819
1061 -#: gitk:9593
820 #, tcl-format
821 msgid "Commit %s is not included in branch %s -- really revert it?"
822 msgstr ""
823 "Lần chuyển giao %s không được bao gồm trong nhánh %s -- bạn có thực sự muốn "
824 "“revert” nó không?"
825
1068 -#: gitk:9598
826 msgid "Reverting"
827 msgstr "Đang hoàn tác"
828
1072 -#: gitk:9606
829 #, tcl-format
830 msgid ""
831 "Revert failed because of local changes to the following files:%s Please "
@@ -1078,7 +834,6 @@ msgstr ""
834 "Revert gặp lỗi bởi vì tập tin sau đã được thay đổi nội bộ:%s\n"
835 "Xin hãy chạy lệnh “commit”, “reset” hoặc “stash” rồi thử lại."
836
1081 -#: gitk:9610
837 msgid ""
838 "Revert failed because of merge conflict.\n"
839 " Do you wish to run git citool to resolve it?"
@@ -1086,29 +841,23 @@ msgstr ""
841 "Revert gặp lỗi bởi vì xung đột hòa trộn.\n"
842 " Bạn có muốn chạy lệnh “git citool” để phân giải nó không?"
843
1089 -#: gitk:9653
844 msgid "Confirm reset"
845 msgstr "Xác nhật đặt lại"
846
1093 -#: gitk:9655
847 #, tcl-format
848 msgid "Reset branch %s to %s?"
849 msgstr "Đặt lại nhánh “%s” thành “%s”?"
850
1098 -#: gitk:9657
851 msgid "Reset type:"
852 msgstr "Kiểu đặt lại:"
853
1102 -#: gitk:9660
854 msgid "Soft: Leave working tree and index untouched"
855 msgstr "Mềm: Không động đến thư mục làm việc và bảng mục lục"
856
1106 -#: gitk:9663
857 msgid "Mixed: Leave working tree untouched, reset index"
858 msgstr ""
859 "Pha trộn: Không động chạm đến thư mục làm việc nhưng đặt lại bảng mục lục"
860
1111 -#: gitk:9666
861 msgid ""
862 "Hard: Reset working tree and index\n"
863 "(discard ALL local changes)"
@@ -1116,19 +865,15 @@ msgstr ""
865 "Hard: Đặt lại cây làm việc và mục lục\n"
866 "(hủy bỏ MỌI thay đổi nội bộ)"
867
1119 -#: gitk:9683
868 msgid "Resetting"
869 msgstr "Đang đặt lại"
870
1123 -#: gitk:9743
871 msgid "Checking out"
872 msgstr "Đang checkout"
873
1127 -#: gitk:9796
874 msgid "Cannot delete the currently checked-out branch"
875 msgstr "Không thể xóa nhánh hiện tại đang được lấy ra"
876
1131 -#: gitk:9802
877 #, tcl-format
878 msgid ""
879 "The commits on branch %s aren't on any other branch.\n"
@@ -1137,16 +882,13 @@ msgstr ""
882 "Các lần chuyển giao trên nhánh %s không ở trên nhánh khác.\n"
883 "Thực sự muốn xóa nhánh %s?"
884
1140 -#: gitk:9833
885 #, tcl-format
886 msgid "Tags and heads: %s"
887 msgstr "Thẻ và Đầu: %s"
888
1145 -#: gitk:9850
889 msgid "Filter"
890 msgstr "Bộ lọc"
891
1149 -#: gitk:10146
892 msgid ""
893 "Error reading commit topology information; branch and preceding/following "
894 "tag information will be incomplete."
@@ -1154,201 +896,152 @@ msgstr ""
896 "Gặp lỗi khi đọc thông tin hình học lần chuyển giao; thông tin nhánh và thẻ "
897 "trước/sau sẽ không hoàn thiện."
898
1157 -#: gitk:11123
899 msgid "Tag"
900 msgstr "Thẻ"
901
1161 -#: gitk:11127
902 msgid "Id"
903 msgstr "Id"
904
1165 -#: gitk:11210
905 msgid "Gitk font chooser"
906 msgstr "Hộp thoại chọn phông Gitk"
907
1169 -#: gitk:11227
908 msgid "B"
909 msgstr "B"
910
1173 -#: gitk:11230
911 msgid "I"
912 msgstr "I"
913
1177 -#: gitk:11348
914 msgid "Commit list display options"
915 msgstr "Các tùy chọn về hiển thị danh sách lần chuyển giao"
916
1181 -#: gitk:11351
917 msgid "Maximum graph width (lines)"
918 msgstr "Độ rộng biểu đồ tối đa (dòng)"
919
1185 -#: gitk:11355
920 #, no-tcl-format
921 msgid "Maximum graph width (% of pane)"
922 msgstr "Độ rộng đồ thị tối đa (% của bảng)"
923
1190 -#: gitk:11358
924 msgid "Show local changes"
925 msgstr "Hiển thị các thay đổi nội bộ"
926
1194 -#: gitk:11361
927 msgid "Auto-select SHA1 (length)"
928 msgstr "Tự chọn (độ dài) SHA1"
929
1198 -#: gitk:11365
930 msgid "Hide remote refs"
931 msgstr "Ẩn tham chiếu đến máy chủ"
932
1202 -#: gitk:11369
933 msgid "Diff display options"
934 msgstr "Các tùy chọn trình bày các khác biệt"
935
1206 -#: gitk:11371
936 msgid "Tab spacing"
937 msgstr "Khoảng cách tab"
938
1210 -#: gitk:11374
939 msgid "Display nearby tags/heads"
940 msgstr "Hiển thị các thẻ/đầu xung quanh"
941
1214 -#: gitk:11377
942 msgid "Maximum # tags/heads to show"
943 msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị"
944
1218 -#: gitk:11380
945 msgid "Limit diffs to listed paths"
946 msgstr "Giới hạn các khác biệt cho đường dẫn đã liệt kê"
947
1222 -#: gitk:11383
948 msgid "Support per-file encodings"
949 msgstr "Hỗ trợ mã hóa mỗi-dòng"
950
1226 -#: gitk:11389 gitk:11536
951 msgid "External diff tool"
952 msgstr "Công cụ so sánh từ bên ngoài"
953
1230 -#: gitk:11390
954 msgid "Choose..."
955 msgstr "Chọn…"
956
1234 -#: gitk:11395
957 msgid "General options"
958 msgstr "Các tùy chọn chung"
959
1238 -#: gitk:11398
960 msgid "Use themed widgets"
961 msgstr "Dùng các widget chủ đề"
962
1242 -#: gitk:11400
963 msgid "(change requires restart)"
964 msgstr "(để thay đổi cần khởi động lại)"
965
1246 -#: gitk:11402
966 msgid "(currently unavailable)"
967 msgstr "(hiện tại không sẵn sàng)"
968
1250 -#: gitk:11413
969 msgid "Colors: press to choose"
970 msgstr "Màu sắc: bấm vào nút phía dưới để chọn màu"
971
1254 -#: gitk:11416
972 msgid "Interface"
973 msgstr "Giao diện"
974
1258 -#: gitk:11417
975 msgid "interface"
976 msgstr "giao diện"
977
1262 -#: gitk:11420
978 msgid "Background"
979 msgstr "Nền"
980
1266 -#: gitk:11421 gitk:11451
981 msgid "background"
982 msgstr "nền"
983
1270 -#: gitk:11424
984 msgid "Foreground"
985 msgstr "Tiền cảnh"
986
1274 -#: gitk:11425
987 msgid "foreground"
988 msgstr "tiền cảnh"
989
1278 -#: gitk:11428
990 msgid "Diff: old lines"
991 msgstr "So sánh: dòng cũ"
992
1282 -#: gitk:11429
993 msgid "diff old lines"
994 msgstr "diff dòng cũ"
995
1286 -#: gitk:11433
996 msgid "Diff: new lines"
997 msgstr "So sánh: dòng mới"
998
1290 -#: gitk:11434
999 msgid "diff new lines"
1000 msgstr "màu dòng mới"
1001
1294 -#: gitk:11438
1002 msgid "Diff: hunk header"
1003 msgstr "So sánh: phần đầu của đoạn"
1004
1298 -#: gitk:11440
1005 msgid "diff hunk header"
1006 msgstr "màu của phần đầu của đoạn khi so sánh"
1007
1302 -#: gitk:11444
1008 msgid "Marked line bg"
1009 msgstr "Nền dòng đánh dấu"
1010
1306 -#: gitk:11446
1011 msgid "marked line background"
1012 msgstr "nền dòng được đánh dấu"
1013
1310 -#: gitk:11450
1014 msgid "Select bg"
1015 msgstr "Màu nền"
1016
1314 -#: gitk:11459
1017 msgid "Fonts: press to choose"
1018 msgstr "Phông chữ: bấm vào các nút ở dưới để chọn"
1019
1318 -#: gitk:11461
1020 msgid "Main font"
1021 msgstr "Phông chữ chính"
1022
1322 -#: gitk:11462
1023 msgid "Diff display font"
1024 msgstr "Phông chữ dùng khi so sánh"
1025
1326 -#: gitk:11463
1026 msgid "User interface font"
1027 msgstr "Phông chữ giao diện"
1028
1330 -#: gitk:11485
1029 msgid "Gitk preferences"
1030 msgstr "Cá nhân hóa các cài đặt cho Gitk"
1031
1334 -#: gitk:11494
1032 msgid "General"
1033 msgstr "Chung"
1034
1338 -#: gitk:11495
1035 msgid "Colors"
1036 msgstr "Màu sắc"
1037
1342 -#: gitk:11496
1038 msgid "Fonts"
1039 msgstr "Phông chữ"
1040
1346 -#: gitk:11546
1041 #, tcl-format
1042 msgid "Gitk: choose color for %s"
1043 msgstr "Gitk: chọn màu cho %s"
1044
1351 -#: gitk:12059
1045 msgid ""
1046 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1047 " Gitk requires at least Tcl/Tk 8.4."
@@ -1356,16 +1049,13 @@ msgstr ""
1049 "Rất tiếc, gitk không thể chạy Tcl/Tk phiên bản này.\n"
1050 " Gitk cần ít nhất là Tcl/Tk 8.4."
1051
1359 -#: gitk:12269
1052 msgid "Cannot find a git repository here."
1053 msgstr "Không thể tìm thấy kho git ở đây."
1054
1363 -#: gitk:12316
1055 #, tcl-format
1056 msgid "Ambiguous argument '%s': both revision and filename"
1057 msgstr "Đối số “%s” chưa rõ ràng: vừa là điểm xét duyệt vừa là tên tập tin"
1058
1368 -#: gitk:12328
1059 msgid "Bad arguments to gitk:"
1060 msgstr "Đối số cho gitk không hợp lệ:"
1061
po/zh_cn.po
+39 -333
@@ -2,7 +2,6 @@
2 #
3 # Translators:
4 # YanKe <imyanke@163.com>, 2017
5 -
5 msgid ""
6 msgstr ""
7 "Project-Id-Version: Git Chinese Localization Project\n"
@@ -16,356 +15,266 @@ msgstr ""
15 "Content-Transfer-Encoding: 8bit\n"
16 "Language: zh_CN\n"
17
19 -#: gitk:140
18 msgid "Couldn't get list of unmerged files:"
19 msgstr "不能获取未合并文件列表:"
20
23 -#: gitk:212 gitk:2403
21 msgid "Color words"
22 msgstr "着色显示差异"
23
27 -#: gitk:217 gitk:2403 gitk:8249 gitk:8282
24 msgid "Markup words"
25 msgstr "标记显示差异"
26
31 -#: gitk:324
27 msgid "Error parsing revisions:"
28 msgstr "解析版本错误:"
29
35 -#: gitk:380
30 msgid "Error executing --argscmd command:"
31 msgstr "运行 --argscmd命令出错"
32
39 -#: gitk:393
33 msgid "No files selected: --merge specified but no files are unmerged."
34 msgstr "没有选中文件:--指定merge参数但没有未合并的文件。"
35
43 -#: gitk:396
36 msgid ""
37 "No files selected: --merge specified but no unmerged files are within file "
38 "limit."
39 msgstr "没有选中文件:--指定merge参数但没有未合并的文件在文件中"
40
49 -#: gitk:418 gitk:566
41 msgid "Error executing git log:"
42 msgstr "执行git log命令出错:"
43
53 -#: gitk:436 gitk:582
44 msgid "Reading"
45 msgstr "读取中"
46
57 -#: gitk:496 gitk:4549
47 msgid "Reading commits..."
48 msgstr "提交记录读取中..."
49
61 -#: gitk:499 gitk:1641 gitk:4552
50 msgid "No commits selected"
51 msgstr "未选中任何提交"
52
65 -#: gitk:1449 gitk:4069 gitk:12583
53 msgid "Command line"
54 msgstr "命令行"
55
69 -#: gitk:1515
56 msgid "Can't parse git log output:"
57 msgstr "不能解析git log输出:"
58
73 -#: gitk:1744
59 msgid "No commit information available"
60 msgstr "无可用提交信息"
61
77 -#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668
62 msgid "OK"
63 msgstr "确定"
64
81 -#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791
82 -#: gitk:11389 gitk:11669
65 msgid "Cancel"
66 msgstr "取消"
67
86 -#: gitk:2087
68 msgid "&Update"
69 msgstr "更新"
70
90 -#: gitk:2088
71 msgid "&Reload"
72 msgstr "重新加载"
73
94 -#: gitk:2089
74 msgid "Reread re&ferences"
75 msgstr "重新读取引用"
76
98 -#: gitk:2090
77 msgid "&List references"
78 msgstr "列出引用(分支以及tag)"
79
102 -#: gitk:2092
80 msgid "Start git &gui"
81 msgstr "启动git gui客户端"
82
106 -#: gitk:2094
83 msgid "&Quit"
84 msgstr "退出"
85
110 -#: gitk:2086
86 msgid "&File"
87 msgstr "文件"
88
114 -#: gitk:2098
89 msgid "&Preferences"
90 msgstr "偏好设置"
91
118 -#: gitk:2097
92 msgid "&Edit"
93 msgstr "编辑"
94
122 -#: gitk:2102
95 msgid "&New view..."
96 msgstr "新视图..."
97
126 -#: gitk:2103
98 msgid "&Edit view..."
99 msgstr "编辑视图..."
100
130 -#: gitk:2104
101 msgid "&Delete view"
102 msgstr "删除视图"
103
134 -#: gitk:2106
104 msgid "&All files"
105 msgstr "所有文件"
106
138 -#: gitk:2101
107 msgid "&View"
108 msgstr "视图"
109
142 -#: gitk:2111 gitk:2121
110 msgid "&About gitk"
111 msgstr "关于gitk"
112
146 -#: gitk:2112 gitk:2126
113 msgid "&Key bindings"
114 msgstr "快捷键"
115
150 -#: gitk:2110 gitk:2125
116 msgid "&Help"
117 msgstr "帮助"
118
154 -#: gitk:2203 gitk:8681
119 msgid "SHA1 ID:"
120 msgstr "SHA1 ID:"
121
158 -#: gitk:2247
122 msgid "Row"
123 msgstr "行"
124
162 -#: gitk:2285
125 msgid "Find"
126 msgstr "查找"
127
166 -#: gitk:2313
128 msgid "commit"
129 msgstr "提交"
130
170 -#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851
171 -#: gitk:6936
131 msgid "containing:"
132 msgstr "包含:"
133
175 -#: gitk:2320 gitk:3550 gitk:3555 gitk:4787
134 msgid "touching paths:"
135 msgstr "影响路径:"
136
179 -#: gitk:2321 gitk:4801
137 msgid "adding/removing string:"
138 msgstr "增加/删除字符串:"
139
183 -#: gitk:2322 gitk:4803
140 msgid "changing lines matching:"
141 msgstr "改变行匹配:"
142
187 -#: gitk:2331 gitk:2333 gitk:4790
143 msgid "Exact"
144 msgstr "精确匹配"
145
191 -#: gitk:2333 gitk:4878 gitk:6747
146 msgid "IgnCase"
147 msgstr "忽略大小写"
148
195 -#: gitk:2333 gitk:4760 gitk:4876 gitk:6743
149 msgid "Regexp"
150 msgstr "正则"
151
199 -#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940
152 msgid "All fields"
153 msgstr "所有字段"
154
203 -#: gitk:2336 gitk:4895 gitk:4928 gitk:6810
155 msgid "Headline"
156 msgstr "标题"
157
207 -#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413
158 msgid "Comments"
159 msgstr "提交注释"
160
211 -#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859
212 -#: gitk:8874
161 msgid "Author"
162 msgstr "作者"
163
216 -#: gitk:2337 gitk:4895 gitk:6810 gitk:7350
164 msgid "Committer"
165 msgstr "提交者"
166
220 -#: gitk:2371
167 msgid "Search"
168 msgstr "搜索"
169
224 -#: gitk:2379
170 msgid "Diff"
171 msgstr "差异"
172
228 -#: gitk:2381
173 msgid "Old version"
174 msgstr "老版本"
175
232 -#: gitk:2383
176 msgid "New version"
177 msgstr "新版本"
178
236 -#: gitk:2386
179 msgid "Lines of context"
180 msgstr "Diff上下文显示行数"
181
240 -#: gitk:2396
182 msgid "Ignore space change"
183 msgstr "忽略空格修改"
184
244 -#: gitk:2400 gitk:2402 gitk:7983 gitk:8235
185 msgid "Line diff"
186 msgstr "按行显示差异"
187
248 -#: gitk:2467
188 msgid "Patch"
189 msgstr "补丁"
190
252 -#: gitk:2469
191 msgid "Tree"
192 msgstr "树"
193
256 -#: gitk:2639 gitk:2660
194 msgid "Diff this -> selected"
195 msgstr "比较从当前提交到选中提交的差异"
196
260 -#: gitk:2640 gitk:2661
197 msgid "Diff selected -> this"
198 msgstr "比较从选中提交到当前提交的差异"
199
264 -#: gitk:2641 gitk:2662
200 msgid "Make patch"
201 msgstr "制作补丁"
202
268 -#: gitk:2642 gitk:9283
203 msgid "Create tag"
204 msgstr "创建tag"
205
272 -#: gitk:2643
206 msgid "Copy commit summary"
207 msgstr "复制提交摘要"
208
276 -#: gitk:2644 gitk:9414
209 msgid "Write commit to file"
210 msgstr "写入提交到文件"
211
280 -#: gitk:2645
212 msgid "Create new branch"
213 msgstr "创建新分支"
214
284 -#: gitk:2646
215 msgid "Cherry-pick this commit"
216 msgstr "在此提交运用补丁(cherry-pick)命令"
217
288 -#: gitk:2647
218 msgid "Reset HEAD branch to here"
219 msgstr "将分支头(HEAD)重置到此处"
220
292 -#: gitk:2648
221 msgid "Mark this commit"
222 msgstr "标记此提交"
223
296 -#: gitk:2649
224 msgid "Return to mark"
225 msgstr "返回到标记"
226
300 -#: gitk:2650
227 msgid "Find descendant of this and mark"
228 msgstr "查找本次提交的子提交并标记"
229
304 -#: gitk:2651
230 msgid "Compare with marked commit"
231 msgstr "和已标记的提交作比较"
232
308 -#: gitk:2652 gitk:2663
233 msgid "Diff this -> marked commit"
234 msgstr "比较从当前提交到已标记提交的差异"
235
312 -#: gitk:2653 gitk:2664
236 msgid "Diff marked commit -> this"
237 msgstr "比较从已标记提交到当前提交的差异"
238
316 -#: gitk:2654
239 msgid "Revert this commit"
240 msgstr "撤销(revert)此提交"
241
320 -#: gitk:2670
242 msgid "Check out this branch"
243 msgstr "检出(checkout)此分支"
244
324 -#: gitk:2671
245 msgid "Rename this branch"
246 msgstr "重命名(Rename)此分支"
247
328 -#: gitk:2672
248 msgid "Remove this branch"
249 msgstr "删除(Remove)此分支"
250
332 -#: gitk:2673
251 msgid "Copy branch name"
252 msgstr "复制分支名称"
253
336 -#: gitk:2680
254 msgid "Highlight this too"
255 msgstr "高亮此处"
256
340 -#: gitk:2681
257 msgid "Highlight this only"
258 msgstr "只高亮此处"
259
344 -#: gitk:2682
260 msgid "External diff"
261 msgstr "外部diff"
262
348 -#: gitk:2683
263 msgid "Blame parent commit"
264 msgstr "Blame父提交"
265
352 -#: gitk:2684
266 msgid "Copy path"
267 msgstr "复制路径"
268
356 -#: gitk:2691
269 msgid "Show origin of this line"
270 msgstr "显示此行原始提交"
271
360 -#: gitk:2692
272 msgid "Run git gui blame on this line"
273 msgstr "在此行运行git gui客户端的blame"
274
364 -#: gitk:3036
275 msgid "About gitk"
276 msgstr "关于gitk"
277
368 -#: gitk:3038
278 msgid ""
279 "\n"
280 "Gitk - a commit viewer for git\n"
@@ -373,995 +282,792 @@ msgid ""
282 "Copyright © 2005-2016 Paul Mackerras\n"
283 "\n"
284 "Use and redistribute under the terms of the GNU General Public License"
376 -msgstr "\nGitk — 一个git的提交查看器\n\n© 2005-2016 Paul Mackerras\n\n在GNU许可证下使用以及分发"
285 +msgstr ""
286 +"\n"
287 +"Gitk — 一个git的提交查看器\n"
288 +"\n"
289 +"© 2005-2016 Paul Mackerras\n"
290 +"\n"
291 +"在GNU许可证下使用以及分发"
292
378 -#: gitk:3046 gitk:3113 gitk:10004
293 msgid "Close"
294 msgstr "关闭"
295
382 -#: gitk:3067
296 msgid "Gitk key bindings"
297 msgstr "Gitk快捷键"
298
386 -#: gitk:3070
299 msgid "Gitk key bindings:"
300 msgstr "Gitk快捷键:"
301
390 -#: gitk:3072
302 #, tcl-format
303 msgid "<%s-Q>\t\tQuit"
304 msgstr "<%s-Q>\t\t退出"
305
395 -#: gitk:3073
306 #, tcl-format
307 msgid "<%s-W>\t\tClose window"
308 msgstr "<%s-W>\t\t关闭窗口"
309
400 -#: gitk:3074
310 msgid "<Home>\t\tMove to first commit"
311 msgstr "<Home>\t\t移动到第一次提交"
312
404 -#: gitk:3075
313 msgid "<End>\t\tMove to last commit"
314 msgstr "<End>\t\t移动到最后一次提交"
315
408 -#: gitk:3076
316 msgid "<Up>, p, k\tMove up one commit"
317 msgstr "<Up>, p, k\t移动到上一次提交"
318
412 -#: gitk:3077
319 msgid "<Down>, n, j\tMove down one commit"
320 msgstr "<Down>, n, j\t移动到下一次提交"
321
416 -#: gitk:3078
322 msgid "<Left>, z, h\tGo back in history list"
323 msgstr "<Left>, z, h\t历史列表的上一项"
324
420 -#: gitk:3079
325 msgid "<Right>, x, l\tGo forward in history list"
326 msgstr "<Right>, x, l\t历史列表的下一项"
327
424 -#: gitk:3080
328 #, tcl-format
329 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
330 msgstr "<%s-n>\t在历史列表中前往本次提交的第n个父提交"
331
429 -#: gitk:3081
332 msgid "<PageUp>\tMove up one page in commit list"
333 msgstr "<PageUp>\t上一页提交列表"
334
433 -#: gitk:3082
335 msgid "<PageDown>\tMove down one page in commit list"
336 msgstr "<PageDown>\t下一页提交列表"
337
437 -#: gitk:3083
338 #, tcl-format
339 msgid "<%s-Home>\tScroll to top of commit list"
340 msgstr "<%s-Home>\t滚动到提交列表顶部"
341
442 -#: gitk:3084
342 #, tcl-format
343 msgid "<%s-End>\tScroll to bottom of commit list"
344 msgstr "<%s-End>\t滚动到提交列表底部"
345
447 -#: gitk:3085
346 #, tcl-format
347 msgid "<%s-Up>\tScroll commit list up one line"
348 msgstr "<%s-Up>\t向上滚动一行提交列表"
349
452 -#: gitk:3086
350 #, tcl-format
351 msgid "<%s-Down>\tScroll commit list down one line"
352 msgstr "<%s-Down>\t向下滚动一行提交列表"
353
457 -#: gitk:3087
354 #, tcl-format
355 msgid "<%s-PageUp>\tScroll commit list up one page"
356 msgstr "<%s-PageUp>\t向上滚动一页提交列表"
357
462 -#: gitk:3088
358 #, tcl-format
359 msgid "<%s-PageDown>\tScroll commit list down one page"
360 msgstr "<%s-PageDown>\t向下滚动一页提交列表"
361
467 -#: gitk:3089
362 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
363 msgstr "<Shift-Up>\t向后查找(向上的,更晚的提交)"
364
471 -#: gitk:3090
365 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
366 msgstr "<Shift-Down>\t向前查找(向下的,更早的提交)"
367
475 -#: gitk:3091
368 msgid "<Delete>, b\tScroll diff view up one page"
369 msgstr "<Delete>, b\t向上滚动diff视图一页"
370
479 -#: gitk:3092
371 msgid "<Backspace>\tScroll diff view up one page"
372 msgstr "<Backspace>\t向上滚动diff视图一页"
373
483 -#: gitk:3093
374 msgid "<Space>\t\tScroll diff view down one page"
375 msgstr "<Space>\t\t向下滚动diff视图一页"
376
487 -#: gitk:3094
377 msgid "u\t\tScroll diff view up 18 lines"
378 msgstr "u\t\t向上滚动diff视图18行"
379
491 -#: gitk:3095
380 msgid "d\t\tScroll diff view down 18 lines"
381 msgstr "d\t\t向下滚动diff视图18行"
382
495 -#: gitk:3096
383 #, tcl-format
384 msgid "<%s-F>\t\tFind"
385 msgstr "<%s-F>\t\t查找"
386
500 -#: gitk:3097
387 #, tcl-format
388 msgid "<%s-G>\t\tMove to next find hit"
389 msgstr "<%s-G>\t\t移动到下一次查找命中"
390
505 -#: gitk:3098
391 msgid "<Return>\tMove to next find hit"
392 msgstr "<Return>\t\t移动到下一次查找命中"
393
509 -#: gitk:3099
394 msgid "g\t\tGo to commit"
395 msgstr "g\t\t转到提交"
396
513 -#: gitk:3100
397 msgid "/\t\tFocus the search box"
398 msgstr "/\t\t选中搜索框"
399
517 -#: gitk:3101
400 msgid "?\t\tMove to previous find hit"
401 msgstr "?\t\t移动到上一次查找命中"
402
521 -#: gitk:3102
403 msgid "f\t\tScroll diff view to next file"
404 msgstr "f\t\t滚动diff视图到下一个文件"
405
525 -#: gitk:3103
406 #, tcl-format
407 msgid "<%s-S>\t\tSearch for next hit in diff view"
408 msgstr "<%s-S>\t\t在diff视图中查找下一此命中"
409
530 -#: gitk:3104
410 #, tcl-format
411 msgid "<%s-R>\t\tSearch for previous hit in diff view"
412 msgstr "<%s-R>\t\t在diff视图中查找上一次命中"
413
535 -#: gitk:3105
414 #, tcl-format
415 msgid "<%s-KP+>\tIncrease font size"
416 msgstr "<%s-KP+>\t增大字体大小"
417
540 -#: gitk:3106
418 #, tcl-format
419 msgid "<%s-plus>\tIncrease font size"
420 msgstr "<%s-plus>\t增大字体大小"
421
545 -#: gitk:3107
422 #, tcl-format
423 msgid "<%s-KP->\tDecrease font size"
424 msgstr "<%s-KP->\t减小字体大小"
425
550 -#: gitk:3108
426 #, tcl-format
427 msgid "<%s-minus>\tDecrease font size"
428 msgstr "<%s-minus>\t减小字体大小"
429
555 -#: gitk:3109
430 msgid "<F5>\t\tUpdate"
431 msgstr "<F5>\t\t更新"
432
559 -#: gitk:3574 gitk:3583
433 #, tcl-format
434 msgid "Error creating temporary directory %s:"
435 msgstr "创建临时目录出错%s:"
436
564 -#: gitk:3596
437 #, tcl-format
438 msgid "Error getting \"%s\" from %s:"
439 msgstr "从%s获取\"%s\"出错:"
440
569 -#: gitk:3659
441 msgid "command failed:"
442 msgstr "执行命令失败:"
443
573 -#: gitk:3808
444 msgid "No such commit"
445 msgstr "无此提交"
446
577 -#: gitk:3822
447 msgid "git gui blame: command failed:"
448 msgstr "git gui blame:执行命令失败:"
449
581 -#: gitk:3853
450 #, tcl-format
451 msgid "Couldn't read merge head: %s"
452 msgstr "不能读取合并头(merge head):%s"
453
586 -#: gitk:3861
454 #, tcl-format
455 msgid "Error reading index: %s"
456 msgstr "读取索引出错:%s"
457
591 -#: gitk:3886
458 #, tcl-format
459 msgid "Couldn't start git blame: %s"
460 msgstr "不能执行git blame:%s"
461
596 -#: gitk:3889 gitk:6778
462 msgid "Searching"
463 msgstr "搜索中"
464
600 -#: gitk:3921
465 #, tcl-format
466 msgid "Error running git blame: %s"
467 msgstr "运行git blame出错:%s"
468
605 -#: gitk:3949
469 #, tcl-format
470 msgid "That line comes from commit %s, which is not in this view"
471 msgstr "此行来自提交%s,不在此视图中"
472
610 -#: gitk:3963
473 msgid "External diff viewer failed:"
474 msgstr "外部diff查看器失败:"
475
614 -#: gitk:4067
476 msgid "All files"
477 msgstr "所有文件"
478
618 -#: gitk:4091
479 msgid "View"
480 msgstr "视图"
481
622 -#: gitk:4094
482 msgid "Gitk view definition"
483 msgstr "Gitk视图定义"
484
626 -#: gitk:4098
485 msgid "Remember this view"
486 msgstr "记住此视图"
487
630 -#: gitk:4099
488 msgid "References (space separated list):"
489 msgstr "引用(空格切分的列表):"
490
634 -#: gitk:4100
491 msgid "Branches & tags:"
492 msgstr "分支和tags"
493
638 -#: gitk:4101
494 msgid "All refs"
495 msgstr "所有引用"
496
642 -#: gitk:4102
497 msgid "All (local) branches"
498 msgstr "所有(本地)分支"
499
646 -#: gitk:4103
500 msgid "All tags"
501 msgstr "所有tag"
502
650 -#: gitk:4104
503 msgid "All remote-tracking branches"
504 msgstr "所有远程跟踪分支"
505
654 -#: gitk:4105
506 msgid "Commit Info (regular expressions):"
507 msgstr "提交信息 (正则表达式):"
508
658 -#: gitk:4106
509 msgid "Author:"
510 msgstr "作者:"
511
662 -#: gitk:4107
512 msgid "Committer:"
513 msgstr "提交者:"
514
666 -#: gitk:4108
515 msgid "Commit Message:"
516 msgstr "提交信息:"
517
670 -#: gitk:4109
518 msgid "Matches all Commit Info criteria"
519 msgstr "匹配所有提交信息标准"
520
674 -#: gitk:4110
521 msgid "Matches no Commit Info criteria"
522 msgstr "匹配无提交信息标准"
523
678 -#: gitk:4111
524 msgid "Changes to Files:"
525 msgstr "文件修改列表:"
526
682 -#: gitk:4112
527 msgid "Fixed String"
528 msgstr "固定字符串"
529
686 -#: gitk:4113
530 msgid "Regular Expression"
531 msgstr "正则表达式:"
532
690 -#: gitk:4114
533 msgid "Search string:"
534 msgstr "搜索字符串:"
535
694 -#: gitk:4115
536 msgid ""
537 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
538 "15:27:38\"):"
698 -msgstr "提交日期 (\"2星期之前\", \"2009-03-17 15:27:38\", \"5月 17, 2009 15:27:38\"):"
539 +msgstr ""
540 +"提交日期 (\"2星期之前\", \"2009-03-17 15:27:38\", \"5月 17, 2009 15:27:38\"):"
541
700 -#: gitk:4116
542 msgid "Since:"
543 msgstr "自:"
544
704 -#: gitk:4117
545 msgid "Until:"
546 msgstr "到:"
547
708 -#: gitk:4118
548 msgid "Limit and/or skip a number of revisions (positive integer):"
549 msgstr "限制 且/或 跳过一定数量的版本(正整数):"
550
712 -#: gitk:4119
551 msgid "Number to show:"
552 msgstr "显示数量:"
553
716 -#: gitk:4120
554 msgid "Number to skip:"
555 msgstr "跳过数量:"
556
720 -#: gitk:4121
557 msgid "Miscellaneous options:"
558 msgstr "其他选项:"
559
724 -#: gitk:4122
560 msgid "Strictly sort by date"
561 msgstr "严格按日期整理"
562
728 -#: gitk:4123
563 msgid "Mark branch sides"
564 msgstr "标记分支边界"
565
732 -#: gitk:4124
566 msgid "Limit to first parent"
567 msgstr "限制到第一个父提交"
568
736 -#: gitk:4125
569 msgid "Simple history"
570 msgstr "简易历史"
571
740 -#: gitk:4126
572 msgid "Additional arguments to git log:"
573 msgstr "git log命令的额外参数:"
574
744 -#: gitk:4127
575 msgid "Enter files and directories to include, one per line:"
576 msgstr "输入文件和文件夹来引用,每行一个:"
577
748 -#: gitk:4128
578 msgid "Command to generate more commits to include:"
579 msgstr "命令产生更多的提交来引用:"
580
752 -#: gitk:4252
581 msgid "Gitk: edit view"
582 msgstr "Gitk: 编辑视图"
583
756 -#: gitk:4260
584 msgid "-- criteria for selecting revisions"
585 msgstr "-- 用来选择版本的规则"
586
760 -#: gitk:4265
587 msgid "View Name"
588 msgstr "视图名称"
589
764 -#: gitk:4340
590 msgid "Apply (F5)"
591 msgstr "应用(F5)"
592
768 -#: gitk:4378
593 msgid "Error in commit selection arguments:"
594 msgstr "提交选择参数错误:"
595
772 -#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525
596 msgid "None"
597 msgstr "无"
598
776 -#: gitk:5045 gitk:5050
599 msgid "Descendant"
600 msgstr "子提交"
601
780 -#: gitk:5046
602 msgid "Not descendant"
603 msgstr "非子提交"
604
784 -#: gitk:5053 gitk:5058
605 msgid "Ancestor"
606 msgstr "父提交"
607
788 -#: gitk:5054
608 msgid "Not ancestor"
609 msgstr "非父提交"
610
792 -#: gitk:5348
611 msgid "Local changes checked in to index but not committed"
612 msgstr "已添加到索引但未提交的修改"
613
796 -#: gitk:5384
614 msgid "Local uncommitted changes, not checked in to index"
615 msgstr "未添加到索引且未提交的修改"
616
800 -#: gitk:7158
617 msgid "and many more"
618 msgstr "更多"
619
804 -#: gitk:7161
620 msgid "many"
621 msgstr "很多"
622
808 -#: gitk:7352
623 msgid "Tags:"
624 msgstr "Tags:"
625
812 -#: gitk:7369 gitk:7375 gitk:8854
626 msgid "Parent"
627 msgstr "父节点"
628
816 -#: gitk:7380
629 msgid "Child"
630 msgstr "子节点"
631
820 -#: gitk:7389
632 msgid "Branch"
633 msgstr "分支"
634
824 -#: gitk:7392
635 msgid "Follows"
636 msgstr "之后的tag"
637
828 -#: gitk:7395
638 msgid "Precedes"
639 msgstr "之前的tag"
640
832 -#: gitk:7990
641 #, tcl-format
642 msgid "Error getting diffs: %s"
643 msgstr "获取差异错误:%s"
644
837 -#: gitk:8679
645 msgid "Goto:"
646 msgstr "转到:"
647
841 -#: gitk:8700
648 #, tcl-format
649 msgid "Short SHA1 id %s is ambiguous"
650 msgstr "短格式的SHA1提交号%s不明确、有歧义"
651
846 -#: gitk:8707
652 #, tcl-format
653 msgid "Revision %s is not known"
654 msgstr "版本%s未知"
655
851 -#: gitk:8717
656 #, tcl-format
657 msgid "SHA1 id %s is not known"
658 msgstr "提交号(SHA1 id)%s未知"
659
856 -#: gitk:8719
660 #, tcl-format
661 msgid "Revision %s is not in the current view"
662 msgstr "版本%s不在当前视图中"
663
861 -#: gitk:8861 gitk:8876
664 msgid "Date"
665 msgstr "日期"
666
865 -#: gitk:8864
667 msgid "Children"
668 msgstr "子节点"
669
869 -#: gitk:8927
670 #, tcl-format
671 msgid "Reset %s branch to here"
672 msgstr "重置分支%s到此处"
673
874 -#: gitk:8929
674 msgid "Detached head: can't reset"
675 msgstr "分离的头(head):不能重置(reset)"
676
878 -#: gitk:9034 gitk:9040
677 msgid "Skipping merge commit "
678 msgstr "跳过合并提交"
679
882 -#: gitk:9049 gitk:9054
680 msgid "Error getting patch ID for "
681 msgstr "获取补丁ID出错"
682
886 -#: gitk:9050 gitk:9055
683 msgid " - stopping\n"
684 msgstr " — 停止中\n"
685
890 -#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094
686 msgid "Commit "
687 msgstr "提交"
688
894 -#: gitk:9064
689 msgid ""
690 " is the same patch as\n"
691 " "
898 -msgstr " 是相同的补丁(patch)\n "
692 +msgstr ""
693 +" 是相同的补丁(patch)\n"
694 +" "
695
900 -#: gitk:9072
696 msgid ""
697 " differs from\n"
698 " "
904 -msgstr " 差异来自\n "
699 +msgstr ""
700 +" 差异来自\n"
701 +" "
702
906 -#: gitk:9074
703 msgid ""
704 "Diff of commits:\n"
705 "\n"
910 -msgstr "提交的差异(Diff):\n\n"
706 +msgstr ""
707 +"提交的差异(Diff):\n"
708 +"\n"
709
912 -#: gitk:9086 gitk:9095
710 #, tcl-format
711 msgid " has %s children - stopping\n"
712 msgstr "有%s子节点 — 停止中\n"
713
917 -#: gitk:9114
714 #, tcl-format
715 msgid "Error writing commit to file: %s"
716 msgstr "写入提交到文件出错:%s"
717
922 -#: gitk:9120
718 #, tcl-format
719 msgid "Error diffing commits: %s"
720 msgstr "比较提交差异出错:%s"
721
927 -#: gitk:9166
722 msgid "Top"
723 msgstr "顶部"
724
931 -#: gitk:9167
725 msgid "From"
726 msgstr "从"
727
935 -#: gitk:9172
728 msgid "To"
729 msgstr "到"
730
939 -#: gitk:9196
731 msgid "Generate patch"
732 msgstr "生成补丁(patch)"
733
943 -#: gitk:9198
734 msgid "From:"
735 msgstr "从:"
736
947 -#: gitk:9207
737 msgid "To:"
738 msgstr "到:"
739
951 -#: gitk:9216
740 msgid "Reverse"
741 msgstr "反向(Reverse)"
742
955 -#: gitk:9218 gitk:9428
743 msgid "Output file:"
744 msgstr "输出文件:"
745
959 -#: gitk:9224
746 msgid "Generate"
747 msgstr "生成"
748
963 -#: gitk:9262
749 msgid "Error creating patch:"
750 msgstr "创建补丁(patch)出错:"
751
967 -#: gitk:9285 gitk:9416 gitk:9504
752 msgid "ID:"
753 msgstr "ID:"
754
971 -#: gitk:9294
755 msgid "Tag name:"
756 msgstr "Tag名称:"
757
975 -#: gitk:9297
758 msgid "Tag message is optional"
759 msgstr "Tag信息是可选的"
760
979 -#: gitk:9299
761 msgid "Tag message:"
762 msgstr "Tag信息:"
763
983 -#: gitk:9303 gitk:9474
764 msgid "Create"
765 msgstr "创建"
766
987 -#: gitk:9321
767 msgid "No tag name specified"
768 msgstr "未指定tag名称"
769
991 -#: gitk:9325
770 #, tcl-format
771 msgid "Tag \"%s\" already exists"
772 msgstr "Tag\"%s\"已经存在"
773
996 -#: gitk:9335
774 msgid "Error creating tag:"
775 msgstr "创建tag出错:"
776
1000 -#: gitk:9425
777 msgid "Command:"
778 msgstr "命令:"
779
1004 -#: gitk:9433
780 msgid "Write"
781 msgstr "写入"
782
1008 -#: gitk:9451
783 msgid "Error writing commit:"
784 msgstr "写入提交出错:"
785
1012 -#: gitk:9473
786 msgid "Create branch"
787 msgstr "创建分支"
788
1016 -#: gitk:9489
789 #, tcl-format
790 msgid "Rename branch %s"
791 msgstr "重命名分支%s"
792
1021 -#: gitk:9490
793 msgid "Rename"
794 msgstr "重命名"
795
1025 -#: gitk:9514
796 msgid "Name:"
797 msgstr "名称:"
798
1029 -#: gitk:9538
799 msgid "Please specify a name for the new branch"
800 msgstr "请指定新分支的名称"
801
1033 -#: gitk:9543
802 #, tcl-format
803 msgid "Branch '%s' already exists. Overwrite?"
804 msgstr "分支\"%s\"已经存在。覆盖它?"
805
1038 -#: gitk:9587
806 msgid "Please specify a new name for the branch"
807 msgstr "请重新指定新分支的名称"
808
1042 -#: gitk:9650
809 #, tcl-format
810 msgid "Commit %s is already included in branch %s -- really re-apply it?"
811 msgstr "提交%s已经存在于分支%s。确定重新应用它?"
812
1047 -#: gitk:9655
813 msgid "Cherry-picking"
814 msgstr "打补丁中(Cherry-picking)"
815
1051 -#: gitk:9664
816 #, tcl-format
817 msgid ""
818 "Cherry-pick failed because of local changes to file '%s'.\n"
819 "Please commit, reset or stash your changes and try again."
1056 -msgstr "打补丁(Cherry-pick)失败,因为本地修改了文件\"%s\"。\n请提交(commit)、重置(reset)或暂存(stash)修改后重试。"
820 +msgstr ""
821 +"打补丁(Cherry-pick)失败,因为本地修改了文件\"%s\"。\n"
822 +"请提交(commit)、重置(reset)或暂存(stash)修改后重试。"
823
1058 -#: gitk:9670
824 msgid ""
825 "Cherry-pick failed because of merge conflict.\n"
826 "Do you wish to run git citool to resolve it?"
1062 -msgstr "打补丁(Cherry-pick)失败因为合并冲突。\n你是否希望运行git citool 来解决冲突?"
827 +msgstr ""
828 +"打补丁(Cherry-pick)失败因为合并冲突。\n"
829 +"你是否希望运行git citool 来解决冲突?"
830
1064 -#: gitk:9686 gitk:9744
831 msgid "No changes committed"
832 msgstr "无已经提交的修改"
833
1068 -#: gitk:9713
834 #, tcl-format
835 msgid "Commit %s is not included in branch %s -- really revert it?"
836 msgstr "提交%s不包含在分支%s中,确认回滚(revert)它?"
837
1073 -#: gitk:9718
838 msgid "Reverting"
839 msgstr "回滚中(Reverting)"
840
1077 -#: gitk:9726
841 #, tcl-format
842 msgid ""
843 "Revert failed because of local changes to the following files:%s Please "
844 "commit, reset or stash your changes and try again."
1082 -msgstr "回滚(revert)失败,因为如下的本地文件修改:%s\n请提交(commit)、重置(reset)或者暂存(stash)改变后重试。"
845 +msgstr ""
846 +"回滚(revert)失败,因为如下的本地文件修改:%s\n"
847 +"请提交(commit)、重置(reset)或者暂存(stash)改变后重试。"
848
1084 -#: gitk:9730
849 msgid ""
850 "Revert failed because of merge conflict.\n"
851 " Do you wish to run git citool to resolve it?"
1088 -msgstr "回滚(revert)失败,因为合并冲突。\n你是否希望运行git citool来解决冲突?"
852 +msgstr ""
853 +"回滚(revert)失败,因为合并冲突。\n"
854 +"你是否希望运行git citool来解决冲突?"
855
1090 -#: gitk:9773
856 msgid "Confirm reset"
857 msgstr "确认重置(reset)"
858
1094 -#: gitk:9775
859 #, tcl-format
860 msgid "Reset branch %s to %s?"
861 msgstr "重置(reset)分支%s到%s?"
862
1099 -#: gitk:9777
863 msgid "Reset type:"
864 msgstr "重置(reset)类型:"
865
1103 -#: gitk:9780
866 msgid "Soft: Leave working tree and index untouched"
867 msgstr "软性:离开工作树,索引未改变"
868
1107 -#: gitk:9783
869 msgid "Mixed: Leave working tree untouched, reset index"
870 msgstr "混合:离开工作树(未改变),索引重置"
871
1111 -#: gitk:9786
872 msgid ""
873 "Hard: Reset working tree and index\n"
874 "(discard ALL local changes)"
1115 -msgstr "硬性:重置工作树和索引\n(丢弃所有的本地修改)"
875 +msgstr ""
876 +"硬性:重置工作树和索引\n"
877 +"(丢弃所有的本地修改)"
878
1117 -#: gitk:9803
879 msgid "Resetting"
880 msgstr "重置中(Resetting)"
881
1121 -#: gitk:9876
882 #, tcl-format
883 msgid "A local branch named %s exists already"
884 msgstr "本地分支%s已经存在"
885
1126 -#: gitk:9884
886 msgid "Checking out"
887 msgstr "检出中(Checking out)"
888
1130 -#: gitk:9943
889 msgid "Cannot delete the currently checked-out branch"
890 msgstr "不能删除当前检出(checkout)分支"
891
1134 -#: gitk:9949
892 #, tcl-format
893 msgid ""
894 "The commits on branch %s aren't on any other branch.\n"
895 "Really delete branch %s?"
1139 -msgstr "在分支%s上的提交不在其他任何分支上。\n确认删除分支%s?"
896 +msgstr ""
897 +"在分支%s上的提交不在其他任何分支上。\n"
898 +"确认删除分支%s?"
899
1141 -#: gitk:9980
900 #, tcl-format
901 msgid "Tags and heads: %s"
902 msgstr "Tags和头指针(heads):%s"
903
1146 -#: gitk:9997
904 msgid "Filter"
905 msgstr "过滤器"
906
1150 -#: gitk:10293
907 msgid ""
908 "Error reading commit topology information; branch and preceding/following "
909 "tag information will be incomplete."
910 msgstr "读取提交拓扑信息出错;分支和之前/之后的tag信息将不能完成。"
911
1156 -#: gitk:11270
912 msgid "Tag"
913 msgstr "标签(Tag)"
914
1160 -#: gitk:11274
915 msgid "Id"
916 msgstr "Id"
917
1164 -#: gitk:11357
918 msgid "Gitk font chooser"
919 msgstr "Gitk字体选择"
920
1168 -#: gitk:11374
921 msgid "B"
922 msgstr "粗体"
923
1172 -#: gitk:11377
924 msgid "I"
925 msgstr "斜体"
926
1176 -#: gitk:11495
927 msgid "Commit list display options"
928 msgstr "提交列表展示选项"
929
1180 -#: gitk:11498
930 msgid "Maximum graph width (lines)"
931 msgstr "最大图宽度(行数)"
932
1184 -#: gitk:11502
933 #, no-tcl-format
934 msgid "Maximum graph width (% of pane)"
935 msgstr "最大图宽度(%窗口百分比)"
936
1189 -#: gitk:11505
937 msgid "Show local changes"
938 msgstr "显示本地修改"
939
1193 -#: gitk:11508
940 msgid "Auto-select SHA1 (length)"
941 msgstr "自动选择SHA1(长度)"
942
1197 -#: gitk:11512
943 msgid "Hide remote refs"
944 msgstr "隐藏远程引用"
945
1201 -#: gitk:11516
946 msgid "Diff display options"
947 msgstr "差异(Diff)展示选项"
948
1205 -#: gitk:11518
949 msgid "Tab spacing"
950 msgstr "制表符宽度"
951
1209 -#: gitk:11521
952 msgid "Display nearby tags/heads"
953 msgstr "显示临近的tags/heads"
954
1213 -#: gitk:11524
955 msgid "Maximum # tags/heads to show"
956 msgstr "最大tags/heads展示数量"
957
1217 -#: gitk:11527
958 msgid "Limit diffs to listed paths"
959 msgstr "diff中列出文件限制"
960
1221 -#: gitk:11530
961 msgid "Support per-file encodings"
962 msgstr "单独文件编码支持"
963
1225 -#: gitk:11536 gitk:11683
964 msgid "External diff tool"
965 msgstr "外部差异(diff)工具"
966
1229 -#: gitk:11537
967 msgid "Choose..."
968 msgstr "选择..."
969
1233 -#: gitk:11542
970 msgid "General options"
971 msgstr "常规选项"
972
1237 -#: gitk:11545
973 msgid "Use themed widgets"
974 msgstr "使用主题小部件"
975
1241 -#: gitk:11547
976 msgid "(change requires restart)"
977 msgstr "(需重启生效)"
978
1245 -#: gitk:11549
979 msgid "(currently unavailable)"
980 msgstr "(当前不可用)"
981
1249 -#: gitk:11560
982 msgid "Colors: press to choose"
983 msgstr "颜色:点击来选择"
984
1253 -#: gitk:11563
985 msgid "Interface"
986 msgstr "界面"
987
1257 -#: gitk:11564
988 msgid "interface"
989 msgstr "界面"
990
1261 -#: gitk:11567
991 msgid "Background"
992 msgstr "背景"
993
1265 -#: gitk:11568 gitk:11598
994 msgid "background"
995 msgstr "背景"
996
1269 -#: gitk:11571
997 msgid "Foreground"
998 msgstr "前景"
999
1273 -#: gitk:11572
1000 msgid "foreground"
1001 msgstr "前景"
1002
1277 -#: gitk:11575
1003 msgid "Diff: old lines"
1004 msgstr "差异(Diff):老代码行"
1005
1281 -#: gitk:11576
1006 msgid "diff old lines"
1007 msgstr "差异(diff)老代码行"
1008
1285 -#: gitk:11580
1009 msgid "Diff: new lines"
1010 msgstr "差异(Diff):新代码行"
1011
1289 -#: gitk:11581
1012 msgid "diff new lines"
1013 msgstr "差异(diff)新代码行"
1014
1293 -#: gitk:11585
1015 msgid "Diff: hunk header"
1016 msgstr "差异(Diff):补丁片段头信息"
1017
1297 -#: gitk:11587
1018 msgid "diff hunk header"
1019 msgstr "差异(diff)补丁片段头信息"
1020
1301 -#: gitk:11591
1021 msgid "Marked line bg"
1022 msgstr "已标记代码行背景"
1023
1305 -#: gitk:11593
1024 msgid "marked line background"
1025 msgstr "已标记代码行背景"
1026
1309 -#: gitk:11597
1027 msgid "Select bg"
1028 msgstr "选择背景"
1029
1313 -#: gitk:11606
1030 msgid "Fonts: press to choose"
1031 msgstr "字体:点击来选择"
1032
1317 -#: gitk:11608
1033 msgid "Main font"
1034 msgstr "主字体"
1035
1321 -#: gitk:11609
1036 msgid "Diff display font"
1037 msgstr "差异(Diff)显示字体"
1038
1325 -#: gitk:11610
1039 msgid "User interface font"
1040 msgstr "用户界面字体"
1041
1329 -#: gitk:11632
1042 msgid "Gitk preferences"
1043 msgstr "Gitk偏好设置"
1044
1333 -#: gitk:11641
1045 msgid "General"
1046 msgstr "常规"
1047
1337 -#: gitk:11642
1048 msgid "Colors"
1049 msgstr "颜色"
1050
1341 -#: gitk:11643
1051 msgid "Fonts"
1052 msgstr "字体"
1053
1345 -#: gitk:11693
1054 #, tcl-format
1055 msgid "Gitk: choose color for %s"
1056 msgstr "Gitk:选择颜色用于%s"
1057
1350 -#: gitk:12206
1058 msgid ""
1059 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1060 " Gitk requires at least Tcl/Tk 8.4."
1354 -msgstr "对不起,gitk不能运行在当前版本的Tcl/Tk中。\nGitk运行需要最低版本为Tcl/Tk8.4。"
1061 +msgstr ""
1062 +"对不起,gitk不能运行在当前版本的Tcl/Tk中。\n"
1063 +"Gitk运行需要最低版本为Tcl/Tk8.4。"
1064
1356 -#: gitk:12416
1065 msgid "Cannot find a git repository here."
1066 msgstr "在此位置未发现git仓库。"
1067
1360 -#: gitk:12463
1068 #, tcl-format
1069 msgid "Ambiguous argument '%s': both revision and filename"
1070 msgstr "不明确有歧义的参数\"%s\":版本和文件名称"
1071
1365 -#: gitk:12475
1072 msgid "Bad arguments to gitk:"
1073 msgstr "运行gitk参数错误:"